diff --git a/NEWS b/NEWS
index 3e9ecd95e853994a93f7ebeb101463890589e526..d9927f305945034dcdf7cc4c36bfac550ac144d6 100644
--- a/NEWS
+++ b/NEWS
@@ -44,6 +44,7 @@ documents those changes that are of interest to users and admins.
pending jobs.
-- Increase max message size for the slurmdbd from 1000000 to 16*1024*1024
-- Increase number of active threads in the slurmdbd from 50 to 100
+ -- Fixed small bug in src/common/slurmdb_defs.c reported by Bjørn-Helge Mevik
* Changes in SLURM 2.2.0.pre12
==============================
diff --git a/doc/html/job_exit_code.shtml b/doc/html/job_exit_code.shtml
index 9387756d05c143c7e95d4e70f929a00f94244b4e..6e5028e640aa479c90a892c53010580914ec764e 100644
--- a/doc/html/job_exit_code.shtml
+++ b/doc/html/job_exit_code.shtml
@@ -52,7 +52,7 @@ ExitCode field whose format mirrors the output of <b>scontrol</b> and
<h1>Derived Exit Code and String</h1>
<p>After reading the above description of a job's exit code, one can
-easily imagine a scenario where a central task of a job fails but the
+imagine a scenario where a central task of a batch job fails but the
script returns an exit code of zero, indicating success. In many
cases, a user may not be able to ascertain the success or failure of a
job until after they have examined the job's output files.</p>
@@ -110,7 +110,7 @@ If a change is desired, <b>sjobexitmod</b> can modify the derived fields:
exit fields:</p>
<PRE>
-> sacct -X -j 123 -o JobID,NNodes,State,ExitCode,Derivedexitcode,DerivedExitStr
+> sacct -X -j 123 -o JobID,NNodes,State,ExitCode,DerivedExitcode,DerivedExitStr
JobID NNodes State ExitCode DerivedExitCode DerivedExitStr
------------ -------- ---------- -------- --------------- --------------
123 1 COMPLETED 0:0 49:0 out of memory
diff --git a/src/common/slurmdb_defs.c b/src/common/slurmdb_defs.c
index 33bb9314f58448a04479cb967f54202c4ba0e2ba..1517f026e6972b35463c015a4ade0535185141b8 100644
--- a/src/common/slurmdb_defs.c
+++ b/src/common/slurmdb_defs.c
@@ -1614,7 +1614,7 @@ extern void log_assoc_rec(slurmdb_association_rec_t *assoc_ptr,
if(assoc_ptr->grp_cpu_run_mins == INFINITE)
debug2(" GrpCPURunMins : NONE");
- else if(assoc_ptr->grp_cpu_mins != NO_VAL)
+ else if(assoc_ptr->grp_cpu_run_mins != NO_VAL)
debug2(" GrpCPURunMins : %"PRIu64"",
assoc_ptr->grp_cpu_run_mins);