unicode: Merged from trunk up to [5600].

git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5601 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 25 insertions, 24 deletions

diff --git a/docs/contributing.txt b/docs/contributing.txt
index fa16f858b6..e58b06881a 100644
--- a/docs/contributing.txt
+++ b/docs/contributing.txt
@@ -394,11 +394,11 @@ Guidelines for ReST files
 
 These guidelines regulate the format of our ReST documentation:
 
-	* In section titles, capitalize only initial words and proper nouns.
+    * In section titles, capitalize only initial words and proper nouns.
 
-	* Wrap the documentation at 80 characters wide, unless a code example
-	  is significantly less readable when split over two lines, or for another
-	  good reason.
+    * Wrap the documentation at 80 characters wide, unless a code example
+      is significantly less readable when split over two lines, or for another
+      good reason.
 
 Commonly used terms
 -------------------
@@ -406,41 +406,41 @@ Commonly used terms
 Here are some style guidelines on commonly used terms throughout the
 documentation:
 
-	* **Django** -- when referring to the framework, capitalize Django. It is
-	  lowercase only in Python code and in the djangoproject.com logo.
+    * **Django** -- when referring to the framework, capitalize Django. It is
+      lowercase only in Python code and in the djangoproject.com logo.
 
-	* **e-mail** -- it has a hyphen.
+    * **e-mail** -- it has a hyphen.
 
-	* **MySQL**
+    * **MySQL**
 
-	* **PostgreSQL**
+    * **PostgreSQL**
 
-	* **Python** -- when referring to the language, capitalize Python.
+    * **Python** -- when referring to the language, capitalize Python.
 
-	* **realize**, **customize**, **initialize**, etc. -- use the American
-	  "ize" suffix, not "ise."
+    * **realize**, **customize**, **initialize**, etc. -- use the American
+      "ize" suffix, not "ise."
 
-	* **SQLite**
+    * **SQLite**
 
-	* **subclass** -- it's a single word without a hyphen, both as a verb
-	  ("subclass that model") and as a noun ("create a subclass").
+    * **subclass** -- it's a single word without a hyphen, both as a verb
+      ("subclass that model") and as a noun ("create a subclass").
 
-	* **Web**, **World Wide Web**, **the Web** -- note Web is always
-	  capitalized when referring to the World Wide Web.
+    * **Web**, **World Wide Web**, **the Web** -- note Web is always
+      capitalized when referring to the World Wide Web.
 
     * **Web site** -- use two words, with Web capitalized.
 
 Django-specific terminology
 ---------------------------
 
-	* **model** -- it's not capitalized.
+    * **model** -- it's not capitalized.
 
-	* **template** -- it's not capitalized.
+    * **template** -- it's not capitalized.
 
-	* **URLconf** -- use three capitalized letters, with no space before
-	  "conf."
+    * **URLconf** -- use three capitalized letters, with no space before
+      "conf."
 
-	* **view** -- it's not capitalized.
+    * **view** -- it's not capitalized.
 
 Committing code
 ===============
diff --git a/docs/templates_python.txt b/docs/templates_python.txt
index 7171f32612..821f40fd8d 100644
--- a/docs/templates_python.txt
+++ b/docs/templates_python.txt
@@ -311,9 +311,10 @@ optional, third positional argument, ``processors``. In this example, the
 
     def some_view(request):
         # ...
-        return RequestContext(request, {
+        c = RequestContext(request, {
             'foo': 'bar',
         }, [ip_address_processor])
+        return t.render(c)
 
 Note::
     If you're using Django's ``render_to_response()`` shortcut to populate a
@@ -677,7 +678,7 @@ an object to it's string value before being passed to your function::
 
     @template.stringfilter
     def lower(value):
-    	return value.lower()
+        return value.lower()
 
 Writing custom template tags
 ----------------------------