[soc2010/app-loading] merged trunkarchive/soc2010/app-loadingsoc2010/app-loading

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/app-loading@13818 bcc190cf-cafb-0310-a4f2-bffc1f526a37

8 files changed, 31 insertions, 44 deletions

diff --git a/docs/faq/admin.txt b/docs/faq/admin.txt
index ed705d5f21..ac2e594ed2 100644
--- a/docs/faq/admin.txt
+++ b/docs/faq/admin.txt
@@ -1,5 +1,3 @@
-.. _faq-admin:
-
 FAQ: The admin
 ==============
 
@@ -32,30 +30,33 @@ How can I prevent the cache middleware from caching the admin site?
 -------------------------------------------------------------------
 
 Set the :setting:`CACHE_MIDDLEWARE_ANONYMOUS_ONLY` setting to ``True``. See the
-:ref:`cache documentation <topics-cache>` for more information.
+:doc:`cache documentation </topics/cache>` for more information.
 
 How do I automatically set a field's value to the user who last edited the object in the admin?
 -----------------------------------------------------------------------------------------------
 
-The :class:`ModelAdmin` class provides customization hooks that allow you to transform
-an object as it saved, using details from the request. By extracting the current user
-from the request, and customizing the :meth:`ModelAdmin.save_model` hook, you can update
-an object to reflect the user that edited it. See :ref:`the documentation on ModelAdmin
-methods <model-admin-methods>` for an example.
+The :class:`~django.contrib.admin.ModelAdmin` class provides customization hooks
+that allow you to transform an object as it saved, using details from the
+request. By extracting the current user from the request, and customizing the
+:meth:`~django.contrib.admin.ModelAdmin.save_model` hook, you can update an
+object to reflect the user that edited it. See :ref:`the documentation on
+ModelAdmin methods <model-admin-methods>` for an example.
 
 How do I limit admin access so that objects can only be edited by the users who created them?
 ---------------------------------------------------------------------------------------------
 
-The :class:`ModelAdmin` class also provides customization hooks that allow you to control the
-visibility and editability of objects in the admin. Using the same trick of extracting the
-user from the request, the :meth:`ModelAdmin.queryset` and :meth:`ModelAdmin.has_change_permission`
-can be used to control the visibility and editability of objects in the admin.
+The :class:`~django.contrib.admin.ModelAdmin` class also provides customization
+hooks that allow you to control the visibility and editability of objects in the
+admin. Using the same trick of extracting the user from the request, the
+:meth:`~django.contrib.admin.ModelAdmin.queryset` and
+:meth:`~django.contrib.admin.ModelAdmin.has_change_permission` can be used to
+control the visibility and editability of objects in the admin.
 
-My admin-site CSS and images showed up fine using the development server, but they're not displaying when using mod_python.
+My admin-site CSS and images showed up fine using the development server, but they're not displaying when using mod_wsgi.
 ---------------------------------------------------------------------------------------------------------------------------
 
-See :ref:`serving the admin files <howto-deployment-modpython-serving-the-admin-files>`
-in the "How to use Django with mod_python" documentation.
+See :ref:`serving the admin files <serving-the-admin-files>`
+in the "How to use Django with mod_wsgi" documentation.
 
 My "list_filter" contains a ManyToManyField, but the filter doesn't display.
 ----------------------------------------------------------------------------
@@ -91,5 +92,5 @@ We like it, but if you don't agree, you can modify the admin site's
 presentation by editing the CSS stylesheet and/or associated image files. The
 site is built using semantic HTML and plenty of CSS hooks, so any changes you'd
 like to make should be possible by editing the stylesheet. We've got a
-:ref:`guide to the CSS used in the admin <obsolete-admin-css>` to get you started.
+:doc:`guide to the CSS used in the admin </obsolete/admin-css>` to get you started.
 
diff --git a/docs/faq/contributing.txt b/docs/faq/contributing.txt
index 51a9bc2c6a..81c06f365f 100644
--- a/docs/faq/contributing.txt
+++ b/docs/faq/contributing.txt
@@ -1,5 +1,3 @@
-.. _faq-contributing:
-
 FAQ: Contributing code
 ======================
 
@@ -7,7 +5,7 @@ How can I get started contributing code to Django?
 --------------------------------------------------
 
 Thanks for asking! We've written an entire document devoted to this question.
-It's titled :ref:`Contributing to Django <internals-contributing>`.
+It's titled :doc:`Contributing to Django </internals/contributing>`.
 
 I submitted a bug fix in the ticket system several weeks ago. Why are you ignoring my patch?
 --------------------------------------------------------------------------------------------
diff --git a/docs/faq/general.txt b/docs/faq/general.txt
index 1181d261be..1fc0f1882a 100644
--- a/docs/faq/general.txt
+++ b/docs/faq/general.txt
@@ -1,5 +1,3 @@
-.. _faq-general:
-
 FAQ: General
 ============
 
@@ -63,15 +61,15 @@ at any level -- database servers, caching servers or Web/application servers.
 
 The framework cleanly separates components such as its database layer and
 application layer. And it ships with a simple-yet-powerful
-:ref:`cache framework <topics-cache>`.
+:doc:`cache framework </topics/cache>`.
 
 Who's behind this?
 ------------------
 
 Django was originally developed at World Online, the Web department of a
 newspaper in Lawrence, Kansas, USA. Django's now run by an international team of
