Autodoc commit for master/07906aab, 1.1.x/5293929c

1 files changed, 21 insertions, 15 deletions

diff --git a/clojure.java.shell-api.html b/clojure.java.shell-api.html
index 8df4e531..f64a4421 100644
--- a/clojure.java.shell-api.html
+++ b/clojure.java.shell-api.html
@@ -90,17 +90,23 @@ collecting its stdout</pre>
 
 Options are
 
-:in    may be given followed by a String specifying text to be fed to the 
-       sub-process's stdin.  
-:out   option may be given followed by :bytes or a String. If a String 
-       is given, it will be used as a character encoding name (for 
-       example "UTF-8" or "ISO-8859-1") to convert the 
-       sub-process's stdout to a String which is returned.
-       If :bytes is given, the sub-process's stdout will be stored in 
-       a byte array and returned.  Defaults to UTF-8.
-:env   override the process env with a map (or the underlying Java
-       String[] if you are a masochist).
-:dir   override the process dir with a String or java.io.File.
+:in      may be given followed by a String or byte array specifying input
+         to be fed to the sub-process's stdin.
+:in-enc  option may be given followed by a String, used as a character
+         encoding name (for example "UTF-8" or "ISO-8859-1") to
+         convert the input string specified by the :in option to the
+         sub-process's stdin.  Defaults to UTF-8.
+         If the :in option provides a byte array, then the bytes are passed
+         unencoded, and this option is ignored.
+:out-enc option may be given followed by :bytes or a String. If a
+         String is given, it will be used as a character encoding
+         name (for example "UTF-8" or "ISO-8859-1") to convert
+         the sub-process's stdout to a String which is returned.
+         If :bytes is given, the sub-process's stdout will be stored
+         in a byte array and returned.  Defaults to UTF-8.
+:env     override the process env with a map (or the underlying Java
+         String[] if you are a masochist).
+:dir     override the process dir with a String or java.io.File.
 
 You can bind :env or :dir for multiple operations using with-sh-env
 and with-sh-dir.
@@ -108,10 +114,10 @@ and with-sh-dir.
 sh returns a map of
   :exit =&gt; sub-process's exit code
   :out  =&gt; sub-process's stdout (as byte[] or String)
-  :err  =&gt; sub-process's stderr (as byte[] or String)</pre>
+  :err  =&gt; sub-process's stderr (String via platform default encoding)</pre>
   <span class="var-added"><span id="content">Added in Clojure version 1.2</span><br /></span>
   
-  <a href="http://github.com/richhickey/clojure/blob/4bea7a529bb14b99d48758cfaf0d71af0997f0ff/src/clj/clojure/java/shell.clj#L63" id="var-source">Source</a>
+  <a href="http://github.com/richhickey/clojure/blob/836bc44afff8ac17233565447e8a289aea3203c4/src/clj/clojure/java/shell.clj#L79" id="var-source">Source</a>
 </div><div id="var-entry">
   <br />
   <hr />
@@ -122,7 +128,7 @@ sh returns a map of
   <pre id="var-docstr">Sets the directory for use with sh, see sh for details.</pre>
   <span class="var-added"><span id="content">Added in Clojure version 1.2</span><br /></span>
   
-  <a href="http://github.com/richhickey/clojure/blob/4bea7a529bb14b99d48758cfaf0d71af0997f0ff/src/clj/clojure/java/shell.clj#L20" id="var-source">Source</a>
+  <a href="http://github.com/richhickey/clojure/blob/836bc44afff8ac17233565447e8a289aea3203c4/src/clj/clojure/java/shell.clj#L21" id="var-source">Source</a>
 </div><div id="var-entry">
   <br />
   <hr />
@@ -133,7 +139,7 @@ sh returns a map of
   <pre id="var-docstr">Sets the environment for use with sh, see sh for details.</pre>
   <span class="var-added"><span id="content">Added in Clojure version 1.2</span><br /></span>
   
-  <a href="http://github.com/richhickey/clojure/blob/4bea7a529bb14b99d48758cfaf0d71af0997f0ff/src/clj/clojure/java/shell.clj#L27" id="var-source">Source</a>
+  <a href="http://github.com/richhickey/clojure/blob/836bc44afff8ac17233565447e8a289aea3203c4/src/clj/clojure/java/shell.clj#L28" id="var-source">Source</a>
 </div>