Update isntallation instructions to use the proper names for the ZIP files

git-svn-id: https://mathjax.svn.sourceforge.net/svnroot/mathjax/trunk@556 b8fd5906-0fad-46e2-a0d3-10d94ff285d1

mathjax/docs/html/_sources/installation.txt

@@ -84,38 +84,8 @@ Release versions of MathJax are available in archive files from the
 <http://sourceforge.net/projects/mathjax/files/>`_, where you can
 download the archives that you need. 
 
-You should download **either**
+You should download the ``MathJax-v1.0.zip`` file, then simply unzip
-
+it. Once the MathJax directory is unpacked, you should move it to the
-- the ``MathJax-complete-v1.0.zip`` file, **or**
-- both ``MathJax-v1.0.zip`` and ``MathJax-webfonts-v1.0.zip``.
-
-You do not need to get all three, as the first is a combination of the
-other two.  (The code and fonts are in separate archives because the
-web fonts are not likely to change often, while the MathJax code will
-be updated regularly).
-
-If you obtained the "complete" archive, simply unzip it.  If you
-obtained the two separate archives, unzip ``MathJax-v1.0.zip`` which
-should create a ``MathJax/`` directory. Then unzip
-``MathJax-webfonts-v1.0.zip`` inside the MathJax directory.  Commands
-to do this might look like
-
-.. code-block:: sh
-
-    unzip MathJax-v1.0.zip
-    cd MathJax
-    unzip ../MathJax-webfonts-v1.0.zip
-
-You should end up with a ``MathJax`` directory containing a ``fonts``
-folder along with ``config``, ``extensions``, ``MathJax.js`` and other
-files and folders.  The ``MathJax/fonts`` folder should contain an
-``HTML-CSS`` folder and nothing else.  If you end up with
-``MathJax/MathJax/fonts`` or ``MathJax/MathJax-webfonts-v1.0/fonts``
-or something similar, then you need to move the fonts folder up one
-level in the hierarchy so that it is ``MathJax/fonts``.  (You can then
-remove the empty ``MathJax`` or ``MathJax-webfonts-v1.0`` folder.)
-
-Once the MathJax directory is unpacked, you should move it to the
 desired location on your server (or your hard disk, if you are using
 it locally rather then through a web server).  One natural location is
 to put it at the top level of your web server's hierarchy.  That would

mathjax/docs/html/_sources/start.txt

@@ -27,12 +27,14 @@ Obtaining and Installing MathJax
 ================================
 
 The easiest way to set up MathJax is to obtain the
-``MathJax-complete-v1.0.zip`` archive from the `MathJax download page
+``MathJax-v1.0.zip`` archive from the `MathJax download page
 <http://www.mathjax.org/download/>`_.  This includes both the MathJax code
-and the MathJax webfonts, so this is the only file you need.
+and the MathJax webfonts, so this is the only file you need.  (This is
+different from the beta releases, which had the fonts separate from
+the rest of the code).
 
-Unpack the ``MathJax-complete-v1.0.zip`` archive and place the
+Unpack the ``MathJax-v1.0.zip`` archive and place the
-resulting ``MathJax`` folder onto your web server at a convenient
+resulting MathJax folder onto your web server at a convenient
 location where you can include it into your web pages.  For example,
 making ``MathJax`` a top-level directory on your server would be
 one natural way to do this.  That would let you refer to the main

mathjax/docs/html/installation.html

@@ -108,34 +108,8 @@ release number.</p>
 <a class="reference external" href="http://www.mathjax.org/download/">MathJax download page</a> or the
 <a class="reference external" href="http://sourceforge.net/projects/mathjax/files/">SourceForge files page</a>, where you can
 download the archives that you need.</p>
-<p>You should download <strong>either</strong></p>
+<p>You should download the <tt class="docutils literal"><span class="pre">MathJax-v1.0.zip</span></tt> file, then simply unzip
-<ul class="simple">
+it. Once the MathJax directory is unpacked, you should move it to the
-<li>the <tt class="docutils literal"><span class="pre">MathJax-complete-v1.0.zip</span></tt> file, <strong>or</strong></li>
-<li>both <tt class="docutils literal"><span class="pre">MathJax-v1.0.zip</span></tt> and <tt class="docutils literal"><span class="pre">MathJax-webfonts-v1.0.zip</span></tt>.</li>
-</ul>
-<p>You do not need to get all three, as the first is a combination of the
-other two.  (The code and fonts are in separate archives because the
-web fonts are not likely to change often, while the MathJax code will
-be updated regularly).</p>
-<p>If you obtained the &#8220;complete&#8221; archive, simply unzip it.  If you
-obtained the two separate archives, unzip <tt class="docutils literal"><span class="pre">MathJax-v1.0.zip</span></tt> which
-should create a <tt class="docutils literal"><span class="pre">MathJax/</span></tt> directory. Then unzip
-<tt class="docutils literal"><span class="pre">MathJax-webfonts-v1.0.zip</span></tt> inside the MathJax directory.  Commands
-to do this might look like</p>
-<div class="highlight-sh"><div class="highlight"><pre>unzip MathJax-v1.0.zip
-<span class="nb">cd </span>MathJax
-unzip ../MathJax-webfonts-v1.0.zip
-</pre></div>
-</div>
-<p>You should end up with a <tt class="docutils literal"><span class="pre">MathJax</span></tt> directory containing a <tt class="docutils literal"><span class="pre">fonts</span></tt>
-folder along with <tt class="docutils literal"><span class="pre">config</span></tt>, <tt class="docutils literal"><span class="pre">extensions</span></tt>, <tt class="docutils literal"><span class="pre">MathJax.js</span></tt> and other
-files and folders.  The <tt class="docutils literal"><span class="pre">MathJax/fonts</span></tt> folder should contain an
-<tt class="docutils literal"><span class="pre">HTML-CSS</span></tt> folder and nothing else.  If you end up with
-<tt class="docutils literal"><span class="pre">MathJax/MathJax/fonts</span></tt> or <tt class="docutils literal"><span class="pre">MathJax/MathJax-webfonts-v1.0/fonts</span></tt>
-or something similar, then you need to move the fonts folder up one
-level in the hierarchy so that it is <tt class="docutils literal"><span class="pre">MathJax/fonts</span></tt>.  (You can then
-remove the empty <tt class="docutils literal"><span class="pre">MathJax</span></tt> or <tt class="docutils literal"><span class="pre">MathJax-webfonts-v1.0</span></tt> folder.)</p>
-<p>Once the MathJax directory is unpacked, you should move it to the
 desired location on your server (or your hard disk, if you are using
 it locally rather then through a web server).  One natural location is
 to put it at the top level of your web server&#8217;s hierarchy.  That would

