gis: Merged revisions 7574-7583,7585-7586,7590-7602,7614-7615,7619-76…

…25,7629,7632-7636 via svnmerge from trunk.

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

AUTHORS

@@ -57,6 +57,7 @@ answer newbie questions, and generally made Django that much better:
     David Ascher <http://ascher.ca/>
     Jökull Sólberg Auðunsson <jokullsolberg@gmail.com>
     Arthur <avandorp@gmail.com>
+    av0000@mail.ru
     David Avsajanishvili <avsd05@gmail.com>
     axiak@mit.edu
     Niran Babalola <niran@niran.org>
@@ -78,6 +79,7 @@ answer newbie questions, and generally made Django that much better:
     brut.alll@gmail.com
     btoll@bestweb.net
     Jonathan Buchanan <jonathan.buchanan@gmail.com>
+    Keith Bussell <kbussell@gmail.com>
     Juan Manuel Caicedo <juan.manuel.caicedo@gmail.com>
     Trevor Caira <trevor@caira.com>
     Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
@@ -142,6 +144,7 @@ answer newbie questions, and generally made Django that much better:
     Bill Fenner <fenner@gmail.com>
     Stefane Fermgier <sf@fermigier.com>
     Afonso Fernández Nogueira <fonzzo.django@gmail.com>
+    J. Pablo Fernandez <pupeno@pupeno.com>
     Matthew Flanagan <http://wadofstuff.blogspot.com>
     Eric Floehr <eric@intellovations.com>
     Vincent Foley <vfoleybourgon@yahoo.ca>
@@ -359,13 +362,14 @@ answer newbie questions, and generally made Django that much better:
     Makoto Tsuyuki <mtsuyuki@gmail.com>
     tt@gurgle.no
     David Tulig <david.tulig@gmail.com>
-    Amit Upadhyay
+    Amit Upadhyay <http://www.amitu.com/blog/>
     Geert Vanderkelen
     I.S. van Oostveen <v.oostveen@idca.nl>
     viestards.lists@gmail.com
     George Vilches <gav@thataddress.com>
     Vlado <vlado@labath.org>
     Milton Waddams
+    Chris Wagner <cw264701@ohio.edu>
     wam-djangobug@wamber.net
     Wang Chun <wangchun@exoweb.net>
     Filip Wasilewski <filip.wasilewski@gmail.com>

django/conf/global_settings.py

@@ -11,9 +11,10 @@
 
 DEBUG = False
 TEMPLATE_DEBUG = False
-# True if BaseHandler.get_response() should propagate raw exceptions
-# rather than catching them.  This is useful under some testing siutations,
-# and should never be used on a live site.
+
+# Whether the framework should propagate raw exceptions rather than catching
+# them. This is useful under some testing siutations and should never be used
+# on a live site.
 DEBUG_PROPAGATE_EXCEPTIONS = False
 
 # Whether to use the "Etag" header. This saves bandwidth but slows down performance.
@@ -289,7 +290,7 @@
 SESSION_COOKIE_SECURE = False                           # Whether the session cookie should be secure (https:// only).
 SESSION_COOKIE_PATH = '/'                               # The path of the session cookie.
 SESSION_SAVE_EVERY_REQUEST = False                      # Whether to save the session data on every request.
-SESSION_EXPIRE_AT_BROWSER_CLOSE = False                 # Whether sessions expire when a user closes his browser.
+SESSION_EXPIRE_AT_BROWSER_CLOSE = False                 # Whether a user's session cookie expires when the Web browser is closed.
 SESSION_ENGINE = 'django.contrib.sessions.backends.db'  # The module to store session data
 SESSION_FILE_PATH = None                                # Directory to store session files if using the file session module. If None, the backend will use a sensible default.