diff --git a/NEWS b/NEWS
index cb103d39879207d59034c22b3258eafc5cf2db90..9600c3f59ee2efe6fb52fc344aff71ff24c89bb6 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,6 @@ documents those changes that are of interest to users and admins.
  -- New stdio protocol.  Now srun has just a single TCP stream to each node
     of a job-step.  srun and slurmd comminicate over the TCP stream using a
     simple messaging protocol.
-    WARNING:  The stdio rewrite is incomplete and not yet fully debugged.
  -- Added task plugin and use task prolog/epilog(s).
  -- New slurmd_step functionality added.  Fork exec instead of using shared
     memory.  Not completely tested.
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index 3870204fd613ca24ee6c101c5f8de0289edd33ad..4501cf9fa24ef58d1f560f407dca44a38f3dacfe 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -671,38 +671,6 @@ the \fB-j\fR (\fB\-\-join\fR) option is is also specified,
 \fBsrun\fR "joins" the running job, and is able to forward signals,
 connects stdin, and acts for the most part much like the \fBsrun\fR
 process that initiated the job. 
-.PP 
-Attaching to running batch jobs is also supported, if the batch 
-job is being managed by SLURM (That is, a script submitted with
-\fBsrun \-b\fR). The stdout and stderr from the \fIbatch script\fR
-will then be copied to the attaching \fBsrun\fR, and if \fB-j\fR
-is also specified, signals will be sent to the batch script.
-This feature provides a good method for determining the status 
-of a running \fBsrun\fR within a batch script. For example, 
-consider attaching to a running batch job with jobid 483:
-.br
-
-.br
-> srun --join --attach 483
-.br
-
-.br
-After pressing Ctrl-C twice within one second, SIGINT is forwarded
-to the batch job script, and the running srun reports its status:
-.br
-
-.br
-attach[483]: interrupt (one more within 1 sec to abort)
-.br
-attach[483]: sending Ctrl-C to job
-.br
-srun: interrupt (one more within 1 sec to abort)
-.br
-srun: task[0-15]: running
-.br
-
-.br
-showing that all 16 tasks in the current job step are running.
 .PP
 Node and CPU selection options do not make sense when specifying 
 \fB\-\-attach\fR, and it is an error to use \fB-n\fR, \fB-c\fR,