Autodoc commit for 1.2.x/e4ea06c9, master/53805523, 1.1.x/d132c5f1

3 files changed, 30 insertions, 30 deletions

diff --git a/branch-master/api-index.json b/branch-master/api-index.json
index 16f2d8b1..53d760ce 100644
--- a/branch-master/api-index.json
+++ b/branch-master/api-index.json
@@ -2991,46 +2991,46 @@
    "line":17,
    "file":
    "\/home\/tom\/src\/clj\/autodoc-stable\/..\/autodoc-work-area\/clojure-contrib\/src\/modules\/jmx\/src\/main\/clojure\/clojure\/contrib\/jmx\/client.clj"},
-  {"arglists":[["x"]],
+  {"arglists":[["x", "&", "options"]],
    "name":"json-str",
    "namespace":"clojure.contrib.json",
    "source-url":
-   "http:\/\/github.com\/clojure\/clojure-contrib\/blob\/d6f6ccfaeac03e35b1f9dbfa04424866cd9b2a41\/modules\/json\/src\/main\/clojure\/clojure\/contrib\/json.clj#L302",
+   "http:\/\/github.com\/clojure\/clojure-contrib\/blob\/5380552375c8b074d979cb1d1b8a8382bdf8a999\/modules\/json\/src\/main\/clojure\/clojure\/contrib\/json.clj#L305",
    "raw-source-url":
    "http:\/\/github.com\/clojure\/clojure-contrib\/raw\/\/modules\/clojure\/contrib\/json.clj",
    "wiki-url":
    "http:\/\/clojure.github.com\/clojure-contrib\/\/json-api.html#clojure.contrib.json\/json-str",
    "doc":"Converts x to a JSON-formatted string.",
    "var-type":"function",
-   "line":302,
+   "line":305,
    "file":
    "\/home\/tom\/src\/clj\/autodoc-stable\/..\/autodoc-work-area\/clojure-contrib\/src\/modules\/json\/src\/main\/clojure\/clojure\/contrib\/json.clj"},
-  {"arglists":[["x"]],
+  {"arglists":[["x", "&", "options"]],
    "name":"pprint-json",
    "namespace":"clojure.contrib.json",
    "source-url":
-   "http:\/\/github.com\/clojure\/clojure-contrib\/blob\/d6f6ccfaeac03e35b1f9dbfa04424866cd9b2a41\/modules\/json\/src\/main\/clojure\/clojure\/contrib\/json.clj#L339",
+   "http:\/\/github.com\/clojure\/clojure-contrib\/blob\/5380552375c8b074d979cb1d1b8a8382bdf8a999\/modules\/json\/src\/main\/clojure\/clojure\/contrib\/json.clj#L344",
    "raw-source-url":
    "http:\/\/github.com\/clojure\/clojure-contrib\/raw\/\/modules\/clojure\/contrib\/json.clj",
    "wiki-url":
    "http:\/\/clojure.github.com\/clojure-contrib\/\/json-api.html#clojure.contrib.json\/pprint-json",
    "doc":"Pretty-prints JSON representation of x to *out*",
    "var-type":"function",
-   "line":339,
+   "line":344,
    "file":
    "\/home\/tom\/src\/clj\/autodoc-stable\/..\/autodoc-work-area\/clojure-contrib\/src\/modules\/json\/src\/main\/clojure\/clojure\/contrib\/json.clj"},
-  {"arglists":[["x"]],
+  {"arglists":[["x", "&", "options"]],
    "name":"print-json",
    "namespace":"clojure.contrib.json",
    "source-url":
-   "http:\/\/github.com\/clojure\/clojure-contrib\/blob\/d6f6ccfaeac03e35b1f9dbfa04424866cd9b2a41\/modules\/json\/src\/main\/clojure\/clojure\/contrib\/json.clj#L310",
+   "http:\/\/github.com\/clojure\/clojure-contrib\/blob\/5380552375c8b074d979cb1d1b8a8382bdf8a999\/modules\/json\/src\/main\/clojure\/clojure\/contrib\/json.clj#L314",
    "raw-source-url":
    "http:\/\/github.com\/clojure\/clojure-contrib\/raw\/\/modules\/clojure\/contrib\/json.clj",
    "wiki-url":
    "http:\/\/clojure.github.com\/clojure-contrib\/\/json-api.html#clojure.contrib.json\/print-json",
    "doc":"Write JSON-formatted output to *out*",
    "var-type":"function",
-   "line":310,
+   "line":314,
    "file":
    "\/home\/tom\/src\/clj\/autodoc-stable\/..\/autodoc-work-area\/clojure-contrib\/src\/modules\/json\/src\/main\/clojure\/clojure\/contrib\/json.clj"},
   {"arglists":
@@ -3039,7 +3039,7 @@
    "name":"read-json",
    "namespace":"clojure.contrib.json",
    "source-url":
-   "http:\/\/github.com\/clojure\/clojure-contrib\/blob\/d6f6ccfaeac03e35b1f9dbfa04424866cd9b2a41\/modules\/json\/src\/main\/clojure\/clojure\/contrib\/json.clj#L186",
+   "http:\/\/github.com\/clojure\/clojure-contrib\/blob\/5380552375c8b074d979cb1d1b8a8382bdf8a999\/modules\/json\/src\/main\/clojure\/clojure\/contrib\/json.clj#L186",
    "raw-source-url":
    "http:\/\/github.com\/clojure\/clojure-contrib\/raw\/\/modules\/clojure\/contrib\/json.clj",
    "wiki-url":
@@ -3068,7 +3068,7 @@
    "http:\/\/clojure.github.com\/clojure-contrib\/\/json-api.html#clojure.contrib.json\/write-json",
    "namespace":"clojure.contrib.json",
    "var-type":"function",
-   "arglists":[["object", "out"]],
+   "arglists":[["object", "out", "escape-unicode?"]],
    "doc":"Print object to PrintWriter out as JSON",
    "name":"write-json"},
   {"arglists":[[]],
diff --git a/branch-master/json-api.html b/branch-master/json-api.html
index b081d277..91a17f49 100644
--- a/branch-master/json-api.html
+++ b/branch-master/json-api.html
@@ -94,34 +94,34 @@ To read JSON, use read-json.</pre>
   <hr />
   <h2 id="clojure.contrib.json/json-str">json-str</h2>
   <span id="var-type">function</span><br />
-  <pre id="var-usage">Usage: (json-str x)
+  <pre id="var-usage">Usage: (json-str x &amp; options)
 </pre>
   <pre id="var-docstr">Converts x to a JSON-formatted string.</pre>
   
   
-  <a href="http://github.com/clojure/clojure-contrib/blob/d6f6ccfaeac03e35b1f9dbfa04424866cd9b2a41/modules/json/src/main/clojure/clojure/contrib/json.clj#L302" id="var-source">Source</a>
+  <a href="http://github.com/clojure/clojure-contrib/blob/5380552375c8b074d979cb1d1b8a8382bdf8a999/modules/json/src/main/clojure/clojure/contrib/json.clj#L305" id="var-source">Source</a>
 </div><div id="var-entry">
   <br />
   <hr />
   <h2 id="clojure.contrib.json/pprint-json">pprint-json</h2>
   <span id="var-type">function</span><br />
-  <pre id="var-usage">Usage: (pprint-json x)
+  <pre id="var-usage">Usage: (pprint-json x &amp; options)
 </pre>
   <pre id="var-docstr">Pretty-prints JSON representation of x to *out*</pre>
   
   
-  <a href="http://github.com/clojure/clojure-contrib/blob/d6f6ccfaeac03e35b1f9dbfa04424866cd9b2a41/modules/json/src/main/clojure/clojure/contrib/json.clj#L339" id="var-source">Source</a>
+  <a href="http://github.com/clojure/clojure-contrib/blob/5380552375c8b074d979cb1d1b8a8382bdf8a999/modules/json/src/main/clojure/clojure/contrib/json.clj#L344" id="var-source">Source</a>
 </div><div id="var-entry">
   <br />
   <hr />
   <h2 id="clojure.contrib.json/print-json">print-json</h2>
   <span id="var-type">function</span><br />
-  <pre id="var-usage">Usage: (print-json x)
+  <pre id="var-usage">Usage: (print-json x &amp; options)
 </pre>
   <pre id="var-docstr">Write JSON-formatted output to *out*</pre>
   
   
-  <a href="http://github.com/clojure/clojure-contrib/blob/d6f6ccfaeac03e35b1f9dbfa04424866cd9b2a41/modules/json/src/main/clojure/clojure/contrib/json.clj#L310" id="var-source">Source</a>
+  <a href="http://github.com/clojure/clojure-contrib/blob/5380552375c8b074d979cb1d1b8a8382bdf8a999/modules/json/src/main/clojure/clojure/contrib/json.clj#L314" id="var-source">Source</a>
 </div><div id="var-entry">
   <br />
   <hr />
@@ -137,7 +137,7 @@ keywords.  If eof-error? is true (default), empty input will throw
 an EOFException; if false EOF will return eof-value. </pre>
   
   
-  <a href="http://github.com/clojure/clojure-contrib/blob/d6f6ccfaeac03e35b1f9dbfa04424866cd9b2a41/modules/json/src/main/clojure/clojure/contrib/json.clj#L186" id="var-source">Source</a>
+  <a href="http://github.com/clojure/clojure-contrib/blob/5380552375c8b074d979cb1d1b8a8382bdf8a999/modules/json/src/main/clojure/clojure/contrib/json.clj#L186" id="var-source">Source</a>
 </div><div id="var-entry">
   <br />
   <hr />
@@ -157,7 +157,7 @@ false EOF will return eof-value. </pre>
   <hr />
   <h2 id="clojure.contrib.json/write-json">write-json</h2>
   <span id="var-type">function</span><br />
-  <pre id="var-usage">Usage: (write-json object out)
+  <pre id="var-usage">Usage: (write-json object out escape-unicode?)
 </pre>
   <pre id="var-docstr">Print object to PrintWriter out as JSON</pre>
   
diff --git a/index-v1.3.clj b/index-v1.3.clj
index 166caeb6..a872fe70 100644
--- a/index-v1.3.clj
+++ b/index-v1.3.clj
@@ -2971,46 +2971,46 @@
    :line 17,
    :file
    "/home/tom/src/clj/autodoc-stable/../autodoc-work-area/clojure-contrib/src/modules/jmx/src/main/clojure/clojure/contrib/jmx/client.clj"}
-  {:arglists ([x]),
+  {:arglists ([x & options]),
    :name "json-str",
    :namespace "clojure.contrib.json",
    :source-url
-   "http://github.com/clojure/clojure-contrib/blob/d6f6ccfaeac03e35b1f9dbfa04424866cd9b2a41/modules/json/src/main/clojure/clojure/contrib/json.clj#L302",
+   "http://github.com/clojure/clojure-contrib/blob/5380552375c8b074d979cb1d1b8a8382bdf8a999/modules/json/src/main/clojure/clojure/contrib/json.clj#L305",
    :raw-source-url
    "http://github.com/clojure/clojure-contrib/raw//modules/clojure/contrib/json.clj",
    :wiki-url
    "http://clojure.github.com/clojure-contrib//json-api.html#clojure.contrib.json/json-str",
    :doc "Converts x to a JSON-formatted string.",
    :var-type "function",
-   :line 302,
+   :line 305,
    :file
    "/home/tom/src/clj/autodoc-stable/../autodoc-work-area/clojure-contrib/src/modules/json/src/main/clojure/clojure/contrib/json.clj"}
-  {:arglists ([x]),
+  {:arglists ([x & options]),
    :name "pprint-json",
    :namespace "clojure.contrib.json",
    :source-url
-   "http://github.com/clojure/clojure-contrib/blob/d6f6ccfaeac03e35b1f9dbfa04424866cd9b2a41/modules/json/src/main/clojure/clojure/contrib/json.clj#L339",
+   "http://github.com/clojure/clojure-contrib/blob/5380552375c8b074d979cb1d1b8a8382bdf8a999/modules/json/src/main/clojure/clojure/contrib/json.clj#L344",
    :raw-source-url
    "http://github.com/clojure/clojure-contrib/raw//modules/clojure/contrib/json.clj",
    :wiki-url
    "http://clojure.github.com/clojure-contrib//json-api.html#clojure.contrib.json/pprint-json",
    :doc "Pretty-prints JSON representation of x to *out*",
    :var-type "function",
-   :line 339,
+   :line 344,
    :file
    "/home/tom/src/clj/autodoc-stable/../autodoc-work-area/clojure-contrib/src/modules/json/src/main/clojure/clojure/contrib/json.clj"}
-  {:arglists ([x]),
+  {:arglists ([x & options]),
    :name "print-json",
    :namespace "clojure.contrib.json",
    :source-url
-   "http://github.com/clojure/clojure-contrib/blob/d6f6ccfaeac03e35b1f9dbfa04424866cd9b2a41/modules/json/src/main/clojure/clojure/contrib/json.clj#L310",
+   "http://github.com/clojure/clojure-contrib/blob/5380552375c8b074d979cb1d1b8a8382bdf8a999/modules/json/src/main/clojure/clojure/contrib/json.clj#L314",
    :raw-source-url
    "http://github.com/clojure/clojure-contrib/raw//modules/clojure/contrib/json.clj",
    :wiki-url
    "http://clojure.github.com/clojure-contrib//json-api.html#clojure.contrib.json/print-json",
    :doc "Write JSON-formatted output to *out*",
    :var-type "function",
-   :line 310,
+   :line 314,
    :file
    "/home/tom/src/clj/autodoc-stable/../autodoc-work-area/clojure-contrib/src/modules/json/src/main/clojure/clojure/contrib/json.clj"}
   {:arglists
@@ -3020,7 +3020,7 @@
    :name "read-json",
    :namespace "clojure.contrib.json",
    :source-url
-   "http://github.com/clojure/clojure-contrib/blob/d6f6ccfaeac03e35b1f9dbfa04424866cd9b2a41/modules/json/src/main/clojure/clojure/contrib/json.clj#L186",
+   "http://github.com/clojure/clojure-contrib/blob/5380552375c8b074d979cb1d1b8a8382bdf8a999/modules/json/src/main/clojure/clojure/contrib/json.clj#L186",
    :raw-source-url
    "http://github.com/clojure/clojure-contrib/raw//modules/clojure/contrib/json.clj",
    :wiki-url
@@ -3049,7 +3049,7 @@
    "http://clojure.github.com/clojure-contrib//json-api.html#clojure.contrib.json/write-json",
    :namespace "clojure.contrib.json",
    :var-type "function",
-   :arglists ([object out]),
+   :arglists ([object out escape-unicode?]),
    :doc "Print object to PrintWriter out as JSON",
    :name "write-json"}
   {:arglists ([]),