Ticket #8979: doc-fixes-r8985.diff

docs/ref/contrib/admin.txt

@@ -924 +924 @@
 To continue the example above, we want to add a new link next to the ``History``
 tool for the ``Page`` model. After looking at ``change_form.html`` we determine
 that we only need to override the ``object-tools`` block. Therefore here is our
-new ``change_form.html`` ::
+new ``change_form.html`` :
+
+.. code-block:: html+django
 
     {% extends "admin/change_form.html" %}
     {% load i18n %}

docs/ref/contrib/comments/index.txt

@@ -6 +6 @@
 
 .. module:: django.contrib.comments
    :synopsis: Django's comment framework
+
+.. highlightlang:: html+django
 
 Django includes a simple, yet customizable comments framework. The built-in
 comments framework can be used to attach comments to any model, so you can use

docs/ref/contrib/formtools/form-wizard.txt

@@ -169 +169 @@
     * Pass :attr:`~django.contrib.formtools.wizard.FormWizard.extra_context`
       as extra parameters in the URLconf.
 
-Here's a full example template::
-  
+Here's a full example template:
+
+.. code-block:: html+django
+
     {% extends "base.html" %}
 
     {% block content %}

docs/ref/django-admin.txt

@@ -385 +385 @@
 ------------
 
 .. versionchanged:: 1.0
-   Before 1.0 this was the "bin/make-messages.py" command.
+   Before 1.0 this was the ``bin/make-messages.py`` command.
 
 Runs over the entire source tree of the current directory and pulls out all
 strings marked for translation. It creates (or updates) a message file in the

docs/ref/files/file.txt

@@ -88 +88 @@
 
 .. attribute:: File.height
 
-    Heigght of the image.
+    Height of the image.
 
 Additional methods on files attached to objects
 -----------------------------------------------

docs/ref/request-response.txt

@@ -93 +93 @@
     A standard Python dictionary containing all cookies. Keys and values are
     strings.
 
-.. attribute:: HttpRequest.FILES 
-
-    .. admonition:: Changed in Django development version
-        
-        In previous versions of Django, ``request.FILES`` contained
-        simple ``dict`` objects representing uploaded files. This is
-        no longer true -- files are represented by ``UploadedFile``
-        objects as described below.
-        
-        These ``UploadedFile`` objects will emulate the old-style ``dict``
-        interface, but this is deprecated and will be removed in the next
-        release of Django.
+.. attribute:: HttpRequest.FILES
 
     A dictionary-like object containing all uploaded files. Each key in
     ``FILES`` is the ``name`` from the ``<input type="file" name="" />``. Each
@@ -122 +111 @@
     and the ``<form>`` that posted to the request had
     ``enctype="multipart/form-data"``. Otherwise, ``FILES`` will be a blank
     dictionary-like object.
+
+    .. versionchanged:: 1.0
+
+    In previous versions of Django, ``request.FILES`` contained simple ``dict``
+    objects representing uploaded files. This is no longer true -- files are
+    represented by ``UploadedFile`` objects as described below.
+
+    These ``UploadedFile`` objects will emulate the old-style ``dict``
+    interface, but this is deprecated and will be removed in the next release of
+    Django.
 
 .. attribute:: HttpRequest.META
 

docs/ref/templates/api.txt

@@ -29 +29 @@
 
 Block tags are surrounded by ``"{%"`` and ``"%}"``.
 
-Example template with block tags::
+Example template with block tags:
+
+.. code-block:: html+django
 
     {% if is_logged_in %}Thanks for logging in!{% else %}Please log in.{% endif %}
 
@@ -37 +39 @@
 
 Variable tags are surrounded by ``"{{"`` and ``"}}"``.
 
-Example template with variables::
+Example template with variables:
+
+.. code-block:: html+django
 
     My first name is {{ first_name }}. My last name is {{ last_name }}.
 
@@ -566 +570 @@
 
 The ``render_to_string`` shortcut takes one required argument --
 ``template_name``, which should be the name of the template to load
-and render -- and two optional arguments::
+and render -- and two optional arguments:
 
     dictionary
         A dictionary to be used as variables and values for the

docs/ref/templates/builtins.txt

@@ -13 +13 @@
 
 Built-in tag reference
 ----------------------
+
+.. highlightlang:: html+django
 
 .. templatetag:: autoescape
 
@@ -473 +475 @@
 
 This complex tag is best illustrated by use of an example: say that ``people``
 is a list of people represented by dictionaries with ``first_name``,
-``last_name``, and ``gender`` keys::
+``last_name``, and ``gender`` keys:
+
+.. code-block:: python
 
     people = [
         {'first_name': 'George', 'last_name': 'Bush', 'gender': 'Male'},
@@ -530 +534 @@
 If the ``people`` list did *not* order its members by ``gender``, the regrouping
 would naively display more than one group for a single gender. For example,
 say the ``people`` list was set to this (note that the males are not grouped
-together)::
+together):
+
+.. code-block:: python
 
     people = [
         {'first_name': 'Bill', 'last_name': 'Clinton', 'gender': 'Male'},
@@ -657 +663 @@
 
 For example, suppose you have a view, ``app_views.client``, whose URLconf
 takes a client ID (here, ``client()`` is a method inside the views file
-``app_views.py``). The URLconf line might look like this::
+``app_views.py``). The URLconf line might look like this:
+
+.. code-block:: python
 
     ('^client/(\d+)/$', 'app_views.client')
 
 If this app's URLconf is included into the project's URLconf under a path
