From 70c080fcdb7acbc4c3f86ee85ea84b5861c26bb9 Mon Sep 17 00:00:00 2001
From: minusf <minusf@gmail.com>
Date: Sun, 28 Jul 2013 19:58:19 +0900
Subject: [PATCH] Misc doc cleanups.
---
docs/ref/forms/widgets.txt | 7 +++----
docs/topics/templates.txt | 4 +++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/docs/ref/forms/widgets.txt b/docs/ref/forms/widgets.txt
index 5b66776cfc..080d1fea86 100644
--- a/docs/ref/forms/widgets.txt
+++ b/docs/ref/forms/widgets.txt
@@ -52,8 +52,7 @@ widget on the field. In the following example, the
:attr:`~django.forms.extras.widgets.SelectDateWidget.years` attribute is set
for a :class:`~django.forms.extras.widgets.SelectDateWidget`::
- from django.forms.fields import DateField, ChoiceField, MultipleChoiceField
- from django.forms.widgets import RadioSelect, CheckboxSelectMultiple
+ from django import forms
from django.forms.extras.widgets import SelectDateWidget
BIRTH_YEAR_CHOICES = ('1980', '1981', '1982')
@@ -62,9 +61,9 @@ for a :class:`~django.forms.extras.widgets.SelectDateWidget`::
('black', 'Black'))
class SimpleForm(forms.Form):
- birth_year = DateField(widget=SelectDateWidget(years=BIRTH_YEAR_CHOICES))
+ birth_year = forms.DateField(widget=SelectDateWidget(years=BIRTH_YEAR_CHOICES))
favorite_colors = forms.MultipleChoiceField(required=False,
- widget=CheckboxSelectMultiple, choices=FAVORITE_COLORS_CHOICES)
+ widget=forms.CheckboxSelectMultiple, choices=FAVORITE_COLORS_CHOICES)
See the :ref:`built-in widgets` for more information about which widgets
are available and which arguments they accept.
diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt
index 58a3ee9870..c75b83f158 100644
--- a/docs/topics/templates.txt
+++ b/docs/topics/templates.txt
@@ -45,7 +45,9 @@ A template contains **variables**, which get replaced with values when the
template is evaluated, and **tags**, which control the logic of the template.
Below is a minimal template that illustrates a few basics. Each element will be
-explained later in this document.::
+explained later in this document.
+
+.. code-block:: html+django
{% extends "base_generic.html" %}