diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-10-08 15:46:03 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-10-08 15:46:03 +0000 |
| commit | 9ad73135c0e028341cd5dd7574a80b2875587973 (patch) | |
| tree | 498a6be5afcd9ef0dcaa07ecc7dad7ce1dc42917 /docs/ref | |
| parent | 5170a12a880ea470875981bf7e75553bed11ac00 (diff) | |
[1.2.X] Fixed #14383 -- Corrected the capitalization of reStructuredText. Thanks to timo for the patch.
Backport of r14017 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14025 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/markup.txt | 6 | ||||
| -rw-r--r-- | docs/ref/templates/builtins.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/contrib/markup.txt b/docs/ref/contrib/markup.txt index f2c43fe25f..92823132d6 100644 --- a/docs/ref/contrib/markup.txt +++ b/docs/ref/contrib/markup.txt @@ -10,7 +10,7 @@ languages: * ``textile`` -- implements `Textile`_ -- requires `PyTextile`_ * ``markdown`` -- implements `Markdown`_ -- requires `Python-markdown`_ - * ``restructuredtext`` -- implements `ReST (ReStructured Text)`_ + * ``restructuredtext`` -- implements `reST (reStructured Text)`_ -- requires `doc-utils`_ In each case, the filter expects formatted markup as a string and @@ -26,12 +26,12 @@ For more documentation, read the source code in .. _Textile: http://en.wikipedia.org/wiki/Textile_%28markup_language%29 .. _Markdown: http://en.wikipedia.org/wiki/Markdown -.. _ReST (ReStructured Text): http://en.wikipedia.org/wiki/ReStructuredText +.. _reST (reStructured Text): http://en.wikipedia.org/wiki/ReStructuredText .. _PyTextile: http://loopcore.com/python-textile/ .. _Python-markdown: http://www.freewisdom.org/projects/python-markdown .. _doc-utils: http://docutils.sf.net/ -ReStructured Text +reStructured Text ----------------- When using the ``restructuredtext`` markup filter you can define a diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index ff6d88f38f..01f39e7b89 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -2095,7 +2095,7 @@ A collection of template filters that implement these common markup languages: * Textile * Markdown - * ReST (ReStructured Text) + * reST (reStructuredText) See the :doc:`markup documentation </ref/contrib/markup>`. |