[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

1 files changed, 12 insertions, 14 deletions

diff --git a/docs/intro/overview.txt b/docs/intro/overview.txt
index 594c9fe582..0c47e59e14 100644
--- a/docs/intro/overview.txt
+++ b/docs/intro/overview.txt
@@ -1,5 +1,3 @@
-.. _intro-overview:
-
 ==================
 Django at a glance
 ==================
@@ -11,8 +9,8 @@ overview of how to write a database-driven Web app with Django.
 The goal of this document is to give you enough technical specifics to
 understand how Django works, but this isn't intended to be a tutorial or
 reference -- but we've got both! When you're ready to start a project, you can
-:ref:`start with the tutorial <intro-tutorial01>` or :ref:`dive right into more
-detailed documentation <topics-index>`.
+:doc:`start with the tutorial </intro/tutorial01>` or :doc:`dive right into more
+detailed documentation </topics/index>`.
 
 Design your model
 =================
@@ -21,7 +19,7 @@ Although you can use Django without a database, it comes with an
 object-relational mapper in which you describe your database layout in Python
 code.
 
-The :ref:`data-model syntax <topics-db-models>` offers many rich ways of
+The :doc:`data-model syntax </topics/db/models>` offers many rich ways of
 representing your models -- so far, it's been solving two years' worth of
 database-schema problems. Here's a quick example::
 
@@ -56,7 +54,7 @@ tables in your database for whichever tables don't already exist.
 Enjoy the free API
 ==================
 
-With that, you've got a free, and rich, :ref:`Python API <topics-db-queries>` to
+With that, you've got a free, and rich, :doc:`Python API </topics/db/queries>` to
 access your data. The API is created on the fly, no code generation necessary::
 
     >>> from mysite.models import Reporter, Article
@@ -131,7 +129,7 @@ A dynamic admin interface: it's not just scaffolding -- it's the whole house
 ============================================================================
 
 Once your models are defined, Django can automatically create a professional,
-production ready :ref:`administrative interface <ref-contrib-admin>` -- a Web
+production ready :doc:`administrative interface </ref/contrib/admin/index>` -- a Web
 site that lets authenticated users add, change and delete objects. It's as easy
 as registering your model in the admin site::
 
@@ -168,8 +166,8 @@ A clean, elegant URL scheme is an important detail in a high-quality Web
 application. Django encourages beautiful URL design and doesn't put any cruft
 in URLs, like ``.php`` or ``.asp``.
 
-To design URLs for an app, you create a Python module called a :ref:`URLconf
-<topics-http-urls>`. A table of contents for your app, it contains a simple mapping
+To design URLs for an app, you create a Python module called a :doc:`URLconf
+</topics/http/urls>`. A table of contents for your app, it contains a simple mapping
 between URL patterns and Python callback functions. URLconfs also serve to
 decouple URLs from Python code.
 
@@ -216,7 +214,7 @@ and renders the template with the retrieved data. Here's an example view for
         a_list = Article.objects.filter(pub_date__year=year)
         return render_to_response('news/year_archive.html', {'year': year, 'article_list': a_list})
 
-This example uses Django's :ref:`template system <topics-templates>`, which has
+This example uses Django's :doc:`template system </topics/templates>`, which has
 several powerful features but strives to stay simple enough for non-programmers
 to use.
 
@@ -307,17 +305,17 @@ This is just the surface
 This has been only a quick overview of Django's functionality. Some more useful
 features:
 
-    * A :ref:`caching framework <topics-cache>` that integrates with memcached
+    * A :doc:`caching framework </topics/cache>` that integrates with memcached
       or other backends.
 
-    * A :ref:`syndication framework <ref-contrib-syndication>` that makes
+    * A :doc:`syndication framework </ref/contrib/syndication>` that makes
       creating RSS and Atom feeds as easy as writing a small Python class.
 
     * More sexy automatically-generated admin features -- this overview barely
       scratched the surface.
 
-The next obvious steps are for you to `download Django`_, read :ref:`the
-tutorial <intro-tutorial01>` and join `the community`_. Thanks for your
+The next obvious steps are for you to `download Django`_, read :doc:`the
+tutorial </intro/tutorial01>` and join `the community`_. Thanks for your
 interest!
 
 .. _download Django: http://www.djangoproject.com/download/