=== modified file 'docs/api_stability.txt'
--- docs/api_stability.txt	2007-04-23 17:27:45 +0000
+++ docs/api_stability.txt	2007-04-23 17:32:25 +0000
@@ -100,14 +100,14 @@
      
 .. _caching: ../cache/
 .. _custom template tags and libraries: ../templates_python/
-.. _database lookup: ../db_api/
+.. _database lookup: ../db-api/
 .. _django-admin utility: ../django-admin/
 .. _fastcgi integration: ../fastcgi/
 .. _flatpages: ../flatpages/
 .. _generic views: ../generic_views/
 .. _internationalization: ../i18n/
 .. _legacy database integration: ../legacy_databases/
-.. _model definition: ../model_api/
+.. _model definition: ../model-api/
 .. _mod_python integration: ../modpython/
 .. _redirects: ../redirects/
 .. _request/response objects: ../request_response/

=== modified file 'docs/authentication.txt'
--- docs/authentication.txt	2007-03-05 14:57:18 +0000
+++ docs/authentication.txt	2007-04-23 17:32:41 +0000
@@ -144,7 +144,7 @@
       Raises ``django.contrib.auth.models.SiteProfileNotAvailable`` if the current site
       doesn't allow profiles.
 
-.. _Django model: ../model_api/
+.. _Django model: ../model-api/
 .. _DEFAULT_FROM_EMAIL: ../settings/#default-from-email
 
 Manager functions
@@ -757,7 +757,7 @@
 The only thing this does is create those extra permissions when you run
 ``syncdb``.
 
-.. _model Meta attribute: ../model_api/#meta-options
+.. _model Meta attribute: ../model-api/#meta-options
 
 API reference
 -------------

=== modified file 'docs/db-api.txt'
--- docs/db-api.txt	2007-03-20 18:16:54 +0000
+++ docs/db-api.txt	2007-04-23 17:32:56 +0000
@@ -6,7 +6,7 @@
 database-abstraction API that lets you create, retrieve, update and delete
 objects. This document explains that API.
 
-.. _`data models`: ../model_api/
+.. _`data models`: ../model-api/
 
 Throughout this reference, we'll refer to the following models, which comprise
 a weblog application::
@@ -85,7 +85,7 @@
 unless you explicitly specify ``primary_key=True`` on a field. See the
 `AutoField documentation`_.)
 
-.. _AutoField documentation: ../model_api/#autofield
+.. _AutoField documentation: ../model-api/#autofield
 
 Explicitly specifying auto-primary-key values
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1801,4 +1801,4 @@
 programming languages or database frameworks; there's nothing Django-specific
 about your database.
 
-.. _Executing custom SQL: ../model_api/#executing-custom-sql
+.. _Executing custom SQL: ../model-api/#executing-custom-sql

=== modified file 'docs/faq.txt'
--- docs/faq.txt	2007-04-23 17:27:45 +0000
+++ docs/faq.txt	2007-04-23 17:33:01 +0000
@@ -512,7 +512,7 @@
 As explained in the `SQL initial data file`_ documentation, this SQL file can
 contain arbitrary SQL, so you can make any sorts of changes you need to make.
 
-.. _SQL initial data file: ../model_api/#providing-initial-sql-data
+.. _SQL initial data file: ../model-api/#providing-initial-sql-data
 
 Why is Django leaking memory?
 -----------------------------

=== modified file 'docs/flatpages.txt'
--- docs/flatpages.txt	2007-02-13 16:11:28 +0000
+++ docs/flatpages.txt	2007-04-23 17:33:06 +0000
@@ -84,9 +84,9 @@
 `django/contrib/flatpages/models.py`_. You can access flatpage objects via the
 `Django database API`_.
 
-.. _Django model: ../model_api/
+.. _Django model: ../model-api/
 .. _django/contrib/flatpages/models.py: http://code.djangoproject.com/browser/django/trunk/django/contrib/flatpages/models.py
-.. _Django database API: ../db_api/
+.. _Django database API: ../db-api/
 
 Flatpage templates
 ==================

=== modified file 'docs/forms.txt'
--- docs/forms.txt	2007-04-02 14:52:36 +0000
+++ docs/forms.txt	2007-04-23 17:33:11 +0000
@@ -691,5 +691,5 @@
     document for more details).
 
 .. _`generic views`: ../generic_views/
-.. _`models API`: ../model_api/
+.. _`models API`: ../model-api/
 .. _settings: ../settings/

