3 Commits

Author SHA1 Message Date
Gabriel Hurley
a5f71e1264 [1.2.X] Fixed #15365 -- Added a warning to the contrib.markup docs reminding users that the marked up output will not be escaped.
Backport of [15673] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-28 05:40:55 +00:00
Russell Keith-Magee
9ad73135c0 [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
2010-10-08 15:46:03 +00:00
Russell Keith-Magee
c868c368eb [1.2.X] Refactored markup documentation to give it it's own home.
Backport of r13647 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 02:44:24 +00:00