Author: adrian
Date: 2009-02-21 02:54:32 -0600 (Sat, 21 Feb 2009)
New Revision: 9854
Modified:
django/branches/releases/1.0.X/docs/ref/contrib/syndication.txt
django/branches/releases/1.0.X/docs/ref/forms/fields.txt
django/branches/releases/1.0.X/docs/ref/forms/widgets.txt
django/branches/releases/1.0.X/docs/ref/templates/builtins.txt
django/branches/releases/1.0.X/docs/topics/serialization.txt
Log:
[1.0.X] Merged trunk changes [9850], [9851], [9852], [9853]
Modified: django/branches/releases/1.0.X/docs/ref/contrib/syndication.txt
===================================================================
--- django/branches/releases/1.0.X/docs/ref/contrib/syndication.txt
2009-02-21 08:45:47 UTC (rev 9853)
+++ django/branches/releases/1.0.X/docs/ref/contrib/syndication.txt
2009-02-21 08:54:32 UTC (rev 9854)
@@ -259,7 +259,7 @@
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
Modified: django/branches/releases/1.0.X/docs/ref/forms/fields.txt
===================================================================
--- django/branches/releases/1.0.X/docs/ref/forms/fields.txt 2009-02-21
08:45:47 UTC (rev 9853)
+++ django/branches/releases/1.0.X/docs/ref/forms/fields.txt 2009-02-21
08:54:32 UTC (rev 9854)
@@ -23,6 +23,7 @@
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('[email protected]')
u'[email protected]'
Modified: django/branches/releases/1.0.X/docs/ref/forms/widgets.txt
===================================================================
--- django/branches/releases/1.0.X/docs/ref/forms/widgets.txt 2009-02-21
08:45:47 UTC (rev 9853)
+++ django/branches/releases/1.0.X/docs/ref/forms/widgets.txt 2009-02-21
08:54:32 UTC (rev 9854)
@@ -107,6 +107,8 @@
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()
Modified: django/branches/releases/1.0.X/docs/ref/templates/builtins.txt
===================================================================
--- django/branches/releases/1.0.X/docs/ref/templates/builtins.txt
2009-02-21 08:45:47 UTC (rev 9853)
+++ django/branches/releases/1.0.X/docs/ref/templates/builtins.txt
2009-02-21 08:54:32 UTC (rev 9854)
@@ -1155,7 +1155,7 @@
{{ 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
Modified: django/branches/releases/1.0.X/docs/topics/serialization.txt
===================================================================
--- django/branches/releases/1.0.X/docs/topics/serialization.txt
2009-02-21 08:45:47 UTC (rev 9853)
+++ django/branches/releases/1.0.X/docs/topics/serialization.txt
2009-02-21 08:54:32 UTC (rev 9854)
@@ -125,7 +125,8 @@
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
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