=== modified file 'docs/generic_views.txt'
--- docs/generic_views.txt	2007-04-23 17:27:45 +0000
+++ docs/generic_views.txt	2007-04-23 17:31:31 +0000
@@ -71,7 +71,7 @@
 ``extra_context`` that is always fresh you need to wrap it in a function or
 lambda that returns the QuerySet.
 
-.. _database API docs: ../db_api/
+.. _database API docs: ../db-api/
 
 "Simple" generic views
 ======================

=== modified file 'docs/i18n.txt'
--- docs/i18n.txt	2007-03-20 18:16:54 +0000
+++ docs/i18n.txt	2007-04-23 17:33:18 +0000
@@ -175,7 +175,7 @@
             verbose_name = _('my thing')
             verbose_name_plural = _('mythings')
 
-.. _Django models: ../model_api/
+.. _Django models: ../model-api/
 
 Pluralization
 ~~~~~~~~~~~~~

=== modified file 'docs/redirects.txt'
--- docs/redirects.txt	2007-02-13 16:11:28 +0000
+++ docs/redirects.txt	2007-04-23 17:33:22 +0000
@@ -66,6 +66,6 @@
 `django/contrib/redirects/models.py`_. You can access redirect
 objects via the `Django database API`_.
 
-.. _Django model: ../model_api/
+.. _Django model: ../model-api/
 .. _django/contrib/redirects/models.py: http://code.djangoproject.com/browser/django/trunk/django/contrib/redirects/models.py
-.. _Django database API: ../db_api/
+.. _Django database API: ../db-api/

=== modified file 'docs/serialization.txt'
--- docs/serialization.txt	2007-03-29 21:02:40 +0000
+++ docs/serialization.txt	2007-04-23 17:31:45 +0000
@@ -27,7 +27,7 @@
 (Actually, the second argument can be any iterator that yields Django objects,
 but it'll almost always be a QuerySet).
 
-.. _QuerySet: ../db_api/#retrieving-objects
+.. _QuerySet: ../db-api/#retrieving-objects
 
 You can also use a serializer object directly::
 

=== modified file 'docs/settings.txt'
--- docs/settings.txt	2007-04-23 17:27:45 +0000
+++ docs/settings.txt	2007-04-23 17:33:27 +0000
@@ -874,7 +874,7 @@
 The string to use as the ``User-Agent`` header when checking to see if URLs
 exist (see the ``verify_exists`` option on URLField_).
 
-.. _URLField: ../model_api/#urlfield
+.. _URLField: ../model-api/#urlfield
 
 USE_ETAGS
 ---------

=== modified file 'docs/sites.txt'
--- docs/sites.txt	2007-02-13 16:11:28 +0000
+++ docs/sites.txt	2007-04-23 17:33:46 +0000
@@ -276,8 +276,8 @@
 ones), put ``objects = models.Manager()`` in your model, before you define
 ``CurrentSiteManager``.
 
-.. _manager: ../model_api/#managers
-.. _manager documentation: ../model_api/#managers
+.. _manager: ../model-api/#managers
+.. _manager documentation: ../model-api/#managers
 
 How Django uses the sites framework
 ===================================

=== modified file 'docs/syndication_feeds.txt'
--- docs/syndication_feeds.txt	2007-04-09 21:05:36 +0000
+++ docs/syndication_feeds.txt	2007-04-23 17:31:51 +0000
@@ -159,7 +159,7 @@
              {{ obj.description }}
 
 .. _chicagocrime.org: http://www.chicagocrime.org/
-.. _object-relational mapper: ../db_api/
+.. _object-relational mapper: ../db-api/
 .. _Django templates: ../templates/
 
 A complex example

=== modified file 'docs/tutorial01.txt'
--- docs/tutorial01.txt	2007-04-23 17:27:45 +0000
+++ docs/tutorial01.txt	2007-04-23 17:31:56 +0000
@@ -577,5 +577,5 @@
 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/
+.. _Database API reference: ../db-api/
 .. _part 2 of this tutorial: ../tutorial02/

=== modified file 'docs/tutorial04.txt'
--- docs/tutorial04.txt	2007-04-23 17:27:45 +0000
+++ docs/tutorial04.txt	2007-04-23 17:32:02 +0000
@@ -219,7 +219,7 @@
     If you'd like to know more about how that works, The Django database API
     documentation `explains the lazy nature of QuerySet objects`_.
 
-.. _explains the lazy nature of QuerySet objects: ../db_api/#querysets-are-lazy
+.. _explains the lazy nature of QuerySet objects: ../db-api/#querysets-are-lazy
 
 In previous parts of the tutorial, the templates have been provided with a context
 that contains the ``poll`` and ``latest_poll_list`` context variables. However,