diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index ebb4efff7135a72820bd77cade75822e97cd2e6c..f810cae0de0cd341b7ad9f8a490e86eaf9050540 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -55,33 +55,37 @@ Only used with systems using SlurmDBD, ignored otherwise.
 \fBAccountingStorageEnforce\fR
 This controls what level of association\-based enforcement to impose
 on job submissions.  Valid options are any combination of
-\fIassociations\fR, \fIlimits\fR, \fInojobs\fR, \fInosteps\fR, \fIqos\fR, \fIsafe\fR, and \fIwckeys\fR, or
-\fIall\fR for all things (expect nojobs and nosteps, they must be requested as well).
+\fIassociations\fR, \fIlimits\fR, \fInojobs\fR, \fInosteps\fR, \fIqos\fR,
+\fIsafe\fR, and \fIwckeys\fR, or \fIall\fR for all things (except nojobs
+and nosteps, which must be requested as well).
 
-If limits, qos, or wckeys are set, associations will automatically be set.
+If \fIlimits\fR, \fIqos\fR, or \fIwckeys\fR are set, \fIassociations\fR
+will automatically be set.
 
-If wckeys is set, TrackWCKey will automatically be set.
+If \fIwckeys\fR is set, \fBTrackWCKey\fR will automatically be set.
 
-If safe is set, limits and associations will automatically be set.
+If \fIsafe\fR is set, \fIlimits\fR and \fIassociations\fR will
+automatically be set.
 
-If nojobs is set nosteps will automatically be set.
+If \fInojobs\fR is set, \fInosteps\fR will automatically be set.
 
-By enforcing Associations no new job is allowed to run unless a corresponding
-association exists in the system.  If limits are enforced users can be
-limited by association to whatever job size or run time limits are defined.
+By setting \fIassociations\fR, no new job is allowed to run unless a
+corresponding association exists in the system.  If \fIlimits\fR are
+enforced, users can be limited by association to whatever job size or run
+time limits are defined.
 
-If nojobs is set Slurm will not account for any jobs or steps on the system,
-like wise if nosteps is set Slurm will not account for any steps ran limits
-will still be enforced.
+If \fInojobs\fR is set, Slurm will not account for any jobs or steps on the
+system. Likewise, if \fInosteps\fR is set, Slurm will not account for any
+steps that have run.
 
-If safe is enforced, a job will only be launched against an association or qos
-that has a GrpTRESMins limit set if the job will be able to run to completion.
-Without this option set, jobs will be launched as long as their usage
-hasn't reached the cpu-minutes limit which can lead to jobs being
+If \fIsafe\fR is enforced, a job will only be launched against an association
+or qos that has a \fBGrpTRESMins\fR limit set, if the job will be able to
+run to completion. Without this option set, jobs will be launched as long as
+their usage hasn't reached the cpu-minutes limit. This can lead to jobs being
 launched but then killed when the limit is reached.
 
-With qos and/or wckeys enforced jobs will not be scheduled unless a valid qos
-and/or workload characterization key is specified.
+With \fIqos\fR and/or \fIwckeys\fR enforced jobs will not be scheduled unless
+a valid qos and/or workload characterization key is specified.
 
 When \fBAccountingStorageEnforce\fR is changed, a restart of the slurmctld
 daemon is required (not just a "scontrol reconfig").