boulder-oracle-sprint: Merged to [5045]

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

15 files changed, 27 insertions, 24 deletions

diff --git a/docs/add_ons.txt b/docs/add_ons.txt
index b92ae0bd17..4f45d99d9a 100644
--- a/docs/add_ons.txt
+++ b/docs/add_ons.txt
@@ -24,7 +24,7 @@ admin
 The automatic Django administrative interface. For more information, see
 `Tutorial 2`_.
 
-.. _Tutorial 2: ../tutorial2/
+.. _Tutorial 2: ../tutorial02/
 
 auth
 ====
diff --git a/docs/api_stability.txt b/docs/api_stability.txt
index 508336e0ef..3fd793b0fd 100644
--- a/docs/api_stability.txt
+++ b/docs/api_stability.txt
@@ -101,7 +101,7 @@ change:
 .. _caching: ../cache/
 .. _custom template tags and libraries: ../templates_python/
 .. _database lookup: ../db_api/
-.. _django-admin utility: ../django_admin/
+.. _django-admin utility: ../django-admin/
 .. _fastcgi integration: ../fastcgi/
 .. _flatpages: ../flatpages/
 .. _generic views: ../generic_views/
diff --git a/docs/databases.txt b/docs/databases.txt
index 3545b58d47..b73f39843c 100644
--- a/docs/databases.txt
+++ b/docs/databases.txt
@@ -69,9 +69,12 @@ For now, InnoDB is probably your best choice.
 MySQLdb
 -------
 
-`MySQLdb`_ is the Python interface to MySQL. 1.2.1 is the first version that
-has support for MySQL 4.1 and newer. If you are trying to use an older version
-of MySQL, then 1.2.0 *might* work for you.
+`MySQLdb`_ is the Python interface to MySQL. Version 1.2.1p2 or later is
+required for full MySQL support in Django. Earlier versions will not work with
+the ``mysql`` backend.
+
+If you are trying to use an older version of MySQL and the ``mysql_old``
+backend, then 1.2.0 *might* work for you.
 
 .. _MySQLdb: http://sourceforge.net/projects/mysql-python
 
diff --git a/docs/django-admin.txt b/docs/django-admin.txt
index 917569e154..cc2eadc365 100644
--- a/docs/django-admin.txt
+++ b/docs/django-admin.txt
@@ -61,7 +61,7 @@ Prints the admin-index template snippet for the given appnames.
 Use admin-index template snippets if you want to customize the look and feel of
 your admin's index page. See `Tutorial 2`_ for more information.
 
-.. _Tutorial 2: ../tutorial2/
+.. _Tutorial 2: ../tutorial02/
 
 createcachetable [tablename]
 ----------------------------
diff --git a/docs/faq.txt b/docs/faq.txt
index ac6773d296..f61af9cd92 100644
--- a/docs/faq.txt
+++ b/docs/faq.txt
@@ -278,7 +278,7 @@ How do I get started?
 
 .. _`Download the code`: http://www.djangoproject.com/download/
 .. _`installation guide`: ../install/
-.. _tutorial:  ../tutorial1/
+.. _tutorial:  ../tutorial01/
 .. _documentation: ../
 .. _ask questions: http://www.djangoproject.com/community/
 
diff --git a/docs/legacy_databases.txt b/docs/legacy_databases.txt
index 3e2753baca..ca3927e52f 100644
--- a/docs/legacy_databases.txt
+++ b/docs/legacy_databases.txt
@@ -9,7 +9,7 @@ utilities to automate as much of this process as possible.
 This document assumes you know the Django basics, as covered in the
 `official tutorial`_.
 
-.. _official tutorial: ../tutorial1/
+.. _official tutorial: ../tutorial01/
 
 Give Django your database parameters
 ====================================
@@ -52,7 +52,7 @@ Once you've cleaned up your models, name the file ``models.py`` and put it in
 the Python package that holds your app. Then add the app to your
 ``INSTALLED_APPS`` setting.
 
-.. _django-admin.py documentation: ../django_admin/
+.. _django-admin.py documentation: ../django-admin/
 
 Install the core Django tables
 ==============================
diff --git a/docs/model-api.txt b/docs/model-api.txt
index 7fe099e022..b71668e37f 100644
--- a/docs/model-api.txt
+++ b/docs/model-api.txt
@@ -1924,7 +1924,7 @@ order in which they're executed. The only thing you can assume is that, by the
 time your custom data files are executed, all the database tables already will
 have been created.
 
-.. _`manage.py documentation`: ../django_admin/#sqlcustom-appname-appname
+.. _`manage.py documentation`: ../django-admin/#sqlcustom-appname-appname
 
 Database-backend-specific SQL data
 ----------------------------------
diff --git a/docs/overview.txt b/docs/overview.txt
index 35af75bf05..7b3559663a 100644
--- a/docs/overview.txt
+++ b/docs/overview.txt
@@ -297,5 +297,5 @@ The next obvious steps are for you to `download Django`_, read `the tutorial`_
 and join `the community`_. Thanks for your interest!
 
 .. _download Django: http://www.djangoproject.com/download/
-.. _the tutorial: http://www.djangoproject.com/documentation/tutorial1/
+.. _the tutorial: http://www.djangoproject.com/documentation/tutorial01/
 .. _the community: http://www.djangoproject.com/community/
diff --git a/docs/settings.txt b/docs/settings.txt
index 95549d40be..9ade249f24 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -59,7 +59,7 @@ Use the ``--settings`` command-line argument to specify the settings manually::
 
     django-admin.py runserver --settings=mysite.settings
 
