Updated docs with info on almond build.

conversejs · Aug 25, 2013 · 464d42c · 464d42c
1 parent 0fefc55
commit 464d42c
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 86 deletions.
diff --git a/docs/doctrees/index.doctree b/docs/doctrees/index.doctree
diff --git a/docs/html/.buildinfo b/docs/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: cc4e774ae6c30c8f75f9540598d47e5a
+config: 4e01f0b4332cc0ad20271406d2d00beb
 tags: fbb0d17656682115ca4d033fb2f83ba1
diff --git a/docs/html/_sources/index.txt b/docs/html/_sources/index.txt
@@ -553,6 +553,14 @@ To minify the Javascript and CSS, run the following command:
 
     grunt minify
 
+.. Note ::
+   Since release 0.6.0, I'm using `almond <https://github.com/jrburke/almond>`_
+   instead of `require.js <http://requirejs.org>`_. The
+   `grunt-contrib-requirejs <https://github.com/gruntjs/grunt-contrib-requirejs>`_
+   plugin however doesn't support *almond*. I therefore now build it manually
+   (the old way again), like this: ``r.js -o build.js``. CSS can be minimized
+   separately via ``grunt cssmin``.
+
 Javascript will be bundled and minified via `require.js`_'s optimization tool.
 You can `read more about require.js's optimizer here`_.
 

diff --git a/docs/html/genindex.html b/docs/html/genindex.html
@@ -9,15 +9,15 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-    <title>Index &mdash; Converse.js 0.5.3 documentation</title>
+    <title>Index &mdash; Converse.js 0.6.0 documentation</title>
 
     <link rel="stylesheet" href="_static/stylesheet.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
 
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '',
-        VERSION:     '0.5.3',
+        VERSION:     '0.6.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -26,7 +26,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Converse.js 0.5.3 documentation" href="index.html" /> 
+    <link rel="top" title="Converse.js 0.6.0 documentation" href="index.html" /> 
   </head>
   <body>
     <div id="header_wrap" class="outer">
@@ -51,7 +51,7 @@ <h3>Navigation</h3>
         <li class="right" style="margin-right: 10px">
           <a href="#" title="General Index"
              accesskey="I">index</a></li>
-        <li><a href="index.html">Converse.js 0.5.3 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Converse.js 0.6.0 documentation</a> &raquo;</li> 
       </ul>
     </div>
 <section id="main_content" class="inner">  
@@ -80,7 +80,7 @@ <h3>Navigation</h3>
         <li class="right" style="margin-right: 10px">
           <a href="#" title="General Index"
              >index</a></li>
-        <li><a href="index.html">Converse.js 0.5.3 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Converse.js 0.6.0 documentation</a> &raquo;</li> 
       </ul>
     </div>
 </div>

diff --git a/docs/html/index.html b/docs/html/index.html
diff --git a/docs/html/objects.inv b/docs/html/objects.inv
@@ -1,6 +1,6 @@
 # Sphinx inventory version 2
 # Project: Converse.js
-# Version: 0.5.3
+# Version: 0.6.0
 # The remainder of this file is compressed using zlib.
 x�m��
 � �{�"���]�;

diff --git a/docs/html/search.html b/docs/html/search.html
@@ -7,15 +7,15 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-    <title>Search &mdash; Converse.js 0.5.3 documentation</title>
+    <title>Search &mdash; Converse.js 0.6.0 documentation</title>
 
     <link rel="stylesheet" href="_static/stylesheet.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
 
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '',
-        VERSION:     '0.5.3',
+        VERSION:     '0.6.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -25,7 +25,7 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
     <script type="text/javascript" src="_static/searchtools.js"></script>
-    <link rel="top" title="Converse.js 0.5.3 documentation" href="index.html" />
+    <link rel="top" title="Converse.js 0.6.0 documentation" href="index.html" />
   <script type="text/javascript">
     jQuery(function() { Search.loadIndex("searchindex.js"); });
   </script>
@@ -55,7 +55,7 @@ <h3>Navigation</h3>
         <li class="right" style="margin-right: 10px">
           <a href="genindex.html" title="General Index"
              accesskey="I">index</a></li>
-        <li><a href="index.html">Converse.js 0.5.3 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Converse.js 0.6.0 documentation</a> &raquo;</li> 
       </ul>
     </div>
 <section id="main_content" class="inner">  
@@ -100,7 +100,7 @@ <h3>Navigation</h3>
         <li class="right" style="margin-right: 10px">
           <a href="genindex.html" title="General Index"
              >index</a></li>
-        <li><a href="index.html">Converse.js 0.5.3 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Converse.js 0.6.0 documentation</a> &raquo;</li> 
       </ul>
     </div>
 </div>

diff --git a/docs/html/searchindex.js b/docs/html/searchindex.js
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -553,6 +553,14 @@ To minify the Javascript and CSS, run the following command:
 
     grunt minify
 
+.. Note ::
+   Since release 0.6.0, I'm using `almond <https://github.com/jrburke/almond>`_
+   instead of `require.js <http://requirejs.org>`_. The
+   `grunt-contrib-requirejs <https://github.com/gruntjs/grunt-contrib-requirejs>`_
+   plugin however doesn't support *almond*. I therefore now build it manually
+   (the old way again), like this: ``r.js -o build.js``. CSS can be minimized
+   separately via ``grunt cssmin``.
+
 Javascript will be bundled and minified via `require.js`_'s optimization tool.
 You can `read more about require.js's optimizer here`_.