boulder-oracle-sprint: Merged to [5099]

git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@5100 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 24 insertions, 17 deletions

diff --git a/docs/authentication.txt b/docs/authentication.txt
index 14ca581877..091a30a895 100644
--- a/docs/authentication.txt
+++ b/docs/authentication.txt
@@ -208,7 +208,8 @@ Hashtype is either ``sha1`` (default), ``md5`` or ``crypt`` -- the algorithm
 used to perform a one-way hash of the password. Salt is a random string used
 to salt the raw password to create the hash. Note that the ``crypt`` method is
 only supported on platforms that have the standard Python ``crypt`` module
-available.
+available, and ``crypt`` support is only available in the Django development
+version.
 
 For example::
 
diff --git a/docs/install.txt b/docs/install.txt
index c337be404b..defa3e38ad 100644
--- a/docs/install.txt
+++ b/docs/install.txt
@@ -45,16 +45,16 @@ Get your database running
 =========================
 
 If you plan to use Django's database API functionality, you'll need to
-make sure a database server is running. Django works with PostgreSQL_
-(recommended), MySQL_ and SQLite_.
+make sure a database server is running. Django works with PostgreSQL_,
+MySQL_ and SQLite_.
 
 Additionally, you'll need to make sure your Python database bindings are
 installed.
 
-* If you're using PostgreSQL, you'll need the psycopg_ package (version 2 is
-  recommended with ``postgresql_psycopg2`` backend, version 1.1 works also with the
-  ``postgresql``` backend). 
-  
+* If you're using PostgreSQL, you'll need the psycopg_ package. Django supports
+  both version 1 and 2. (When you configure Django's database layer, specify
+  either ``postgresql`` [for version 1] or ``postgresql_psycopg2`` [for version 2].)
+
   If you're on Windows, check out the unofficial `compiled Windows version`_.
   
 * If you're using MySQL, you'll need MySQLdb_, version 1.2.1p2 or higher.
diff --git a/docs/settings.txt b/docs/settings.txt
index 5315c683c7..9ab5f5ff82 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -562,9 +562,23 @@ strings for translation, but the translation won't happen at runtime -- so
 you'll have to remember to wrap the languages in the *real* ``gettext()`` in
 any code that uses ``LANGUAGES`` at runtime.
 
+LOGIN_REDIRECT_URL
+------------------
+
+**New in Django development version**
+
+Default: ``'/accounts/profile/'``
+
+The URL where requests are redirected after login when the
+``contrib.auth.login`` view gets no ``next`` parameter.
+
+This is used by the `@login_required`_ decorator, for example.
+
 LOGIN_URL
 ---------
 
+**New in Django development version**
+
 Default: ``'/accounts/login/'``
 
 The URL where requests are redirected for login, specially when using the
@@ -573,6 +587,8 @@ The URL where requests are redirected for login, specially when using the
 LOGOUT_URL
 ----------
 
+**New in Django development version**
+
 Default: ``'/accounts/logout/'``
 
 LOGIN_URL counterpart.
@@ -635,16 +651,6 @@ locales have different formats. For example, U.S. English would say
 See `allowed date format strings`_. See also DATE_FORMAT, DATETIME_FORMAT,
 TIME_FORMAT and YEAR_MONTH_FORMAT.
 
-LOGIN_REDIRECT_URL
-------------------
-
-Default: ``'/accounts/profile/'``
-
-The URL where requests are redirected after login when the
-``contrib.auth.login`` view gets no ``next`` parameter.
-
-This is used by the `@login_required`_ decorator, for example.
-
 PREPEND_WWW
 -----------