magic-removal: Merged to [2079]

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2080 bcc190cf-cafb-0310-a4f2-bffc1f526a37

docs/db-api.txt

@@ -308,6 +308,11 @@ so::
 
     polls.get_list(order_by=['?'])
 
+To order by a field in a different table, add the other table's name and a dot,
+like so::
+
+    choices.get_list(order_by=('polls.pub_date', 'choice'))
+
 There's no way to specify whether ordering should be case sensitive. With
 respect to case-sensitivity, Django will order results however your database
 backend normally orders them.

docs/faq.txt

@@ -96,6 +96,7 @@ Lawrence, Kansas, USA.
 
 .. _`World Online`: http://code.djangoproject.com/wiki/WorldOnline
 .. _`Adrian Holovaty`: http://www.holovaty.com/
+.. _`washingtonpost.com`: http://www.washingtonpost.com/
 .. _`chicagocrime.org`: http://www.chicagocrime.org/
 .. _`Simon Willison`: http://simon.incutio.com/
 .. _`simon.incutio.com`: http://simon.incutio.com/

docs/templates_python.txt

@@ -361,6 +361,9 @@ that contain full paths to your template directory(ies). Example::
         "/home/html/templates/default",
     )
 
+Your templates can go anywhere you want, as long as the directories and
+templates are readable by the Web server.
+
 Note that these paths should use Unix-style forward slashes, even on Windows.
 
 The Python API