diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-02-20 01:59:59 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-02-20 01:59:59 +0000 |
| commit | 3dd28bd566f5c6b665da4729c51abe98a36caccb (patch) | |
| tree | 41c831069adaae16fb8006f5462898215e8d355a /docs | |
| parent | da6570bf082620205737c82cd7deb7185daaf538 (diff) | |
queryset-refactor: Merged from turnk up to [7135] because I need some stuff.
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/db-api.txt | 3 | ||||
| -rw-r--r-- | docs/faq.txt | 2 | ||||
| -rw-r--r-- | docs/serialization.txt | 2 | ||||
| -rw-r--r-- | docs/templates_python.txt | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/docs/db-api.txt b/docs/db-api.txt index c37ebd083a..887a06a67e 100644 --- a/docs/db-api.txt +++ b/docs/db-api.txt @@ -1758,8 +1758,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 ~~~~~~~~ diff --git a/docs/faq.txt b/docs/faq.txt index cef0508562..3d7db36fbc 100644 --- a/docs/faq.txt +++ b/docs/faq.txt @@ -353,7 +353,7 @@ How do I install mod_python on Windows? working`_. .. _`win32 build of mod_python for Python 2.4`: http://www.lehuen.com/nicolas/index.php/2005/02/21/39-win32-build-of-mod_python-314-for-python-24 -.. _`Django on Windows howto`: http://thinkhole.org/wp/2006/04/03/django-on-windows-howto/ +.. _`Django on Windows howto`: http://thinkhole.org/wp/django-on-windows/ .. _`Running mod_python on Apache on Windows2000`: http://groups-beta.google.com/group/comp.lang.python/msg/139af8c83a5a9d4f .. _`guide to getting mod_python working`: http://www.dscpl.com.au/articles/modpython-001.html diff --git a/docs/serialization.txt b/docs/serialization.txt index dff33f219f..e901410f1c 100644 --- a/docs/serialization.txt +++ b/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. diff --git a/docs/templates_python.txt b/docs/templates_python.txt index f98cfa3249..c6e9223e9f 100644 --- a/docs/templates_python.txt +++ b/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 |