diff --git a/doc/man/man1/sacct.1 b/doc/man/man1/sacct.1
index 86b3b40591259f7f21711e43c87321ae1a0c1154..cfff84614d715644a3117892d3167d7f19a332cf 100644
--- a/doc/man/man1/sacct.1
+++ b/doc/man/man1/sacct.1
@@ -1220,4 +1220,4 @@ designate the job accounting log file that collects system job accounting.
The default job accounting log file.
By default, this file is set to read and write permission for root only.
.SH "SEE ALSO"
-sstat(1), ps(1), srun(1), squeue(1), getrusage(2), time(2)
+\fBsstat\fR(1), \fBps\fR(1), \fBsrun\fR(1), \fBsqueue\fR(1), \fBgetrusage\fR(2), \fBtime\fR(2)
diff --git a/doc/man/man1/sacctmgr.1 b/doc/man/man1/sacctmgr.1
index c7fc685428b357c96dff1514ec97345197dba001..813018feda51728ceda04626ba28c89decff7916 100644
--- a/doc/man/man1/sacctmgr.1
+++ b/doc/man/man1/sacctmgr.1
@@ -1713,5 +1713,5 @@ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
.SH "SEE ALSO"
-\fBslurm.conf\fR(5)
+\fBslurm.conf\fR(5),
\fBslurmdbd\fR(8)
diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1
index ff8c2c0465e87f35c4b71bee2c8ab34454799217..9a75410718b60489834d1789edb8769395e39b3b 100644
--- a/doc/man/man1/salloc.1
+++ b/doc/man/man1/salloc.1
@@ -1165,4 +1165,5 @@ details.
.SH "SEE ALSO"
.LP
-sinfo(1), sattach(1), sbatch(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)
+\fBsinfo\fR(1), \fBsattach\fR(1), \fBsbatch\fR(1), \fBsqueue\fR(1), \fBscancel\fR(1), \fBscontrol\fR(1),
+\fBslurm.conf\fR(5), \fBsched_setaffinity\fR(2), \fBnuma\fR(3)
diff --git a/doc/man/man1/sattach.1 b/doc/man/man1/sattach.1
index 0054a8882ca351a9f1fde18c29b0c4b556099abb..dcc1eb10e59332faba222696cd58a9c5551dccd5 100644
--- a/doc/man/man1/sattach.1
+++ b/doc/man/man1/sattach.1
@@ -66,7 +66,7 @@ Display SLURM version number and exit.
.TP
\fB\-v\fR, \fB\-\-verbose\fR
-Increase the verbosity of sattach's informational messages. Multiple \-v's
+Increase the verbosity of sattach's informational messages. Multiple \fB\-v\fR's
will further increase sattach's verbosity.
.SH "INPUT ENVIRONMENT VARIABLES"
@@ -110,4 +110,6 @@ details.
.SH "SEE ALSO"
.LP
-sinfo(1), salloc(1), sbatch(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)
+\fBsinfo\fR(1), \fBsalloc\fR(1), \fBsbatch\fR(1), \fBsqueue\fR(1),
+\fBscancel\fR(1), \fBscontrol\fR(1),
+\fBslurm.conf\fR(5), \fBsched_setaffinity\fR(2), \fBnuma\fR(3)
diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1
index c4079dfc36cc121e11a1deed5135a64c2a572141..0c1a42ac242079fc2d2d9e94e7b23b26ee9fa1d7 100644
--- a/doc/man/man1/sbatch.1
+++ b/doc/man/man1/sbatch.1
@@ -330,7 +330,7 @@ sharing the same job name and user have terminated.
.TP
\fB\-D\fR, \fB\-\-workdir\fR=<\fIdirectory\fR>
Set the working directory of the batch script to \fIdirectory\fR before
-it it executed.
+it is executed.
.TP
\fB\-e\fR, \fB\-\-error\fR=<\fIfilename pattern\fR>
@@ -861,7 +861,7 @@ options may not be supported on some systems):
All limits listed below
.TP
\fBAS\fR
-The maximum address space for a processes
+The maximum address space for a process
.TP
\fBCORE\fR
The maximum size of core file
@@ -1339,4 +1339,5 @@ details.
.SH "SEE ALSO"
.LP
-sinfo(1), sattach(1), salloc(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)
+\fBsinfo\fR(1), \fBsattach\fR(1), \fBsalloc\fR(1), \fBsqueue\fR(1), \fBscancel\fR(1), \fBscontrol\fR(1),
+\fBslurm.conf\fR(5), \fBsched_setaffinity\fR(2), \fBnuma\fR(3)
diff --git a/doc/man/man1/slurm.1 b/doc/man/man1/slurm.1
index c23c3d98729cb0153f2758b6111bbceb395e4a9e..ea7aa8afac361e2c3e4fbdea6be3d4b81194fc34 100644
--- a/doc/man/man1/slurm.1
+++ b/doc/man/man1/slurm.1
@@ -62,7 +62,7 @@ details.
\fBsacct\fR(1), \fBsacctmgr\fR(1), \fBsalloc\fR(1), \fBsattach\fR(1),
\fBsbatch\fR(1), \fBsbcast\fR(1), \fBscancel\fR(1), \fBscontrol\fR(1),
\fBsinfo\fR(1), \fBsmap\fR(1), \fBsqueue\fR(1), \fBsreport\fR(1),
-\fBsrun\fR(1),\fBsshare\fR(1), \fBsstate\fR(1), \fBstrigger\fR(1),
+\fBsrun\fR(1), \fBsshare\fR(1), \fBsstate\fR(1), \fBstrigger\fR(1),
\fBsview\fR(1),
\fBbluegene.conf\fR(5), \fBslurm.conf\fR(5), \fBslurmdbd.conf\fR(5),
\fBwiki.conf\fR(5),
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index 245e5b7e0dda4bf60d848f4cecad34d0488987c5..66f22d5bfc12676a7b752130d5561697f5e77902 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -912,7 +912,7 @@ options may not be supported on some systems):
All limits listed below
.TP
\fBAS\fR
-The maximum address space for a processes
+The maximum address space for a process
.TP
\fBCORE\fR
The maximum size of core file
@@ -1978,4 +1978,4 @@ details.
\fBsalloc\fR(1), \fBsattach\fR(1), \fBsbatch\fR(1), \fBsbcast\fR(1),
\fBscancel\fR(1), \fBscontrol\fR(1), \fBsqueue\fR(1), \fBslurm.conf\fR(5),
\fBsched_setaffinity\fR(2), \fBnuma\fR(3)
-\fBgetrlimit\fR(2),
+\fBgetrlimit\fR(2)
diff --git a/doc/man/man1/sshare.1 b/doc/man/man1/sshare.1
index a3a127dcd8cf77b9805b97c7a5700577e2dd5342..e897e91514d99f6412e5a0ef5faae3b4390160c6 100644
--- a/doc/man/man1/sshare.1
+++ b/doc/man/man1/sshare.1
@@ -135,5 +135,5 @@ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
.SH "SEE ALSO"
-\fBslurm.conf\fR(5)
+\fBslurm.conf\fR(5),
\fBslurmdbd\fR(8)
diff --git a/doc/man/man1/sview.1 b/doc/man/man1/sview.1
index 597d4aea4acebd5dd2f61cda98debddbd4829d1d..468c0a5f2ee61dcd8ca9a78df510caec4711a7dc 100644
--- a/doc/man/man1/sview.1
+++ b/doc/man/man1/sview.1
@@ -64,5 +64,5 @@ details.
.SH "SEE ALSO"
.LP
-sinfo(1), squeue(1), scontrol(1), slurm.conf(5),
-sched_setaffinity(2), numa(3)
+\fBsinfo\fR(1), \fBsqueue\fR(1), \fBscontrol\fR(1), \fBslurm.conf\fR(5),
+\fBsched_setaffinity\fR(2), \fBnuma\fR(3)
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 154cc95f09892d95857c4f959e8cd12e51f7d396..c8ce47f31517098e8aa255efb03ea018c5772512 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -1172,7 +1172,7 @@ All limits listed below
No limits listed below
.TP
\fBAS\fR
-The maximum address space for a processes
+The maximum address space for a process
.TP
\fBCORE\fR
The maximum size of core file
diff --git a/slurm/slurmdb.h b/slurm/slurmdb.h
index 9307304e9098c4297b05c43dd7e4adb059d9df03..c5c9a46959579add9baf1256f708bae492182835 100644
--- a/slurm/slurmdb.h
+++ b/slurm/slurmdb.h
@@ -732,7 +732,7 @@ typedef struct {
slurmdb_association_cond_t *assoc_cond; /* use user_list here for
names and acct_list for
default accounts */
- List def_acct_list; /* list of char * (We can't readly use
+ List def_acct_list; /* list of char * (We can't really use
* the assoc_cond->acct_list for this
* because then it is impossible for us
* to tell which accounts are defaults
diff --git a/src/common/slurm_errno.c b/src/common/slurm_errno.c
index 33d4228be2fa2d2ddf8f6ca8db1f15b96243ce62..e2f5e7fae954220bbb49924740e349d995ac6114 100644
--- a/src/common/slurm_errno.c
+++ b/src/common/slurm_errno.c
@@ -245,7 +245,7 @@ static slurm_errtab_t slurm_errtab[] = {
{ ESLURM_RESERVATION_OVERLAP,
"Requested reservation overlaps with another reservation" },
{ ESLURM_PORTS_BUSY,
- "Requires ports are in use" },
+ "Required ports are in use" },
{ ESLURM_PORTS_INVALID,
"Requires more ports than can be reserved" },
{ ESLURM_PROLOG_RUNNING,
diff --git a/src/plugins/job_submit/partition/job_submit_partition.c b/src/plugins/job_submit/partition/job_submit_partition.c
index d98a1e443690c49d68b00a2b80e19944e30fb763..84a5772e28eb2c4c2d42199bc449088b42ae2c38 100644
--- a/src/plugins/job_submit/partition/job_submit_partition.c
+++ b/src/plugins/job_submit/partition/job_submit_partition.c
@@ -131,7 +131,7 @@ static bool _user_access(uid_t run_uid, uint32_t submit_uid,
return false; /* User not in AllowGroups */
}
-/* This exampe code will set a job's default partition to the highest
+/* This example code will set a job's default partition to the highest
* priority partition that is available to this user. This is only an
* example and tremendous flexibility is available. */
extern int job_submit(struct job_descriptor *job_desc, uint32_t submit_uid)
diff --git a/src/plugins/select/cray/basil_interface.c b/src/plugins/select/cray/basil_interface.c
index cb67693115c556cf4054dff14f370a272c252d89..315f064d56a0d1d87a6fa5e040099cc26ebd1d15 100644
--- a/src/plugins/select/cray/basil_interface.c
+++ b/src/plugins/select/cray/basil_interface.c
@@ -235,8 +235,6 @@ extern int basil_inventory(void)
* Purge orphaned reservations, which may result from stale or
* messed up system state, or are indicative of ALPS problems
* (stuck in pending cancel calls).
- * Don't return an error code here, to encourage scheduling
- * even while some of the resources have not yet been freed.
*/
for (rsvn = inv->f->rsvn_head; rsvn; rsvn = rsvn->next) {
ListIterator job_iter = list_iterator_create(job_list);
diff --git a/src/salloc/opt.c b/src/salloc/opt.c
index 8bff20cd44ddd4f68203f57981b2e32df3ac5b2b..1a2eeed91e9a306bbf49337810d60afb6ea3dd94 100644
--- a/src/salloc/opt.c
+++ b/src/salloc/opt.c
@@ -1809,7 +1809,7 @@ static void _help(void)
" --mail-user=user who to send email notification for job state\n"
" changes\n"
" -n, --tasks=N number of processors required\n"
-" --nice[=value] decrease secheduling priority by value\n"
+" --nice[=value] decrease scheduling priority by value\n"
" --no-bell do NOT ring the terminal bell\n"
" --ntasks-per-node=n number of tasks to invoke on each node\n"
" -N, --nodes=N number of nodes on which to run (N = min[-max])\n"
diff --git a/src/sbatch/opt.c b/src/sbatch/opt.c
index c44c37095d719e0ce04f8825dd09313fe7f51209..479658a0ddae47d3a0ff084be56a09d74da8b62b 100644
--- a/src/sbatch/opt.c
+++ b/src/sbatch/opt.c
@@ -2758,7 +2758,7 @@ static void _help(void)
" --mail-user=user who to send email notification for job state\n"
" changes\n"
" -n, --ntasks=ntasks number of tasks to run\n"
-" --nice[=value] decrease secheduling priority by value\n"
+" --nice[=value] decrease scheduling priority by value\n"
" --no-requeue if set, do not permit the job to be requeued\n"
" --ntasks-per-node=n number of tasks to invoke on each node\n"
" -N, --nodes=N number of nodes on which to run (N = min[-max])\n"
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index b9314c1b9cbf28f98f7c52507b98178acd894744..759cab0bf7bafe68d7a4d619f47dc193b1eb0e37 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -585,7 +585,7 @@ int main(int argc, char *argv[])
if (running_cache) {
/* break out and end the association cache
- * thread since we are shuting down, no reason
+ * thread since we are shutting down, no reason
* to wait for current info from the database */
slurm_mutex_lock(&assoc_cache_mutex);
running_cache = (uint16_t)NO_VAL;
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index ea05b8b825cfca90ed69b13078f77cff71e7c894..637983c5351a7ea4210de38595b0e791b0eb44ab 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -4367,8 +4367,8 @@ _copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
&wckey_ptr)) {
if (accounting_enforce &
ACCOUNTING_ENFORCE_WCKEYS) {
- error("_job_create: invalid wckey '%s' "
- "for user %u.",
+ error("_copy_job_desc_to_job_record: "
+ "invalid wckey '%s' for user %u.",
wckey_rec.name,
job_desc->user_id);
return ESLURM_INVALID_WCKEY;
@@ -4376,8 +4376,8 @@ _copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
}
} else if (accounting_enforce & ACCOUNTING_ENFORCE_WCKEYS) {
/* This should never happen */
- info("_job_create: no wckey was given for "
- "job submit.");
+ info("_copy_job_desc_to_job_record: no wckey was given "
+ "for job submit.");
return ESLURM_INVALID_WCKEY;
}
}
diff --git a/src/slurmctld/partition_mgr.c b/src/slurmctld/partition_mgr.c
index 7c455ae4833c640db4febaccef38e52a5ff26610..991127ae06919c1353f0967d75c77876b45167f5 100644
--- a/src/slurmctld/partition_mgr.c
+++ b/src/slurmctld/partition_mgr.c
@@ -1242,9 +1242,9 @@ extern int update_part (update_part_msg_t * part_desc, bool create_flag)
part_ptr->priority = part_desc->priority;
/* If the max_priority changes we need to change all
- the normalized priorities of all the other
- partitions. If not then just set this partitions.
- */
+ * the normalized priorities of all the other
+ * partitions. If not then just set this partition.
+ */
if(part_ptr->priority > part_max_priority) {
ListIterator itr = list_iterator_create(part_list);
struct part_record *part2 = NULL;
diff --git a/src/slurmd/slurmstepd/pam_ses.c b/src/slurmd/slurmstepd/pam_ses.c
index d4ab3c7adc810c672d1b395363722c06886cc604..f5dee24b6ceabad138f03bf7b61ce54b9cb01596 100644
--- a/src/slurmd/slurmstepd/pam_ses.c
+++ b/src/slurmd/slurmstepd/pam_ses.c
@@ -89,7 +89,7 @@ pam_setup (char *user, char *host)
* administrator. PAM's session management library is responsible for
* handling resource limits. When a PAM session is opened on behalf of
* a user, the limits imposed by the sys admin are picked up. Opening
- * a PAM session requires a PAM handle, which is obatined when the PAM
+ * a PAM session requires a PAM handle, which is obtained when the PAM
* interface is intialized. (PAM handles are required with essentially
* all PAM calls.) It's also necessary to have the users PAM credentials
* to open a user session.
diff --git a/src/srun/opt.c b/src/srun/opt.c
index 7fe1df3f9fba091fa15db4221779f8a81528e329..deda2111f4305784818bfea1038a7c71bcdfd9ed 100644
--- a/src/srun/opt.c
+++ b/src/srun/opt.c
@@ -2338,7 +2338,7 @@ static void _help(void)
" --multi-prog if set the program name specified is the\n"
" configuration specification for multiple programs\n"
" -n, --ntasks=ntasks number of tasks to run\n"
-" --nice[=value] decrease secheduling priority by value\n"
+" --nice[=value] decrease scheduling priority by value\n"
" --ntasks-per-node=n number of tasks to invoke on each node\n"
" -N, --nodes=N number of nodes on which to run (N = min[-max])\n"
" -o, --output=out location of stdout redirection\n"