summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2013-02-16 16:15:58 +0000
committermilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2013-02-16 16:15:58 +0000
commit39e3e9d7bc0d252aad6946a2191a397cb3850c08 (patch)
tree312caeac51a259c38eb1a041390a0613911db8af
parent812f2b3c5910dd43b86ba39e54db0e2a3cbc0b10 (diff)
downloaddocutils-39e3e9d7bc0d252aad6946a2191a397cb3850c08.tar.gz
Minor documentation edits.
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@7603 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rw-r--r--docs/ref/rst/directives.txt4
-rw-r--r--docs/user/config.txt18
2 files changed, 12 insertions, 10 deletions
diff --git a/docs/ref/rst/directives.txt b/docs/ref/rst/directives.txt
index aef826ca6..cc2d47ca7 100644
--- a/docs/ref/rst/directives.txt
+++ b/docs/ref/rst/directives.txt
@@ -1079,10 +1079,10 @@ currently support for only one header and footer.
Thus, you may soon find Docutils' abilities to be insufficient for
these purposes. At that time, you should consider using a
- templating system (like ht2html_) rather than the "header" and
+ documentation generator like Sphinx_ rather than the "header" and
"footer" directives.
- .. _ht2html: http://ht2html.sourceforge.net/
+ .. _Sphinx: http://sphinx-doc.org/
In addition to the use of these directives to populate header and
footer content, content may also be added automatically by the
diff --git a/docs/user/config.txt b/docs/user/config.txt
index b40abdef9..73d395eb1 100644
--- a/docs/user/config.txt
+++ b/docs/user/config.txt
@@ -820,14 +820,6 @@ _`math_output`
fonts for high-quality typesetting that is scalable and prints
at full resolution.
- A custom URL can be appended after whitespace,
- for example a local install
- ``MathJax file:/usr/share/javascript/mathjax/MathJax.js`` or
- `access the MathJax CDN using a https secure connection`__
- ``mathjax https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=config=TeX-AMS-MML_HTMLorMML``.
-
- __ http://www.mathjax.org/resources/faqs/#problem-https
-
Pro:
Works 'out of the box' across multiple browsers and platforms.
@@ -840,6 +832,16 @@ _`math_output`
Downloads JavaScript code from a third-party site.
+ A custom URI can be appended after whitespace,
+ for example a local installation ::
+
+ math-output: MathJax file:/usr/share/javascript/mathjax/MathJax.js
+
+ or a URI to `access the MathJax CDN using a https secure
+ connection`__.
+
+ __ http://www.mathjax.org/resources/faqs/#problem-https
+
:HTML:
Format math in standard HTML enhanced by CSS rules