1 files changed, 11 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
index 5011c868715..c9e689f06ca 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
@@ -35,7 +35,7 @@
 %
 %<*driver|package>
 \RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3file.dtx 4101 2012-08-15 16:05:33Z bruno $
+\GetIdInfo$Id: l3file.dtx 4212 2012-09-09 12:24:04Z bruno $
   {L3 File and I/O operations}
 %</driver|package>
 %<*driver>
@@ -218,7 +218,7 @@
 %   to other programmers.
 % \end{function}
 %
-% \begin{function}{\ior_list_streams:, \iow_list_streams:}
+% \begin{function}[updated = 2012-09-09]{\ior_list_streams:, \iow_list_streams:}
 %   \begin{syntax}
 %     \cs{ior_list_streams:}
 %     \cs{iow_list_streams:}
@@ -313,7 +313,7 @@
 %   (\emph{cf.}~\cs{iow_shipout_x:Nn}).
 % \end{function}
 %
-% \begin{function}{\iow_shipout_x:Nn, \iow_shipout_x:Nx}
+% \begin{function}[updated = 2012-09-08]{\iow_shipout_x:Nn, \iow_shipout_x:Nx}
 %   \begin{syntax}
 %     \cs{iow_shipout_x:Nn} \meta{stream} \Arg{tokens}
 %   \end{syntax}
@@ -324,7 +324,7 @@
 %   these functions suitable for including material finalised during
 %   the page building process (such as the page number integer).
 %   \begin{texnote}
-%     \cs{iow_shipout_x:Nn} is the \TeX{} primitive \tn{write} renamed.
+%     This is a wrapper around the \TeX{} primitive \tn{write}.
 %   \end{texnote}
 % \end{function}
 %
@@ -1075,7 +1075,7 @@
     \__msg_term:nnn { LaTeX / kernel }
       { \prop_if_empty:NTF #1 { show-no-stream } { show-open-streams } }
       {#2}
-    \__msg_show_variable:x
+    \__msg_show_variable:n
       { \prop_map_function:NN #1 \__msg_show_item_unbraced:nn }
   }
 %    \end{macrocode}
@@ -1336,9 +1336,11 @@
 % \subsubsection{Deferred writing}
 %
 % \begin{macro}{\iow_shipout_x:Nn, \iow_shipout_x:Nx}
-%   First the easy part, this is the primitive.
+%   First the easy part, this is the primitive, which expects its
+%   argument to be braced.
 %    \begin{macrocode}
-\cs_new_eq:NN \iow_shipout_x:Nn \tex_write:D
+\cs_new_protected:Npn \iow_shipout_x:Nn #1#2
+  { \tex_write:D #1 {#2} }
 \cs_generate_variant:Nn \iow_shipout_x:Nn { Nx }
 %    \end{macrocode}
 % \end{macro}
@@ -1347,7 +1349,7 @@
 %   With \eTeX{} available deferred writing without expansion is easy.
 %    \begin{macrocode}
 \cs_new_protected:Npn \iow_shipout:Nn #1#2
-  { \iow_shipout_x:Nn #1 { \exp_not:n {#2} } }
+  { \tex_write:D #1 { \exp_not:n {#2} } }
 \cs_generate_variant:Nn \iow_shipout:Nn { Nx }
 %    \end{macrocode}
 % \end{macro}
@@ -1364,7 +1366,7 @@
 %   need to be doubled.
 %    \begin{macrocode}
 \cs_new_protected:Npn \iow_now:Nn #1#2
-  { \tex_immediate:D \iow_shipout_x:Nn #1 { \exp_not:n {#2} } }
+  { \tex_immediate:D \tex_write:D #1 { \exp_not:n {#2} } }
 \cs_generate_variant:Nn \iow_now:Nn { Nx }
 %    \end{macrocode}
 % \end{macro}