mathjax/docs/html/start.html

@@ -66,10 +66,12 @@ read the details in order to customize the setup for your pages.</p>
 <div class="section" id="obtaining-and-installing-mathjax">
 <h2>Obtaining and Installing MathJax<a class="headerlink" href="#obtaining-and-installing-mathjax" title="Permalink to this headline">¶</a></h2>
 <p>The easiest way to set up MathJax is to obtain the
-<tt class="docutils literal"><span class="pre">MathJax-complete-v1.0.zip</span></tt> archive from the <a class="reference external" href="http://www.mathjax.org/download/">MathJax download page</a>.  This includes both the MathJax code
+<tt class="docutils literal"><span class="pre">MathJax-v1.0.zip</span></tt> archive from the <a class="reference external" href="http://www.mathjax.org/download/">MathJax download page</a>.  This includes both the MathJax code
-and the MathJax webfonts, so this is the only file you need.</p>
+and the MathJax webfonts, so this is the only file you need.  (This is
-<p>Unpack the <tt class="docutils literal"><span class="pre">MathJax-complete-v1.0.zip</span></tt> archive and place the
+different from the beta releases, which had the fonts separate from
-resulting <tt class="docutils literal"><span class="pre">MathJax</span></tt> folder onto your web server at a convenient
+the rest of the code).</p>
+<p>Unpack the <tt class="docutils literal"><span class="pre">MathJax-v1.0.zip</span></tt> archive and place the
+resulting MathJax folder onto your web server at a convenient
 location where you can include it into your web pages.  For example,
 making <tt class="docutils literal"><span class="pre">MathJax</span></tt> a top-level directory on your server would be
 one natural way to do this.  That would let you refer to the main

mathjax/docs/rst/installation.rst

@@ -84,38 +84,8 @@ Release versions of MathJax are available in archive files from the
 <http://sourceforge.net/projects/mathjax/files/>`_, where you can
 download the archives that you need. 
 
-You should download **either**
+You should download the ``MathJax-v1.0.zip`` file, then simply unzip
-
+it. Once the MathJax directory is unpacked, you should move it to the
-- the ``MathJax-complete-v1.0.zip`` file, **or**
-- both ``MathJax-v1.0.zip`` and ``MathJax-webfonts-v1.0.zip``.
-
-You do not need to get all three, as the first is a combination of the
-other two.  (The code and fonts are in separate archives because the
-web fonts are not likely to change often, while the MathJax code will
-be updated regularly).
-
-If you obtained the "complete" archive, simply unzip it.  If you
-obtained the two separate archives, unzip ``MathJax-v1.0.zip`` which
-should create a ``MathJax/`` directory. Then unzip
-``MathJax-webfonts-v1.0.zip`` inside the MathJax directory.  Commands
-to do this might look like
-
-.. code-block:: sh
-
-    unzip MathJax-v1.0.zip
-    cd MathJax
-    unzip ../MathJax-webfonts-v1.0.zip
-
-You should end up with a ``MathJax`` directory containing a ``fonts``
-folder along with ``config``, ``extensions``, ``MathJax.js`` and other
-files and folders.  The ``MathJax/fonts`` folder should contain an
-``HTML-CSS`` folder and nothing else.  If you end up with
-``MathJax/MathJax/fonts`` or ``MathJax/MathJax-webfonts-v1.0/fonts``
-or something similar, then you need to move the fonts folder up one
-level in the hierarchy so that it is ``MathJax/fonts``.  (You can then
-remove the empty ``MathJax`` or ``MathJax-webfonts-v1.0`` folder.)
-
-Once the MathJax directory is unpacked, you should move it to the
 desired location on your server (or your hard disk, if you are using
 it locally rather then through a web server).  One natural location is
 to put it at the top level of your web server's hierarchy.  That would

mathjax/docs/rst/start.rst

@@ -27,12 +27,14 @@ Obtaining and Installing MathJax
 ================================
 
 The easiest way to set up MathJax is to obtain the
-``MathJax-complete-v1.0.zip`` archive from the `MathJax download page
+``MathJax-v1.0.zip`` archive from the `MathJax download page
 <http://www.mathjax.org/download/>`_.  This includes both the MathJax code
-and the MathJax webfonts, so this is the only file you need.
+and the MathJax webfonts, so this is the only file you need.  (This is
+different from the beta releases, which had the fonts separate from
+the rest of the code).
 
-Unpack the ``MathJax-complete-v1.0.zip`` archive and place the
+Unpack the ``MathJax-v1.0.zip`` archive and place the
-resulting ``MathJax`` folder onto your web server at a convenient
+resulting MathJax folder onto your web server at a convenient
 location where you can include it into your web pages.  For example,
 making ``MathJax`` a top-level directory on your server would be
 one natural way to do this.  That would let you refer to the main