Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed a few errors in the documentation. Thanks, Matthew Flanagan, pa…

…nni@fragstore.net and adamv.

Fixed #6411, #6426, #6524, #6555.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 3eec925f73621eba3f5db4f2c1da22271915d8b2 1 parent e7b2ad8
@malcolmt malcolmt authored
View
3  docs/db-api.txt
@@ -1605,8 +1605,7 @@ the cache of all one-to-many relationships ahead of time. Example::
print e.blog # Doesn't hit the database; uses cached version.
print e.blog # Doesn't hit the database; uses cached version.
-``select_related()`` is documented in the "QuerySet methods that return new
-QuerySets" section above.
+``select_related()`` is documented in the `QuerySet methods that return new QuerySets`_ section above.
Backward
~~~~~~~~
View
2  docs/serialization.txt
@@ -88,7 +88,7 @@ something like::
for deserialized_object in serializers.deserialize("xml", data):
if object_should_be_saved(deserialized_object):
- obj.save()
+ deserialized_object.save()
In other words, the usual use is to examine the deserialized objects to make
sure that they are "appropriate" for saving before doing so. Of course, if you trust your data source you could just save the object and move on.
View
4 docs/templates_python.txt
@@ -395,6 +395,8 @@ See the `internationalization docs`_ for more.
django.core.context_processors.media
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**New in Django development version**
+
If ``TEMPLATE_CONTEXT_PROCESSORS`` contains this processor, every
``RequestContext`` will contain a variable ``MEDIA_URL``, providing the
value of the `MEDIA_URL setting`_.
@@ -1014,7 +1016,7 @@ This is not a very common situation, but it's useful if you're rendering a
template yourself. For example::
def render(self, context):
- t = template.load_template('small_fragment.html')
+ t = template.loader.get_template('small_fragment.html')
return t.render(Context({'var': obj}, autoescape=context.autoescape))
If we had neglected to pass in the current ``context.autoescape`` value to our

0 comments on commit 3eec925

Please sign in to comment.
Something went wrong with that request. Please try again.