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

5 files changed, 4 insertions, 130 deletions

diff --git a/branch-master/api-index.html b/branch-master/api-index.html
index fb7bc2ff..6d36f285 100644
--- a/branch-master/api-index.html
+++ b/branch-master/api-index.html
@@ -323,7 +323,6 @@ Shortcuts:<br />
 </span></span><span id="section-content"> <a href="repl-utils-api.html#clojure.contrib.repl-utils/javadoc">javadoc</a><span id="line-content">                      function      repl-utils         Opens a browser window displaying the javadoc for ...
 </span></span><span id="section-content"> <a href="jmx-api.html#clojure.contrib.jmx/jmx-url">jmx-url</a><span id="line-content">                      function      jmx                Build a JMX URL from options..
 </span></span><span id="section-content"> <a href="probabilities.finite-distributions-api.html#clojure.contrib.probabilities.finite-distributions/join-with">join-with</a><span id="line-content">                    function      probabilities.finite-distributions Returns the distribution of (f x y...
-</span></span><span id="section-content"> <a href="json-api.html#clojure.contrib.json/json-str">json-str</a><span id="line-content">                     function      json               Converts x to a JSON-formatted string..
 </span></span></pre>
 </div><div id="index-body">
   <h2 id="K"><span id="section-head">K</span></h2>
@@ -429,13 +428,11 @@ Shortcuts:<br />
 </span></span><span id="section-content"> <a href="seq-api.html#clojure.contrib.seq/positions">positions</a><span id="line-content">                    function      seq                Returns a lazy sequence containing the positions a...
 </span></span><span id="section-content"> <a href="graph-api.html#clojure.contrib.graph/post-ordered-nodes">post-ordered-nodes</a><span id="line-content">           function      graph              Return a sequence of indexes of a post-ordered wal...
 </span></span><span id="section-content"> <a href="lazy-seqs-api.html#clojure.contrib.lazy-seqs/powers-of-2">powers-of-2</a><span id="line-content">                  function      lazy-seqs          Returns a lazy sequence of all the powers of 2.
-</span></span><span id="section-content"> <a href="json-api.html#clojure.contrib.json/pprint-json">pprint-json</a><span id="line-content">                  function      json               Pretty-prints JSON representation of x to *out*.
 </span></span><span id="section-content"> <a href="lazy-seqs-api.html#clojure.contrib.lazy-seqs/primes">primes</a><span id="line-content">                       var           lazy-seqs          Lazy sequence of all the prime numbers..
 </span></span><span id="section-content"> <a href="monadic-io-streams-api.html#clojure.contrib.monadic-io-streams/print">print</a><span id="line-content">                        function      monadic-io-streams Print obj.
 </span></span><span id="section-content"> <a href="dataflow-api.html#clojure.contrib.dataflow/print-dataflow">print-dataflow</a><span id="line-content">               function      dataflow           Prints a dataflow, one cell per line.
 </span></span><span id="section-content"> <a href="ns-utils-api.html#clojure.contrib.ns-utils/print-dir">print-dir</a><span id="line-content">                    function      ns-utils           Prints a sorted directory of public vars in a name...
 </span></span><span id="section-content"> <a href="ns-utils-api.html#clojure.contrib.ns-utils/print-docs">print-docs</a><span id="line-content">                   function      ns-utils           Prints documentation for the public vars in a name...
-</span></span><span id="section-content"> <a href="json-api.html#clojure.contrib.json/print-json">print-json</a><span id="line-content">                   function      json               Write JSON-formatted output to *out*.
 </span></span><span id="section-content"> <a href="repl-ln-api.html#clojure.contrib.repl-ln/print-repl-info">print-repl-info</a><span id="line-content">              function      repl-ln            Prints info about the current repl.
 </span></span><span id="section-content"> <a href="condition-api.html#clojure.contrib.condition/print-stack-trace">print-stack-trace</a><span id="line-content">            function      condition          Prints a stack trace for a condition or Throwable....
 </span></span><span id="section-content"> <a href="profile-api.html#clojure.contrib.profile/print-summary">print-summary</a><span id="line-content">                function      profile            Prints a table of the results returned by summariz...
diff --git a/branch-master/api-index.json b/branch-master/api-index.json
index 53d760ce..78a3abbe 100644
--- a/branch-master/api-index.json
+++ b/branch-master/api-index.json
@@ -2991,55 +2991,13 @@
    "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", "&", "options"]],
