Commit c6c25adf authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

Fixed a whole bunch of small docs typos, errors, and ommissions. 

Fixes #8358, #8396, #8724, #9043, #9128, #9247, #9267, #9267, #9375, #9409, #9414, #9416, #9446, #9454, #9464, #9503, #9518, #9533, #9657, #9658, #9683, #9733, #9771, #9835, #9836, #9837, #9897, #9906, #9912, #9945, #9986, #9992, #10055, #10084, #10091, #10145, #10245, #10257, #10309, #10358, #10359, #10424, #10426, #10508, #10531, #10551, #10635, #10637, #10656, #10658, #10690, #10699, #19528.

Thanks to all the respective authors of those tickets.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent d2a8bc5b

django/utils/html.py

+3 −1
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ trailing_empty_content_re = re.compile(r'(?:<p>(?:&nbsp;|\s|<br \/>)*?</p>\s*)+\ 
del x # Temporary variable



def escape(html):

    """Returns the given HTML with ampersands, quotes and carets encoded."""

    """

    Returns the given HTML with ampersands, quotes and angle brackets encoded.

    """

    return mark_safe(force_unicode(html).replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;').replace("'", '&#39;'))

escape = allow_lazy(escape, unicode)

docs/_static/djangodocs.css

+3 −3
Original line number Diff line number Diff line
@@ -103,9 +103,9 @@ dt .literal, table .literal { background:none; } 
.note, .admonition { padding:.8em 1em .8em; margin: 1em 0; border:1px solid #94da3a; }

.admonition-title { font-weight:bold; margin-top:0 !important; margin-bottom:0 !important;}

.admonition .last { margin-bottom:0 !important; }

.note, .admonition { padding-left:65px; background:url(docicons-note.gif) .8em .8em no-repeat;}

div.admonition-philosophy { padding-left:65px; background:url(docicons-philosophy.gif) .8em .8em no-repeat;}

div.admonition-behind-the-scenes { padding-left:65px; background:url(docicons-behindscenes.gif) .8em .8em no-repeat;}

.note, .admonition { padding-left:65px; background:url(docicons-note.png) .8em .8em no-repeat;}

div.admonition-philosophy { padding-left:65px; background:url(docicons-philosophy.png) .8em .8em no-repeat;}

div.admonition-behind-the-scenes { padding-left:65px; background:url(docicons-behindscenes.png) .8em .8em no-repeat;}



/*** versoinadded/changes ***/

div.versionadded, div.versionchanged {  }

docs/_static/docicons-behindscenes.gif

deleted100644 → 0
−1 KiB
Loading image diff...

docs/_static/docicons-behindscenes.png

0 → 100644
+2.22 KiB
Loading image diff...

docs/_static/docicons-note.gif

deleted100644 → 0
−632 B
Loading image diff...