-such as this::
+such as this:
+
+.. code-block:: python
 
     ('^clients/', include('project_name.app_name.urls'))
 
@@ -682 +692 @@
 :exc:`NoReverseMatch` exception raised, which will cause your site to display an
 error page.
 
-**New in development verson:** If you'd like to retrieve a URL without displaying it,
-you can use a slightly different call:
+.. versionadded:: 1.0
 
-.. code-block:: html+django
+If you'd like to retrieve a URL without displaying it, you can use a slightly
+different call::
+
 
     {% url path.to.view arg, arg2 as the_url %}
     
     <a href="{{ the_url }}">I'm linking to {{ the_url }}</a>
     
 This ``{% url ... as var %}`` syntax will *not* cause an error if the view is
-missing. In practice you'll use this to link to views that are optional:
-
-.. code-block:: html+django
+missing. In practice you'll use this to link to views that are optional::
 
     {% url path.to.view as the_url %}
     {% if the_url %}
@@ -845 +854 @@
 
     {{ value|dictsort:"name" }}
 
-If ``value`` is::
+If ``value`` is:
+
+.. code-block:: python
 
     [
         {'name': 'zed', 'age': 19},
@@ -853 +864 @@
         {'name': 'joe', 'age': 31},
     ]
 
-then the output would be::
+then the output would be:
+
+.. code-block:: python
 
     [
         {'name': 'amy', 'age': 22},
@@ -1274 +1287 @@
 http://diveintopython.org/native_data_types/lists.html#odbchelper.list.slice
 for an introduction.
 
-Example: ``{{ some_list|slice:":2" }}``
+Example::
+
+    {{ some_list|slice:":2" }}
 
 .. templatefilter:: slugify
 

docs/topics/forms/formsets.txt

@@ -306 +306 @@
             formset = ArticleFormSet()
         return render_to_response('manage_articles.html', {'formset': formset})
 
-The ``manage_articles.html`` template might look like this::
+The ``manage_articles.html`` template might look like this:
+
+.. code-block:: html+django
 
     <form method="POST" action="">
         {{ formset.management_form }}
@@ -318 +320 @@
     </form>
 
 However the above can be slightly shortcutted and let the formset itself deal
-with the management form::
+with the management form:
+
+.. code-block:: html+django
 
     <form method="POST" action="">
         <table>

docs/topics/forms/index.txt

@@ -9 +9 @@
     This document provides an introduction to Django's form handling features.
     For a more detailed look at the forms API, see :ref:`ref-forms-api`. For
     documentation of the available field types, see :ref:`ref-forms-fields`.
+
+.. highlightlang:: html+django
 
 ``django.forms`` is Django's form-handling library.
 
@@ -60 +62 @@
 Django's database models.
 
 For example, consider a form used to implement "contact me" functionality on a
-personal Web site::
+personal Web site:
+
+.. code-block:: python
 
     from django import forms
 
@@ -82 +86 @@
 Using a form in a view
 ----------------------
 
-The standard pattern for processing a form in a view looks like this::
+The standard pattern for processing a form in a view looks like this:
+
+.. code-block:: python
 
    def contact(request):
        if request.method == 'POST': # If the form has been submitted...
@@ -133 +139 @@
 ``cc_myself`` will be a boolean value. Likewise, fields such as ``IntegerField``
 and ``FloatField`` convert values to a Python int and float respectively.
 
-Extending the above example, here's how the form data could be processed::
+Extending the above example, here's how the form data could be processed:
+
+.. code-block:: python
 
     if form.is_valid():
         subject = form.cleaned_data['subject']

docs/topics/http/sessions.txt

@@ -36 +36 @@
 Configuring the session engine
 ==============================
 
-.. versionadded:: 1.0.
+.. versionadded:: 1.0
 
 By default, Django stores sessions in your database (using the model
 ``django.contrib.sessions.models.Session``). Though this is convenient, in

docs/topics/i18n.txt

@@ -395 +395 @@
     application) and English strings (from Django itself). If you want to
     support a locale for your application that is not already part of
     Django, you'll need to make at least a minimal translation of the Django
-    core. See the relevant :ref:LocaleMiddleware note`<locale-middleware-notes>`
+    core. See the relevant :ref:`LocaleMiddleware note<locale-middleware-notes>`
     for more details.
 
 Message files

docs/topics/templates.txt

@@ -37 +37 @@
 
 Templates
 =========
+
+.. highlightlang:: html+django
 
 A template is simply a text file. It can generate any text-based format (HTML,
 XML, CSV, etc.).