diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 6f305c4c53f9e4d4931309dda53412e08e21c2ae..b6485a8a3190568cb21afd88a92b1db2084b5080 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -82,16 +82,11 @@ Also see \fBDefaultStoragePort\fR.
 \fBAccountingStorageType\fR
 Define the accounting storage mechanism type.
 Acceptable values at present include 
-"accounting_storage/filetxt", "accounting_storage/gold",
 "accounting_storage/mysql", "accounting_storage/none", 
 "accounting_storage/pgsql", and "accounting_storage/slurmdbd".
 The value "accounting_storage/filetxt" indicates that accounting records
 will be written to a the file specified by the 
 \fBAccountingStorageLoc\fR parameter.
-The value "accounting_storage/gold" indicates that account records
-will be written to Gold
-(http://www.clusterresources.com/pages/products/gold-allocation-manager.php),
-which maintains its own database.
 The value "accounting_storage/mysql" indicates that accounting records
 should be written to a MySQL database specified by the 
 \fBAccountingStorageLoc\fR parameter.
@@ -311,12 +306,8 @@ Also see \fBAccountingStoragePort\fR and \fBJobCompPort\fR.
 \fBDefaultStorageType\fR
 Define the accounting and job completion storage mechanism type.
 Acceptable values at present include 
-"filetxt", "gold", "mysql", "none", "pgsql", and "slurmdbd".
+"filetxt", "mysql", "none", "pgsql", and "slurmdbd".
 The value "filetxt" indicates that records will be written to a the file.
-The value "gold" indicates that records will be written to Gold
-(http://www.clusterresources.com/pages/products/gold-allocation-manager.php),
-.na
-which maintains its own database.
 .ad
 The value "mysql" indicates that accounting records will be written to 
 a mysql database.
diff --git a/src/plugins/select/cons_res/job_test.c b/src/plugins/select/cons_res/job_test.c
index b69678ab4f6b99f3662f2a862772df00de07ea99..8aa93c5f93dd18480d2511d3c19e756fe0daacde 100644
--- a/src/plugins/select/cons_res/job_test.c
+++ b/src/plugins/select/cons_res/job_test.c
@@ -1476,7 +1476,7 @@ static int _choose_nodes(struct job_record *job_ptr, bitstr_t *node_map,
 	}
 
 	/* NOTE: num_procs is 1 by default, 
-	 * only reset max_nodes if user explicitly sets a proc count */
+	 * Only reset max_nodes if user explicitly sets a proc count */
 	if ((job_ptr->num_procs > 1) && (max_nodes > job_ptr->num_procs))
 		max_nodes = job_ptr->num_procs;