-.. _django-admin.py: ../django_admin/
+.. _django-admin.py: ../django-admin/
 
 On the server (mod_python)
 --------------------------
@@ -102,7 +102,7 @@ between the current settings file and Django's default settings.
 
 For more, see the `diffsettings documentation`_.
 
-.. _diffsettings documentation: ../django_admin/#diffsettings
+.. _diffsettings documentation: ../django-admin/#diffsettings
 
 Using settings in Python code
 =============================
@@ -462,7 +462,7 @@ A tuple of strings designating all applications that are enabled in this Django
 installation. Each string should be a full Python path to a Python package that
 contains a Django application, as created by `django-admin.py startapp`_.
 
-.. _django-admin.py startapp: ../django_admin/#startapp-appname
+.. _django-admin.py startapp: ../django-admin/#startapp-appname
 
 INTERNAL_IPS
 ------------
diff --git a/docs/templates_python.txt b/docs/templates_python.txt
index 5dd8e4fde0..7cc9acede8 100644
--- a/docs/templates_python.txt
+++ b/docs/templates_python.txt
@@ -1020,7 +1020,7 @@ The ``takes_context`` parameter defaults to ``False``. When it's set to *True*,
 the tag is passed the context object, as in this example. That's the only
 difference between this case and the previous ``inclusion_tag`` example.
 
-.. _tutorials: ../tutorial1/#creating-models
+.. _tutorials: ../tutorial01/#creating-models
 
 Setting a variable in the context
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/testing.txt b/docs/testing.txt
index 5b27ae6484..a135734144 100644
--- a/docs/testing.txt
+++ b/docs/testing.txt
@@ -404,7 +404,7 @@ In this example, any JSON fixture called ``mammals``, and any fixture
 named ``birds`` will be installed. See the documentation on 
 `loading fixtures`_ for more details on defining and installing fixtures.
 
-.. _`loading fixtures`: ../django_admin/#loaddata-fixture-fixture
+.. _`loading fixtures`: ../django-admin/#loaddata-fixture-fixture
 
 This flush/load procedure is repeated for each test in the test case, so you 
 can be certain that the outcome of a test will not be affected by 
diff --git a/docs/tutorial01.txt b/docs/tutorial01.txt
index b29d7b813f..7657bc7bf7 100644
--- a/docs/tutorial01.txt
+++ b/docs/tutorial01.txt
@@ -124,7 +124,7 @@ It worked!
 
     Full docs for the development server are at `django-admin documentation`_.
 
-.. _django-admin documentation: ../django_admin/
+.. _django-admin documentation: ../django-admin/
 
 Database setup
 --------------
@@ -400,7 +400,7 @@ as you like, and it will only ever create the tables that don't exist.
 Read the `django-admin.py documentation`_ for full information on what the
 ``manage.py`` utility can do.
 
-.. _django-admin.py documentation: ../django_admin/
+.. _django-admin.py documentation: ../django-admin/
 
 Playing with the API
 ====================
@@ -578,4 +578,4 @@ When you're comfortable with the API, read `part 2 of this tutorial`_ to get
 Django's automatic admin working.
 
 .. _Database API reference: ../db_api/
-.. _part 2 of this tutorial: ../tutorial2/
+.. _part 2 of this tutorial: ../tutorial02/
diff --git a/docs/tutorial02.txt b/docs/tutorial02.txt
index e9523ebfd5..6e4b0ea35e 100644
--- a/docs/tutorial02.txt
+++ b/docs/tutorial02.txt
@@ -5,7 +5,7 @@ Writing your first Django app, part 2
 This tutorial begins where `Tutorial 1`_ left off. We're continuing the Web-poll
 application and will focus on Django's automatically-generated admin site.
 
-.. _Tutorial 1: ../tutorial1/
+.. _Tutorial 1: ../tutorial01/
 
 .. admonition:: Philosophy
 
@@ -434,4 +434,4 @@ When you're comfortable with the admin site, read `part 3 of this tutorial`_ to
 start working on public poll views.
 
 .. _Django admin CSS guide: ../admin_css/
-.. _part 3 of this tutorial: ../tutorial3/
+.. _part 3 of this tutorial: ../tutorial03/
diff --git a/docs/tutorial03.txt b/docs/tutorial03.txt
index 17b6ec0c68..8bb63791aa 100644
--- a/docs/tutorial03.txt
+++ b/docs/tutorial03.txt
@@ -5,7 +5,7 @@ Writing your first Django app, part 3
 This tutorial begins where `Tutorial 2`_ left off. We're continuing the Web-poll
 application and will focus on creating the public interface -- "views."
 
-.. _Tutorial 2: ../tutorial2/
+.. _Tutorial 2: ../tutorial02/
 
 Philosophy
 ==========
@@ -463,4 +463,4 @@ All the poll app cares about is its relative URLs, not its absolute URLs.
 When you're comfortable with writing views, read `part 4 of this tutorial`_ to
 learn about simple form processing and generic views.
 
-.. _part 4 of this tutorial: ../tutorial4/
+.. _part 4 of this tutorial: ../tutorial04/
diff --git a/docs/tutorial04.txt b/docs/tutorial04.txt
index b1c8c7d4fc..e3d5d4dfc5 100644
--- a/docs/tutorial04.txt
+++ b/docs/tutorial04.txt
@@ -256,4 +256,4 @@ installments:
     * Advanced admin features: Permissions
     * Advanced admin features: Custom JavaScript
 
-.. _Tutorial 3: ../tutorial3/
+.. _Tutorial 3: ../tutorial03/