-volunteers; you can read all about them over at the :ref:`list of committers
-<internals-committers>`
+volunteers; you can read all about them over at the :doc:`list of committers
+</internals/committers>`
 
 Which sites use Django?
 -----------------------
@@ -146,7 +144,7 @@ philosophies 100%.
 Like we said: We're picky.
 
 We've documented our philosophies on the
-:ref:`design philosophies page <misc-design-philosophies>`.
+:doc:`design philosophies page </misc/design-philosophies>`.
 
 Is Django a content-management-system (CMS)?
 --------------------------------------------
diff --git a/docs/faq/help.txt b/docs/faq/help.txt
index 5d7faf6fec..d84b3f529f 100644
--- a/docs/faq/help.txt
+++ b/docs/faq/help.txt
@@ -1,5 +1,3 @@
-.. _faq-help:
-
 FAQ: Getting Help
 =================
 
diff --git a/docs/faq/index.txt b/docs/faq/index.txt
index d357a3ebb0..347cabaabc 100644
--- a/docs/faq/index.txt
+++ b/docs/faq/index.txt
@@ -1,5 +1,3 @@
-.. _faq-index:
-
 ==========
 Django FAQ
 ==========
diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index f20b2bc187..3fbcb3842d 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -1,5 +1,3 @@
-.. _faq-install:
-
 FAQ: Installation
 =================
 
@@ -7,9 +5,9 @@ How do I get started?
 ---------------------
 
     #. `Download the code`_.
-    #. Install Django (read the :ref:`installation guide <intro-install>`).
-    #. Walk through the :ref:`tutorial <intro-tutorial01>`.
-    #. Check out the rest of the :ref:`documentation <index>`, and `ask questions`_ if you
+    #. Install Django (read the :doc:`installation guide </intro/install>`).
+    #. Walk through the :doc:`tutorial </intro/tutorial01>`.
+    #. Check out the rest of the :doc:`documentation </index>`, and `ask questions`_ if you
        run into trouble.
 
 .. _`Download the code`: http://www.djangoproject.com/download/
@@ -19,14 +17,14 @@ What are Django's prerequisites?
 --------------------------------
 
 Django requires Python_, specifically any version of Python from 2.4
-through 2.6. No other Python libraries are required for basic Django
+through 2.7. No other Python libraries are required for basic Django
 usage.
 
 For a development environment -- if you just want to experiment with Django --
 you don't need to have a separate Web server installed; Django comes with its
 own lightweight development server. For a production environment, Django
 follows the WSGI_ spec, which means it can run on a variety of server
-platforms.  See :ref:`Deploying Django <howto-deployment-index>` for some
+platforms.  See :doc:`Deploying Django </howto/deployment/index>` for some
 popular alternatives.  Also, the `server arrangements wiki page`_ contains
 details for several deployment strategies.
 
@@ -46,7 +44,7 @@ Do I lose anything by using Python 2.4 versus newer Python versions, such as Pyt
 -----------------------------------------------------------------------------------------------
 
 Not in the core framework. Currently, Django itself officially supports any
-version of Python from 2.4 through 2.6, inclusive. However, newer versions of
+version of Python from 2.4 through 2.7, inclusive. However, newer versions of
 Python are often faster, have more features, and are better supported.
 Third-party applications for use with Django are, of course, free to set their
 own version requirements.
@@ -56,7 +54,7 @@ versions as part of a migration which will end with Django running on Python 3
 (see below for details).
 
 All else being equal, we recommend that you use the latest 2.x release
-(currently Python 2.6). This will let you take advantage of the numerous
+(currently Python 2.7). This will let you take advantage of the numerous
 improvements and optimizations to the Python language since version 2.4, and
 will help ease the process of dropping support for older Python versions on
 the road to Python 3.
diff --git a/docs/faq/models.txt b/docs/faq/models.txt
index 2732c0b8e1..f00d453d88 100644
--- a/docs/faq/models.txt
+++ b/docs/faq/models.txt
@@ -1,5 +1,3 @@
-.. _faq-models:
-
 FAQ: Databases and models
 =========================
 
@@ -30,7 +28,7 @@ backend, and not all backends provide a way to retrieve the SQL after quoting.
 
 .. versionadded:: 1.2
 
-If you are using :ref:`multiple databases<topics-db-multi-db>`, you can use the
+If you are using :doc:`multiple databases</topics/db/multi-db>`, you can use the
 same interface on each member of the ``connections`` dictionary::
 
     >>> from django.db import connections
@@ -39,7 +37,7 @@ same interface on each member of the ``connections`` dictionary::
 Can I use Django with a pre-existing database?
 ----------------------------------------------
 
-Yes. See :ref:`Integrating with a legacy database <howto-legacy-databases>`.
+Yes. See :doc:`Integrating with a legacy database </howto/legacy-databases>`.
 
 If I make changes to a model, how do I update the database?
 -----------------------------------------------------------
diff --git a/docs/faq/usage.txt b/docs/faq/usage.txt
index 6c3c518bb2..856b97c35c 100644
--- a/docs/faq/usage.txt
+++ b/docs/faq/usage.txt
@@ -1,5 +1,3 @@
-.. _faq-usage:
-
 FAQ: Using Django
 =================