From b0eb2a6390c94f64b14497d75e598a22fed291bd Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Tue, 7 Jun 2011 21:19:04 -0700
Subject: [PATCH] Fix various typos in code and documentation
03_COSMETICS_typos.diff from Gerrit Renker, CSCS
---
doc/html/dist_plane.shtml | 4 ++--
doc/html/mpi_guide.shtml | 2 +-
doc/man/man1/sacctmgr.1 | 2 +-
doc/man/man1/salloc.1 | 2 +-
doc/man/man1/sbatch.1 | 2 +-
doc/man/man1/srun.1 | 4 ++--
doc/man/man5/cgroup.conf.5 | 2 +-
doc/man/man5/gres.conf.5 | 4 ++--
doc/man/man5/slurm.conf.5 | 10 +++++-----
src/api/Makefile.am | 2 +-
src/api/job_info.c | 2 +-
src/slurmctld/job_mgr.c | 2 +-
12 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/doc/html/dist_plane.shtml b/doc/html/dist_plane.shtml
index 57747d5b57d..7f0bfca6446 100644
--- a/doc/html/dist_plane.shtml
+++ b/doc/html/dist_plane.shtml
@@ -17,7 +17,7 @@ task list is: 0, 1, 2, 3, 4, ..., 19, 20.
<p>On <u>One (1)</u> node: <i>srun -N 1-1 -n 21 -m plane=4 <...></i>.
<p>The distribution results in a plane distribution with plane_size 21.
-Even thought the user specified a plane_size of 4 the final plane
+Even though the user specified a plane_size of 4 the final plane
distribution results in a plane_size of 21.
<p>
@@ -114,7 +114,7 @@ task list is: 0, 1, 2, 3, 4, ..., 19, 20.
<p>On <u>One (1)</u> node:
<i>srun -N 1-1 -n 21 -m plane=4 --cpu_bind=core <...></i>.
-Even thought the user specified a plane_size of 4 the final plane
+Even though the user specified a plane_size of 4 the final plane
distribution results in a plane distribution with plane_size=8.
<p>
diff --git a/doc/html/mpi_guide.shtml b/doc/html/mpi_guide.shtml
index 40c74fdd442..e546f4a7bb2 100644
--- a/doc/html/mpi_guide.shtml
+++ b/doc/html/mpi_guide.shtml
@@ -4,7 +4,7 @@
<p>MPI use depends upon the type of MPI being used.
There are three fundamentally different modes of operation used
-by these various MPI implementation.
+by these various MPI implementations.
<ol>
<li>SLURM directly launches the tasks and performs initialization
of communications (Quadrics MPI, MPICH2, MPICH-GM, MPICH-MX,
diff --git a/doc/man/man1/sacctmgr.1 b/doc/man/man1/sacctmgr.1
index 711591a6d9a..1602572f6ce 100644
--- a/doc/man/man1/sacctmgr.1
+++ b/doc/man/man1/sacctmgr.1
@@ -34,7 +34,7 @@ commands.
.TP
\fB\-h\fR, \fB\-\-help\fR
-Print a help message describing the usage of \fBssacctmgr\fR.
+Print a help message describing the usage of \fBsacctmgr\fR.
This is equivalent to the \fBhelp\fR command.
.TP
diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1
index 2d9072106fc..ffced4228ac 100644
--- a/doc/man/man1/salloc.1
+++ b/doc/man/man1/salloc.1
@@ -452,7 +452,7 @@ your command any time that the SLURM controller tells salloc that its job
allocation has been revoked. The job allocation can be revoked for a
couple of reasons: someone used \fBscancel\fR to revoke the allocation,
or the allocation reached its time limit. If you do not specify a signal
-name or number and SLURM is configured to signal a the spawned command at job
+name or number and SLURM is configured to signal the spawned command at job
termination, the default signal is SIGHUP for interactive and SIGTERM for
non\-interactive sessions.
diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1
index 9b5d88ee62a..5d1f45f77a4 100644
--- a/doc/man/man1/sbatch.1
+++ b/doc/man/man1/sbatch.1
@@ -590,7 +590,7 @@ https://computing.llnl.gov/linux/slurm/dist_plane.html.
.B arbitrary
The arbitrary method of distribution will allocate processes in\-order
as listed in file designated by the environment variable
-SLURM_HOSTFILE. If this variable is listed it will over ride any
+SLURM_HOSTFILE. If this variable is listed it will override any
other method specified. If not set the method will default to block.
Inside the hostfile must contain at minimum the number of hosts
requested and be one per line or comma separated. If specifying a
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index 5e96cbe5168..aabb0a8d814 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -390,8 +390,8 @@ other running jobs. This is the oposite of \-\-share, whichever option
is seen last on the command line will win. (The default shared/exclusive
behavior depends on system configuration.)
-This option can also be used when initiating more than job step within
-an existing resource allocation and you want separate processors to
+This option can also be used when initiating more than one job step within
+an existing resource allocation, where you want separate processors to
be dedicated to each job step. If sufficient processors are not
available to initiate the job step, it will be deferred. This can
be thought of as providing resource management for the job within
diff --git a/doc/man/man5/cgroup.conf.5 b/doc/man/man5/cgroup.conf.5
index ae35cc2033b..63878cb1b24 100644
--- a/doc/man/man5/cgroup.conf.5
+++ b/doc/man/man5/cgroup.conf.5
@@ -66,7 +66,7 @@ of this particular plugin.
.LP
Slurm \fBtask/cgroup\fP plugin is used to enforce allocated resources
-constraints, thus avoiding tasks to use unallocated ressources. It currently
+constraints, thus avoiding tasks to use unallocated resources. It currently
only uses cpuset subsystem but could use memory and devices subsystems in a
near future too.
diff --git a/doc/man/man5/gres.conf.5 b/doc/man/man5/gres.conf.5
index 1b2382456bb..7f7b93d8743 100644
--- a/doc/man/man5/gres.conf.5
+++ b/doc/man/man5/gres.conf.5
@@ -30,7 +30,7 @@ to mulitply the number by 1024, 1048576 or 1073741824 respectively.
.TP
\fBCPUs\fR
Specify the CPU index numbers for the specific CPUs which can
-use this resources. For example, it may be strongly preferable
+use this resource. For example, it may be strongly preferable
to use specific CPUs with specific devices (e.g. on a NUMA
architecture). Multiple CPUs may be specified using a comma
delimited list or a range may be specified using a "\-" separator
@@ -42,7 +42,7 @@ If any CPU can be used with the resources, then do not specify the
.TP
\fBFile\fR
Fully qualified pathname of the device files associated with a resource.
-The name can include a numberic range suffix to be interpretted by SLURM
+The name can include a numberic range suffix to be interpreted by SLURM
(e.g. \fIFile=/dev/nvidia[0\-3]\fR).
This field is generally required if enforcement of generic resource
allocations is to be supported (i.e. prevents a users from making
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 20a0c9af661..1cf6655e0cf 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -2207,9 +2207,9 @@ Also see \fBGres\fR.
A comma delimited list of generic resources specifications for a node.
Each resource specification consists of a name followed by an optional
colon with a numeric value (default value is one)
-(e.g. "Gres=bandwidth:10000,gpus:2").
+(e.g. "Gres=bandwidth:10000,gpu:2").
A suffix of "K", "M" or "G" may be used to mulitply the number by 1024,
-1048576 or 1073741824 respectively (e.g. "Gres=bandwidth:4G,gpus:4")..
+1048576 or 1073741824 respectively (e.g. "Gres=bandwidth:4G,gpu:4")..
By default a node has no generic resources.
Also see \fBFeature\fR.
@@ -2463,7 +2463,7 @@ in the configuration file with multiple entries where "PartitionName=DEFAULT".
The "PartitionName=" specification must be placed on every line
describing the configuration of partitions.
If a partition that is in use is deleted from the configuration and slurm
-is restarted or reconfigured (scontrol reconfgure), jobs using the partition
+is restarted or reconfigured (scontrol reconfigure), jobs using the partition
are canceled.
\fBNOTE:\fR Put all parameters for each partition on a single line.
Each line of partition configuration information should
@@ -2740,7 +2740,7 @@ to all of the programs.
.TP
\fBBASIL_RESERVATION_ID\fR
Basil reservation ID.
-Available on Cray XT systems only.
+Available on Cray XT/XE systems only.
.TP
\fBMPIRUN_PARTITION\fR
BlueGene partition name.
@@ -2811,7 +2811,7 @@ The \fBTopologyPlugin\fR parameter controls which plugin is used to
collect network topology information.
The only values presently supported are
"topology/3d_torus" (default for IBM BlueGene, Sun Constellation and
-Cray XT systems, performs best\-fit logic over three\-dimensional topology),
+Cray XT/XE systems, performs best\-fit logic over three\-dimensional topology),
"topology/none" (default for other systems,
best\-fit logic over one\-dimensional topology),
"topology/tree" (determine the network topology based
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index 8ca69cff41d..b03bf4eef89 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -44,7 +44,7 @@ current = $(SLURM_API_CURRENT)
age = $(SLURM_API_AGE)
rev = $(SLURM_API_REVISION)
-# libpmi version informaiton
+# libpmi version information
#
# The libpmi interface shouldn't be changing any time soon, so for SLURM's
# libpmi only the library REVISION and AGE should change (and it is debatable
diff --git a/src/api/job_info.c b/src/api/job_info.c
index 0464134b7fd..56cf19ac851 100644
--- a/src/api/job_info.c
+++ b/src/api/job_info.c
@@ -477,7 +477,7 @@ line6:
if (i < job_resrcs->cpu_array_cnt - 1) {
continue;
}
- /* add elipsis before last entry */
+ /* add ellipsis before last entry */
xstrcat(out, "...,");
length += 4;
}
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index fc0e0a38770..a1529cba91c 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -4675,7 +4675,7 @@ static bool _valid_pn_min_mem(job_desc_msg_t * job_desc_msg)
return false;
}
- /* Our size is per CPU and limit per node or vise-versa.
+ /* Our size is per CPU and limit per node or vice-versa.
* CPU count my vary by node, but we don't have a good
* way to identify specific nodes for the job at this
* point, so just pick the first node as a basis for enforcing
--
GitLab