From c0248f6f07c4e55d44182949f3d77f338d3bfebe Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Wed, 17 Nov 2010 16:08:28 +0000
Subject: [PATCH] Corrected some syntax issues in the docs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/topics/forms/media.txt               | 64 +++++++++++------------
 docs/topics/i18n/internationalization.txt |  2 +-
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/docs/topics/forms/media.txt b/docs/topics/forms/media.txt
index df9fa794b6..707b02b13f 100644
--- a/docs/topics/forms/media.txt
+++ b/docs/topics/forms/media.txt
@@ -132,11 +132,11 @@ parent defines its media requirements. For example, if we were to extend our
 basic Calendar widget from the example above::
 
     >>> class FancyCalendarWidget(CalendarWidget):
-            class Media:
-                css = {
-                    'all': ('fancy.css',)
-                }
-                js = ('whizbang.js',)
+    ...     class Media:
+    ...         css = {
+    ...             'all': ('fancy.css',)
+    ...         }
+    ...         js = ('whizbang.js',)
 
     >>> w = FancyCalendarWidget()
     >>> print w.media
@@ -151,12 +151,12 @@ you don't want media to be inherited in this way, add an ``extend=False``
 declaration to the media declaration::
 
     >>> class FancyCalendarWidget(CalendarWidget):
-            class Media:
-                extend = False
-                css = {
-                    'all': ('fancy.css',)
-                }
-                js = ('whizbang.js',)
+    ...     class Media:
+    ...         extend = False
+    ...         css = {
+    ...             'all': ('fancy.css',)
+    ...         }
+    ...         js = ('whizbang.js',)
 
     >>> w = FancyCalendarWidget()
     >>> print w.media
@@ -214,11 +214,11 @@ your site was ``'http://uploads.example.com/'`` and :setting:`STATIC_URL`
 was ``None``::
 
     >>> class CalendarWidget(forms.TextInput):
-            class Media:
-                css = {
-                    'all': ('/css/pretty.css',),
-                }
-                js = ('animations.js', 'http://othersite.com/actions.js')
+    ...     class Media:
+    ...         css = {
+    ...             'all': ('/css/pretty.css',),
+    ...         }
+    ...         js = ('animations.js', 'http://othersite.com/actions.js')
 
     >>> w = CalendarWidget()
     >>> print w.media
@@ -270,15 +270,15 @@ Media objects can also be added together. When two media objects are added,
 the resulting Media object contains the union of the media from both files::
 
     >>> class CalendarWidget(forms.TextInput):
-            class Media:
-                css = {
-                    'all': ('pretty.css',)
-                }
-                js = ('animations.js', 'actions.js')
+    ...     class Media:
+    ...         css = {
+    ...             'all': ('pretty.css',)
+    ...         }
+    ...         js = ('animations.js', 'actions.js')
 
     >>> class OtherWidget(forms.TextInput):
-            class Media:
-                js = ('whizbang.js',)
+    ...     class Media:
+    ...         js = ('whizbang.js',)
 
     >>> w1 = CalendarWidget()
     >>> w2 = OtherWidget()
@@ -301,8 +301,8 @@ have a media property. The default value for this property is the result
 of adding the media definitions for all widgets that are part of the form::
 
     >>> class ContactForm(forms.Form):
-            date = DateField(widget=CalendarWidget)
-            name = CharField(max_length=40, widget=OtherWidget)
+    ...     date = DateField(widget=CalendarWidget)
+    ...     name = CharField(max_length=40, widget=OtherWidget)
 
     >>> f = ContactForm()
     >>> f.media
@@ -315,13 +315,13 @@ If you want to associate additional media with a form -- for example, CSS for fo
 layout -- simply add a media declaration to the form::
 
     >>> class ContactForm(forms.Form):
-            date = DateField(widget=CalendarWidget)
-            name = CharField(max_length=40, widget=OtherWidget)
-
-            class Media:
-                css = {
-                    'all': ('layout.css',)
-                }
+    ...     date = DateField(widget=CalendarWidget)
+    ...     name = CharField(max_length=40, widget=OtherWidget)
+    ...
+    ...     class Media:
+    ...         css = {
+    ...             'all': ('layout.css',)
+    ...         }
 
     >>> f = ContactForm()
     >>> f.media
diff --git a/docs/topics/i18n/internationalization.txt b/docs/topics/i18n/internationalization.txt
index 6d58813e75..5eff7dec5e 100644
--- a/docs/topics/i18n/internationalization.txt
+++ b/docs/topics/i18n/internationalization.txt
@@ -117,7 +117,7 @@ preceding the string, e.g.::
 
 This also works in templates with the :ttag:`comment` tag:
 
-.. code-block:: django+html
+.. code-block:: html+django
 
     {% comment %}Translators: This is a text of the base template {% endcomment %}