Author: russellm Date: 2010-10-08 10:46:03 -0500 (Fri, 08 Oct 2010) New Revision: 14025
Modified: django/branches/releases/1.2.X/django/contrib/markup/templatetags/markup.py django/branches/releases/1.2.X/docs/faq/general.txt django/branches/releases/1.2.X/docs/internals/contributing.txt django/branches/releases/1.2.X/docs/internals/documentation.txt django/branches/releases/1.2.X/docs/ref/contrib/markup.txt django/branches/releases/1.2.X/docs/ref/templates/builtins.txt Log: [1.2.X] Fixed #14383 -- Corrected the capitalization of reStructuredText. Thanks to timo for the patch. Backport of r14017 from trunk. Modified: django/branches/releases/1.2.X/django/contrib/markup/templatetags/markup.py =================================================================== --- django/branches/releases/1.2.X/django/contrib/markup/templatetags/markup.py 2010-10-08 15:45:33 UTC (rev 14024) +++ django/branches/releases/1.2.X/django/contrib/markup/templatetags/markup.py 2010-10-08 15:46:03 UTC (rev 14025) @@ -8,7 +8,7 @@ * Markdown, which requires the Python-markdown library from http://www.freewisdom.org/projects/python-markdown - * ReStructuredText, which requires docutils from http://docutils.sf.net/ + * reStructuredText, which requires docutils from http://docutils.sf.net/ """ from django import template Modified: django/branches/releases/1.2.X/docs/faq/general.txt =================================================================== --- django/branches/releases/1.2.X/docs/faq/general.txt 2010-10-08 15:45:33 UTC (rev 14024) +++ django/branches/releases/1.2.X/docs/faq/general.txt 2010-10-08 15:46:03 UTC (rev 14025) @@ -167,14 +167,14 @@ --------------------------------------------------------------- The Django docs are available in the ``docs`` directory of each Django tarball -release. These docs are in ReST (ReStructured Text) format, and each text file +release. These docs are in reST (reStructuredText) format, and each text file corresponds to a Web page on the official Django site. Because the documentation is `stored in revision control`_, you can browse documentation changes just like you can browse code changes. Technically, the docs on Django's site are generated from the latest development -versions of those ReST documents, so the docs on the Django site may offer more +versions of those reST documents, so the docs on the Django site may offer more information than the docs that come with the latest Django release. .. _stored in revision control: http://code.djangoproject.com/browser/django/trunk/docs Modified: django/branches/releases/1.2.X/docs/internals/contributing.txt =================================================================== --- django/branches/releases/1.2.X/docs/internals/contributing.txt 2010-10-08 15:45:33 UTC (rev 14024) +++ django/branches/releases/1.2.X/docs/internals/contributing.txt 2010-10-08 15:46:03 UTC (rev 14025) @@ -700,10 +700,10 @@ system </internals/documentation>` that you should read prior to working on the documentation. -Guidelines for ReST files +Guidelines for reST files ------------------------- -These guidelines regulate the format of our ReST documentation: +These guidelines regulate the format of our reST documentation: * In section titles, capitalize only initial words and proper nouns. Modified: django/branches/releases/1.2.X/docs/internals/documentation.txt =================================================================== --- django/branches/releases/1.2.X/docs/internals/documentation.txt 2010-10-08 15:45:33 UTC (rev 14024) +++ django/branches/releases/1.2.X/docs/internals/documentation.txt 2010-10-08 15:46:03 UTC (rev 14025) @@ -20,7 +20,7 @@ Then, building the html is easy; just ``make html`` from the ``docs`` directory. -To get started contributing, you'll want to read the `ReStructuredText +To get started contributing, you'll want to read the `reStructuredText Primer`__. After that, you'll want to read about the `Sphinx-specific markup`__ that's used to manage metadata, indexing, and cross-references. Modified: django/branches/releases/1.2.X/docs/ref/contrib/markup.txt =================================================================== --- django/branches/releases/1.2.X/docs/ref/contrib/markup.txt 2010-10-08 15:45:33 UTC (rev 14024) +++ django/branches/releases/1.2.X/docs/ref/contrib/markup.txt 2010-10-08 15:46:03 UTC (rev 14025) @@ -10,7 +10,7 @@ * ``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 @@ .. _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 Modified: django/branches/releases/1.2.X/docs/ref/templates/builtins.txt =================================================================== --- django/branches/releases/1.2.X/docs/ref/templates/builtins.txt 2010-10-08 15:45:33 UTC (rev 14024) +++ django/branches/releases/1.2.X/docs/ref/templates/builtins.txt 2010-10-08 15:46:03 UTC (rev 14025) @@ -2095,7 +2095,7 @@ * Textile * Markdown - * ReST (ReStructured Text) + * reST (reStructuredText) See the :doc:`markup documentation </ref/contrib/markup>`. -- You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to django-upda...@googlegroups.com. To unsubscribe from this group, send email to django-updates+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/django-updates?hl=en.