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

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

4 files changed, 9 insertions, 17 deletions

diff --git a/docs/topics/i18n/deployment.txt b/docs/topics/i18n/deployment.txt
index 1a4f5fa4d5..f06227e0f6 100644
--- a/docs/topics/i18n/deployment.txt
+++ b/docs/topics/i18n/deployment.txt
@@ -1,5 +1,3 @@
-.. _topics-i18n-deployment:
-
 ==========================
 Deployment of translations
 ==========================
@@ -72,8 +70,8 @@ For example, your ``MIDDLEWARE_CLASSES`` might look like this::
        'django.middleware.common.CommonMiddleware',
     )
 
-(For more on middleware, see the :ref:`middleware documentation
-<topics-http-middleware>`.)
+(For more on middleware, see the :doc:`middleware documentation
+</topics/http/middleware>`.)
 
 ``LocaleMiddleware`` tries to determine the user's language preference by
 following this algorithm:
diff --git a/docs/topics/i18n/index.txt b/docs/topics/i18n/index.txt
index e39a75067a..9c25192504 100644
--- a/docs/topics/i18n/index.txt
+++ b/docs/topics/i18n/index.txt
@@ -1,5 +1,3 @@
-.. _topics-i18n:
-
 =====================================
 Internationalization and localization
 =====================================
@@ -23,10 +21,10 @@ associated with each of these tasks (although it's perfectly normal if you
 find yourself performing more than one of these roles):
 
     * For application authors wishing to make sure their Django apps can be
-      used in different locales: :ref:`topics-i18n-internationalization`.
-    * For translators wanting to translate Django apps: :ref:`topics-i18n-localization`.
+      used in different locales: :doc:`/topics/i18n/internationalization`.
+    * For translators wanting to translate Django apps: :doc:`/topics/i18n/localization`.
     * For system administrators/final users setting up internationalized apps or
-      developers integrating third party apps: :ref:`topics-i18n-deployment`.
+      developers integrating third party apps: :doc:`/topics/i18n/deployment`.
 
 .. toctree::
    :hidden:
diff --git a/docs/topics/i18n/internationalization.txt b/docs/topics/i18n/internationalization.txt
index 7ae8d18791..879c7739fb 100644
--- a/docs/topics/i18n/internationalization.txt
+++ b/docs/topics/i18n/internationalization.txt
@@ -1,5 +1,3 @@
-.. _topics-i18n-internationalization:
-
 ====================
 Internationalization
 ====================
@@ -242,7 +240,7 @@ If you don't like the verbose name ``ugettext_lazy``, you can just alias it as
     class MyThing(models.Model):
         name = models.CharField(help_text=_('This is the help text'))
 
-Always use lazy translations in :ref:`Django models <topics-db-models>`.
+Always use lazy translations in :doc:`Django models </topics/db/models>`.
 Field names and table names should be marked for translation (otherwise, they
 won't be translated in the admin interface). This means writing explicit
 ``verbose_name`` and ``verbose_name_plural`` options in the ``Meta`` class,
@@ -332,7 +330,7 @@ Specifying translation strings: In template code
 
 .. highlightlang:: html+django
 
-Translations in :ref:`Django templates <topics-templates>` uses two template
+Translations in :doc:`Django templates </topics/templates>` uses two template
 tags and a slightly different syntax than in Python code. To give your template
 access to these tags, put ``{% load i18n %}`` toward the top of your template.
 
@@ -569,7 +567,7 @@ function supports both positional and named interpolation:
       object or associative array. For example::
 
         d = {
-            count: 10
+            count: 10,
             total: 50
         };
 
diff --git a/docs/topics/i18n/localization.txt b/docs/topics/i18n/localization.txt
index ff8715571a..8ba1e1ecdc 100644
--- a/docs/topics/i18n/localization.txt
+++ b/docs/topics/i18n/localization.txt
@@ -1,5 +1,3 @@
-.. _topics-i18n-localization:
-
 ============
 Localization
 ============
@@ -12,7 +10,7 @@ files`_ and `locale aware date, time and numbers input/output in forms`_
 
 .. seealso::
 
-    The :ref:`howto-i18n` document included with the Django HOW-TO documents collection.
+    The :doc:`/howto/i18n` document included with the Django HOW-TO documents collection.
 
 .. _how-to-create-language-files: