Remove references to slaunch.

doc/html/news.shtml

@@ -82,7 +82,7 @@ on a node.</li>
 <li>Permit batch jobs to be requeued.</li>
 <li>Expanded support of Moab and Maui schedulers.</li>
 <li><i>Srun</i> command augmented by new commands for each operation:
-<i>salloc</i>, <i>slaunch</i>, <i>sbatch</i>, and <i>sattach</i>.</li>
+<i>salloc</i>, <i>sbatch</i>, and <i>sattach</i>.</li>
 <li>Sched/wiki plugin (for Moab and Maui Schedulers) rewritten to 
 provide vastly improved integration.</li>
 <li>BlueGene plugin permits use of different boot images per job 

doc/html/programmer_guide.shtml

@@ -117,7 +117,6 @@ with an existing SLURM job.<br>
 <b>scancel</b>&#151;User command to cancel (or signal) a job or job step.<br>
 <b>scontrol</b>&#151;Administrator tool to manage SLURM.<br>
 <b>sinfo</b>&#151;User command to get information on SLURM nodes and partitions.<br>
-<b>slaunch</b>&#151;User command to launch tasks within an existing job allocateion.<br>
 <b>slurmctld</b>&#151;SLURM central manager daemon code.<br>
 <b>slurmd</b>&#151;SLURM daemon code to manage the compute server nodes including 
 the execution of user applications.<br>

doc/man/man1/salloc.1

@@ -9,7 +9,7 @@ salloc [\fIoptions\fP] <\fIcommand\fP> [\fIcommand args\fR]
 .LP 
 salloc is used to allocate a SLURM job allocation, which is a set of resources (nodes), possibly with some set of constraints (e.g. number of processors per node).  When salloc successfully obtains the requested allocation, it then runs the command specified by the user.  Finally, when the user specified command is complete, salloc relinquishes the job allocation.
 
-The command may be any program the user wishes.  Some typical commands are xterm, a shell script containing slaunch commands, and slaunch (see the EXAMPLES section).
+The command may be any program the user wishes.  Some typical commands are xterm, a shell script containing srun commands, and srun (see the EXAMPLES section).
 .SH "OPTIONS"
 .LP 
 
@@ -422,7 +422,7 @@ While salloc is waiting for a PENDING job allocation, most signals will cause sa
 However, if the allocation has been granted and salloc has already started the command speficied in its command line parameters salloc will ignore most signals.  salloc will not exit or release the allocation until the command exits.  The noteable exception is SIGHUP; a HUP signal will cause salloc to release the allocation and exit without waiting for the command to finish.
 .SH "EXAMPLES"
 .LP 
-To get an allocation, and open a new xterm in which slaunch commands may be typed interactively:
+To get an allocation, and open a new xterm in which srun commands may be typed interactively:
 .IP 
 $ salloc \-N16 xterm
 .br 
@@ -434,7 +434,7 @@ salloc: Relinquishing job allocation 65537
 .LP 
 To grab an allocation of nodes and launch a parallel application on one command line (See the \fBsalloc\fR man page for more examples):
 .IP 
-salloc \-N5 slaunch \-n10 myprogram
+salloc \-N5 srun \-n10 myprogram
 
 .SH "COPYING"
 Copyright (C) 2006 The Regents of the University of California.
@@ -456,4 +456,4 @@ details.
 
 .SH "SEE ALSO"
 .LP 
-sinfo(1), slaunch(1), sattach(1), sbatch(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)
+sinfo(1), sattach(1), sbatch(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)

doc/man/man1/sattach.1

@@ -45,7 +45,7 @@ Suppress informational messages from sattach. Errors will still be displayed.
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
 Increase the verbosity of sattach's informational messages.  Multiple \-v's
-will further increase slaunch's verbosity.
+will further increase sattach's verbosity.
 
 .TP 
 \fB\-h\fR, \fB\-\-help\fR
@@ -86,4 +86,4 @@ details.
 
 .SH "SEE ALSO"
 .LP 
-sinfo(1), slaunch(1), salloc(1), sbatch(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)
+sinfo(1), salloc(1), sbatch(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)

doc/man/man1/sbatch.1

@@ -461,7 +461,7 @@ $ cat myscript
 .br
 #!/bin/sh
 .br
-slaunch hostname |sort
+srun hostname |sort
 .br
 $ sbatch \-N4 myscript
 .br
@@ -484,7 +484,7 @@ morrone:~$ sbatch \-N4 <<EOF
 .br
 > #!/bin/sh
 .br
-> slaunch hostname |sort
+> srun hostname |sort
 .br
 > EOF
 .br
@@ -520,4 +520,4 @@ details.
 
 .SH "SEE ALSO"
 .LP 
-sinfo(1), slaunch(1), sattach(1), salloc(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)
+sinfo(1), sattach(1), salloc(1), squeue(1), scancel(1), scontrol(1), slurm.conf(5), sched_setaffinity(2), numa(3)

doc/man/man1/slurm.1

@@ -55,7 +55,7 @@ details.
 .SH "SEE ALSO"
 \fBsacct\fR(1), \fBsalloc\fR(1), \fBsattach\fR(1), \fBsbatch\fR(1), 
 \fBsbcast\fR(1), \fBscancel\fR(1), \fBscontrol\fR(1), \fBsinfo\fR(1), 
-\fBslaunch\fR(1), \fBsmap\fR(1), \fBsqueue\fR(1), \fBsrun\fR(1),
+\fBsmap\fR(1), \fBsqueue\fR(1), \fBsrun\fR(1),
 \fBsview\fR(1), 
 \fBslurm.conf\fR(5),
 \fBslurmctld\fR(8), \fBslurmd\fR(8)

src/api/step_launch.h

@@ -61,7 +61,8 @@ struct step_launch_state {
 	/* message thread variables */
 	eio_handle_t *msg_handle;
 	pthread_t msg_thread;
-	/* set to -1 if slaunch message handler should not attempt to handle */
+	/* set to -1 if step launch message handler should not attempt
+	   to handle */
 	int slurmctld_socket_fd;
 	uint16_t num_resp_port;
 	uint16_t *resp_port; /* array of message response ports */

src/common/env.c

@@ -621,7 +621,7 @@ int setup_env(env_t *env)
 
 /**********************************************************************
  * From here on are the new environment variable management functions,
- * used by the "new" commands: salloc, sbatch, an slaunch.
+ * used by the "new" commands: salloc, sbatch, and the step launch APIs.
  **********************************************************************/
 
 /*

src/sattach/sattach.c

@@ -600,7 +600,7 @@ _handle_msg(message_thread_state_t *mts, slurm_msg_t *msg)
 
 /**********************************************************************
  * Functions for manipulating the MPIR_* global variables which
- * are accessed by parallel debuggers which trace slaunch.
+ * are accessed by parallel debuggers which trace sattach.
  **********************************************************************/
 static void
 _mpir_init(int num_tasks)