[multi-db] Merge trunk to [3661]

git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@3712 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 13 insertions, 0 deletions

diff --git a/docs/contributing.txt b/docs/contributing.txt
index 9d116cac10..3d101c3241 100644
--- a/docs/contributing.txt
+++ b/docs/contributing.txt
@@ -168,6 +168,19 @@ Please follow these coding standards when writing code for inclusion in Django:
 
           {{foo}}
 
+    * In Django views, the first parameter in a view function should be called
+      ``request``.
+
+      Do this::
+
+          def my_view(request, foo):
+              # ...
+
+      Don't do this::
+
+          def my_view(req, foo):
+              # ...
+
     * Please don't put your name in the code. While we appreciate all
       contributions to Django, our policy is not to publish individual
       developer names in code -- for instance, at the top of Python modules.