Merge branch 'v3.2-latest'

Author: dpvc

output/lazy.rst

@@ -47,4 +47,40 @@ forward references are unlikely to work, and backward references will
 work only if the target expression has already been typeset. We hope
 to improve this situation in a future release.
 
+
+.. _lazy-options:
+
+Lazy Typesetting Options
+------------------------
+
+Adding the `ui/lazy` extension to the `loader.load` array adds the
+following options to the MathJax configuration:
+
+.. code-block:: javascript
+
+   MathJax = {
+     options: {
+       lazyMargin: '200px',
+       lazyAlwaysTypeset: null
+     }
+   };
+
+.. _lazy-lazyMargin:
+.. describe:: lazyMargin: '200px'
+
+   This gives the extent of the typesetting margin outside the visible
+   viewport.  When mathematics appears within this range of the
+   viewport, it will be typeset.  This allows typesetting to occur
+   slightly before the math appears in the window, for a smoother
+   effect.
+
+.. _lazy-lazyAlwaysTypeset:
+.. describe:: lazyAlwaysTypeset: null
+
+   This gives an array of containers whose math expressions should
+   always be typset during the initial typesetting pass, rather than
+   waiting for them to scroll into view.  This may be useful if
+   MathJax output appears in diagrams or other layout that must be
+   sized and placed during initial page layout.
+
 |-----|

upgrading/earlier/upgrade.rst

@@ -26,7 +26,7 @@ the ``<script>`` tag that loads MathJax, then your site should work
 unchanged with version 1.1 of MathJax.  You may wish to consider moving to
 the new HTML5-compliant method of configuring MathJax, however, which uses
 a separate ``<script>`` tag to specify the configuration.  That tag should
-come **before** the one that loads ``Mathjax.js``, and should have
+come **before** the one that loads ``MathJax.js``, and should have
 ``type="text/x-mathjax-config"`` rather than ``type="text/javascript"``.
 For example,
 

upgrading/earlier/whats-new-2.0.rst

@@ -343,7 +343,7 @@ Important changes from previous versions
        </IfModule>
        </FilesMatch>
 
-   in the ``.htaccess` file for the ``Mathjax/fonts`` directory if you
+   in the ``.htaccess` file for the ``MathJax/fonts`` directory if you
    are using the Apache web server.  See `Notes about shared
    installations` for details.
 
@@ -370,7 +370,7 @@ Important changes from previous versions
 
 *  In order to improve stability with IE when MathPlayer is installed,
    MathJax now adds the namespace and object bindings that are needed
-   for MathPlayer at the time that Mathjax is first loaded, rather
+   for MathPlayer at the time that MathJax is first loaded, rather
    than waiting for the `NativeMML` output jax to be loaded.  Since
    this is before the configuration information has been obtained,
    this will happen regardless of whether the `NativeMML` output jax

upgrading/v2.rst

@@ -133,7 +133,7 @@ In version 3, synchronization with MathJax is done through ES6
 promises, rather than MathJax's queues and signals, and MathJax's
 startup process is more straight-forward.  You can insert your own
 code into the startup process more easily, and can replace the default
-startup actions entirely, if you wish.  The actions Mathjax
+startup actions entirely, if you wish.  The actions MathJax
 takes during startup are better separated so that you can pick and
 choose the ones you want to perform.  See the :ref:`startup-actions`
 section for more details on how to accomplish this.
@@ -153,7 +153,7 @@ objects, that code will no longer work with version 3, and will have
 to be modified.  Some of the more important changes are discussed
 below.
 
-* The :meth:`Mathjax.Hub.Typeset()` function has been replaced by the
+* The :meth:`MathJax.Hub.Typeset()` function has been replaced by the
   :meth:`MathJax.typesetPromise()` and :meth:`MathJax.typeset()`
   functions.  In fact, the :attr:`MathJax.Hub` has been removed
   entirely.

web/typeset.rst

@@ -39,7 +39,7 @@ that uses `\require`, or that includes autoloaded extensions), then
 an error will be thrown.  You can use the ``try/catch`` command to
 trap this condition.
 
-The second, :meth:`Mathjax.typesetPromise()`, performs the typesetting
+The second, :meth:`MathJax.typesetPromise()`, performs the typesetting
 asynchronously, and returns a promise that is resolved when the
 typesetting is complete.  This properly handles loading of external
 files, so if you are expecting to process TeX input that can include