[soc2010/query-refactor] Merged up to trunk r13556, resolved merge conflictsarchive/soc2010/query-refactorsoc2010/query-refactor

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13565 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 9 insertions, 0 deletions

diff --git a/docs/internals/contributing.txt b/docs/internals/contributing.txt
index c555f205b1..41d1cffdb2 100644
--- a/docs/internals/contributing.txt
+++ b/docs/internals/contributing.txt
@@ -145,7 +145,11 @@ and time availability), claim it by following these steps:
     * Claim the ticket by clicking the radio button next to "Accept ticket"
       near the bottom of the page, then clicking "Submit changes."
 
+If you have an account but have forgotten your password, you can reset it
+using the `password reset page`_.
+
 .. _Create an account: http://www.djangoproject.com/accounts/register/
+.. _password reset page: http://www.djangoproject.com/accounts/password/reset/
 
 Ticket claimers' responsibility
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/internals/documentation.txt b/docs/internals/documentation.txt
index 81480abf9a..9aa8551266 100644
--- a/docs/internals/documentation.txt
+++ b/docs/internals/documentation.txt
@@ -15,6 +15,11 @@ __ http://docutils.sourceforge.net/
 To actually build the documentation locally, you'll currently need to install
 Sphinx -- ``easy_install Sphinx`` should do the trick.
 
+.. note::
+
+    Generation of the Django documentation will work with Sphinx version 0.6
+    or newer, but we recommend going straigh to Sphinx 1.0 or newer.
+
 Then, building the html is easy; just ``make html`` from the ``docs`` directory.
 
 To get started contributing, you'll want to read the `ReStructuredText