-   "name":"json-str",
-   "namespace":"clojure.contrib.json",
-   "source-url":
-   "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":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", "&", "options"]],
-   "name":"pprint-json",
-   "namespace":"clojure.contrib.json",
-   "source-url":
-   "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":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", "&", "options"]],
-   "name":"print-json",
-   "namespace":"clojure.contrib.json",
-   "source-url":
-   "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":314,
-   "file":
-   "\/home\/tom\/src\/clj\/autodoc-stable\/..\/autodoc-work-area\/clojure-contrib\/src\/modules\/json\/src\/main\/clojure\/clojure\/contrib\/json.clj"},
   {"arglists":
    [["input"], ["input", "keywordize?"],
     ["input", "keywordize?", "eof-error?", "eof-value"]],
    "name":"read-json",
    "namespace":"clojure.contrib.json",
    "source-url":
-   "http:\/\/github.com\/clojure\/clojure-contrib\/blob\/5380552375c8b074d979cb1d1b8a8382bdf8a999\/modules\/json\/src\/main\/clojure\/clojure\/contrib\/json.clj#L186",
+   "http:\/\/github.com\/clojure\/clojure-contrib\/blob\/82c7d49ac23ff2b32490319e458ad535b01e7a41\/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":
diff --git a/branch-master/index.html b/branch-master/index.html
index 9e83622f..4e0d0802 100644
--- a/branch-master/index.html
+++ b/branch-master/index.html
@@ -1092,7 +1092,7 @@ To read JSON, use read-json.</pre>
   
   
   Public variables and functions:
-  <span id="var-link"><a href="json-api.html#clojure.contrib.json/json-str" id="var-tag">json-str</a> </span><span id="var-link"><a href="json-api.html#clojure.contrib.json/pprint-json" id="var-tag">pprint-json</a> </span><span id="var-link"><a href="json-api.html#clojure.contrib.json/print-json" id="var-tag">print-json</a> </span><span id="var-link"><a href="json-api.html#clojure.contrib.json/read-json" id="var-tag">read-json</a> </span><span id="var-link"><a href="json-api.html#clojure.contrib.json/read-json-from" id="var-tag">read-json-from</a> </span><span id="var-link"><a href="json-api.html#clojure.contrib.json/write-json" id="var-tag">write-json</a> </span><br />
+  <span id="var-link"><a href="json-api.html#clojure.contrib.json/read-json" id="var-tag">read-json</a> </span><span id="var-link"><a href="json-api.html#clojure.contrib.json/read-json-from" id="var-tag">read-json-from</a> </span><span id="var-link"><a href="json-api.html#clojure.contrib.json/write-json" id="var-tag">write-json</a> </span><br />
   
 </div><div id="namespace-entry">
   <br />
diff --git a/branch-master/json-api.html b/branch-master/json-api.html
index 91a17f49..527d72ef 100644
--- a/branch-master/json-api.html
+++ b/branch-master/json-api.html
@@ -58,12 +58,6 @@ namespace.
   <div style="margin-left: 1em;" class="toc-section">
     <a href="#toc0">Overview</a>
     <div style="margin-left: 1em;" class="toc-entry">
-      <a href="#clojure.contrib.json/json-str">json-str</a>
-    </div><div style="margin-left: 1em;" class="toc-entry">
-      <a href="#clojure.contrib.json/pprint-json">pprint-json</a>
-    </div><div style="margin-left: 1em;" class="toc-entry">
-      <a href="#clojure.contrib.json/print-json">print-json</a>
-    </div><div style="margin-left: 1em;" class="toc-entry">
       <a href="#clojure.contrib.json/read-json">read-json</a>
     </div><div style="margin-left: 1em;" class="toc-entry">
       <a href="#clojure.contrib.json/read-json-from">read-json-from</a>
@@ -92,39 +86,6 @@ To read JSON, use read-json.</pre>
 <div id="var-entry">
   <br />
   <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 &amp; options)
-</pre>
-  <pre id="var-docstr">Converts x to a JSON-formatted string.</pre>
-  
-  
-  <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 &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/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 &amp; options)
-</pre>
-  <pre id="var-docstr">Write JSON-formatted output to *out*</pre>
-  
-  
-  <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 />
   <h2 id="clojure.contrib.json/read-json">read-json</h2>
   <span id="var-type">function</span><br />
   <pre id="var-usage">Usage: (read-json input)
@@ -137,7 +98,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/5380552375c8b074d979cb1d1b8a8382bdf8a999/modules/json/src/main/clojure/clojure/contrib/json.clj#L186" id="var-source">Source</a>
+  <a href="http://github.com/clojure/clojure-contrib/blob/82c7d49ac23ff2b32490319e458ad535b01e7a41/modules/json/src/main/clojure/clojure/contrib/json.clj#L186" id="var-source">Source</a>
 </div><div id="var-entry">
   <br />
   <hr />
diff --git a/index-v1.3.clj b/index-v1.3.clj
index a872fe70..cbcff471 100644
--- a/index-v1.3.clj
+++ b/index-v1.3.clj
@@ -2971,48 +2971,6 @@
    :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 & options]),
-   :name "json-str",
-   :namespace "clojure.contrib.json",
-   :source-url
-   "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 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 & options]),
-   :name "pprint-json",
-   :namespace "clojure.contrib.json",
-   :source-url
-   "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 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 & options]),
-   :name "print-json",
-   :namespace "clojure.contrib.json",
-   :source-url
-   "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 314,
-   :file
-   "/home/tom/src/clj/autodoc-stable/../autodoc-work-area/clojure-contrib/src/modules/json/src/main/clojure/clojure/contrib/json.clj"}
   {:arglists
    ([input]
     [input keywordize?]
@@ -3020,7 +2978,7 @@
    :name "read-json",
    :namespace "clojure.contrib.json",
    :source-url
-   "http://github.com/clojure/clojure-contrib/blob/5380552375c8b074d979cb1d1b8a8382bdf8a999/modules/json/src/main/clojure/clojure/contrib/json.clj#L186",
+   "http://github.com/clojure/clojure-contrib/blob/82c7d49ac23ff2b32490319e458ad535b01e7a41/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