diff --git a/doc/html/accounting.shtml b/doc/html/accounting.shtml
index af84b48ddf47800843851256a23686314d069452..a715deded993f23a772b401ed1b371f7439f7812 100644
--- a/doc/html/accounting.shtml
+++ b/doc/html/accounting.shtml
@@ -5,13 +5,18 @@
executed.
Information is available about both currently executing jobs and
jobs which have already terminated and can be viewed using the
-<b>sacct</b> command.
-Resource usage is reported for each task and this can be useful to
+<b>sacct</b> command. Similarly <b>sreport</b> can be used to
+view/create reports based on time.
+With sacct resource usage is reported for each task and this can be useful to
detect load imbalance between the tasks.
SLURM version 1.2 and earlier supported the storage of accounting
records to a text file.
Beginning in SLURM version 1.3 accounting records can be written to
-a database. </p>
+a database. Also as of 1.3 a new tool <b>sstat</b> can be used to status a
+running job. This requires there to be a JobAcctGatherType other
+than 'none' specified. This is very helpful when debugging an
+application since an imbalance can be found while the job is running
+instead of waiting until the end of the job.</p>
<p>There are three distinct plugin types associated with resource accounting.
The configuration parameters associated with these plugins include:
@@ -54,13 +59,13 @@ after moving the files, but before compressing them so
that new log files will be created.</p>
<p>Storing the data directly into a database from SLURM may seem
-attractive, but that requires the availability of user name and
+attractive, but requires the availability of user name and
password data not only for the SLURM control daemon (slurmctld),
-but also user commands which need to access the data (sacct and
+but also user commands which need to access the data (sacct, sreport, and
sacctmgr).
-Making information available to all users makes database security
-more difficult to provide, sending the data through an intermediate
-daemon can provide better security.
+Making possibly sensitive information available to all users makes
+database security more difficult to provide, sending the data through
+an intermediate daemon can provide better security.
Gold and SlurmDBD are two such services.
Our initial implementation relied upon Gold, but we found its
performance to be inadequate for our needs and developed SlurmDBD.
diff --git a/doc/man/man1/sacctmgr.1 b/doc/man/man1/sacctmgr.1
index ff8fbc0d45cd71083f88e12502365e7602b18922..5c29d74d5bf5e0989da6611e733b4b7a47bfad6c 100644
--- a/doc/man/man1/sacctmgr.1
+++ b/doc/man/man1/sacctmgr.1
@@ -342,7 +342,7 @@ To clear a previously set value use the modify command with a new value of \-1.
.br
> sacctmgr create account name=chemistry parent=science fairshare=30
.br
-> sacctmgr create account name=physics parent=science fairshare=20
+> sacctmgr create account name=physics parent=science fairshare=20
.br
> sacctmgr create user name=adam cluster=tux account=physics \
.br
diff --git a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
index 58cd3633aff821d40f7ce1cd6f4fd86dc72303f5..4218dfe85adf61c9404ad8564efd9ee14b485522 100644
--- a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
+++ b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
@@ -1256,7 +1256,8 @@ extern int init ( void )
char *location = NULL;
#else
fatal("No MySQL database was found on the machine. "
- "Please check the configure log and run again.");
+ "Please check the config.log from the run of configure "
+ "and run again.");
#endif
/* since this can be loaded from many different places
diff --git a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
index f38893274ecb162e3b48ec55c998af0757210d9b..afe84f35275cbd5ccc400b7267f4a649b5dd47f8 100644
--- a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
+++ b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
@@ -660,7 +660,8 @@ extern int init ( void )
char *location = NULL;
#else
fatal("No Postgres database was found on the machine. "
- "Please check the configure log and run again.");
+ "Please check the config.log from the run of configure "
+ "and run again.");
#endif
/* since this can be loaded from many different places
only tell us once. */
diff --git a/src/plugins/jobcomp/mysql/jobcomp_mysql.c b/src/plugins/jobcomp/mysql/jobcomp_mysql.c
index 46a139d9bc9a4e0c644c3c3fc3ff06cb08ea3736..69f24292ca48c5b16dc9ec6b7b2b1ff2bb62fef6 100644
--- a/src/plugins/jobcomp/mysql/jobcomp_mysql.c
+++ b/src/plugins/jobcomp/mysql/jobcomp_mysql.c
@@ -227,7 +227,8 @@ extern int init ( void )
static int first = 1;
#ifndef HAVE_MYSQL
fatal("No MySQL storage was found on the machine. "
- "Please check the configure ran and run again.");
+ "Please check the config.log from the run of configure "
+ "and run again.");
#endif
if(first) {
/* since this can be loaded from many different places
diff --git a/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c b/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
index a56157c07e56762991d7f2bf1cf75a5daced4289..c9f9ad5b1fa57479f7dc59e38a1ad4eb4602d69e 100644
--- a/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
+++ b/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
@@ -250,7 +250,8 @@ extern int init ( void )
static int first = 1;
#ifndef HAVE_PGSQL
fatal("No Postgresql storage was found on the machine. "
- "Please check the configure ran and run again.");
+ "Please check the config.log from the run of configure "
+ "and run again.");
#endif
if(first) {
/* since this can be loaded from many different places