Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.0.X] Merged trunk changes [9850], [9851], [9852], [9853]

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 267122978fb4cdb00a303b816487f0e6f803d3c1 1 parent d9b5a41
@adrianholovaty adrianholovaty authored
View
2  docs/ref/contrib/syndication.txt
@@ -259,7 +259,7 @@ request to the URL :file:`/rss/beats/0613/`:
a 404 error for that request.
.. versionadded:: 1.0
- meth:`get_object()` can handle the :file:`/rss/beats/` url.
+ :meth:`get_object()` can handle the :file:`/rss/beats/` url.
The :meth:`get_object()` method also has a chance to handle the
:file:`/rss/beats/` url. In this case, :data:`bits` will be an
View
1  docs/ref/forms/fields.txt
@@ -23,6 +23,7 @@ how they work. Each ``Field`` instance has a ``clean()`` method, which takes
a single argument and either raises a ``django.forms.ValidationError``
exception or returns the clean value::
+ >>> from django import forms
>>> f = forms.EmailField()
>>> f.clean('foo@example.com')
u'foo@example.com'
View
2  docs/ref/forms/widgets.txt
@@ -107,6 +107,8 @@ built-in Field classes.
However, if you want to use a different widget for a field, you can -
just use the 'widget' argument on the field definition. For example::
+ from django import forms
+
class CommentForm(forms.Form):
name = forms.CharField()
url = forms.URLField()
View
2  docs/ref/templates/builtins.txt
@@ -1155,7 +1155,7 @@ For example::
{{ value|linebreaks }}
-If ``value`` is ``Joel\nis a slug``, the output will be ``<p>Joel<br>is a
+If ``value`` is ``Joel\nis a slug``, the output will be ``<p>Joel<br />is a
slug</p>``.
.. templatefilter:: linebreaksbr
View
3  docs/topics/serialization.txt
@@ -125,7 +125,8 @@ The Django object itself can be inspected as ``deserialized_object.object``.
Serialization formats
---------------------
-Django "ships" with a few included serializers:
+Django supports a number of serialization formats, some of which require you
+to install third-party Python modules:
========== ==============================================================
Identifier Information
Please sign in to comment.
Something went wrong with that request. Please try again.