Skip to content

Commit 4d7f9c9

Browse files
committed
Update internal link for sphinx 1.3.x. refs: #1 #2
1 parent db8fdc5 commit 4d7f9c9

40 files changed

+297
-627
lines changed

docs/add_ons.txt

+7-21
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,14 @@ admin
1212
=====
1313

1414
The automatic Django administrative interface. For more information, see
15-
`Tutorial 2`_.
16-
17-
.. _Tutorial 2: http://www.djangoproject.com/documentation/tutorial2/
15+
:doc:`Tutorial 2 <tutorial02>`.
1816

1917
auth
2018
====
2119

2220
Django's authentication framework.
2321

24-
See the `authentication documentation`_.
25-
26-
.. _authentication documentation: http://www.djangoproject.com/documentation/authentication/
22+
See the :doc:`authentication documentation <authentication>`.
2723

2824
comments
2925
========
@@ -41,9 +37,7 @@ csrf
4137

4238
A middleware for preventing Cross Site Request Forgeries
4339

44-
See the `csrf documentation`_.
45-
46-
.. _csrf documentation: http://www.djangoproject.com/documentation/csrf/
40+
See the :doc:`csrf documentation <csrf>`.
4741

4842
humanize
4943
========
@@ -115,9 +109,7 @@ flatpages
115109

116110
A framework for managing simple "flat" HTML content in a database.
117111

118-
See the `flatpages documentation`_.
119-
120-
.. _flatpages documentation: http://www.djangoproject.com/documentation/flatpages/
112+
See the :doc:`flatpages documentation <flatpages>`.
121113

122114
markup
123115
======
@@ -135,9 +127,7 @@ redirects
135127

136128
A framework for managing redirects.
137129

138-
See the `redirects documentation`_.
139-
140-
.. _redirects documentation: http://www.djangoproject.com/documentation/redirects/
130+
See the :doc:`redirects documentation <redirects>`.
141131

142132
sites
143133
=====
@@ -146,18 +136,14 @@ A light framework that lets you operate multiple Web sites off of the same
146136
database and Django installation. It gives you hooks for associating objects to
147137
one or more sites.
148138

149-
See the `sites documentation`_.
150-
151-
.. _sites documentation: http://www.djangoproject.com/documentation/sites/
139+
See the :doc:`sites documentation <sites>`.
152140

153141
syndication
154142
===========
155143

156144
A framework for generating syndication feeds, in RSS and Atom, quite easily.
157145

158-
See the `syndication documentation`_.
159-
160-
.. _syndication documentation: http://www.djangoproject.com/documentation/syndication/
146+
See the :doc:`syndication documentation <syndication>`.
161147

162148
Other add-ons
163149
=============

docs/apache_auth.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Authenticating against Django's user database from Apache
44

55
Since keeping multiple authentication databases in sync is a common problem when
66
dealing with Apache, you can configuring Apache to authenticate against Django's
7-
`authentication system`_ directly. For example, you could:
7+
:doc:`authentication system <authentication>` directly. For example, you could:
88

99
* Serve media files directly from Apache only to authenticated users.
1010

@@ -49,7 +49,7 @@ location to users marked as staff members. You can use a set of
4949
Defaults to ``off``.
5050

5151
``DjangoPermissionName`` The name of a permission to require for
52-
access. See `custom permissions`_ for
52+
access. See :doc:`custom permissions <authentication>` for
5353
more information.
5454

5555
By default no specific permission will be
@@ -65,7 +65,5 @@ are equivalent::
6565
SetEnv DJANGO_SETTINGS_MODULE mysite.settings
6666
PythonOption DJANGO_SETTINGS_MODULE mysite.settings
6767

68-
.. _authentication system: http://www.djangoproject.com/documentation/authentication/
6968
.. _Subversion: http://subversion.tigris.org/
7069
.. _mod_dav: http://httpd.apache.org/docs/2.0/mod/mod_dav.html
71-
.. _custom permissions: http://www.djangoproject.com/documentation/authentication/#custom-permissions

docs/api_stability.txt

+46-71
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ In this context, stable means:
1414
- All the public APIs -- everything documented in the linked documents, and
1515
all methods that don't begin with an underscore -- will not be moved or
1616
renamed without providing backwards-compatible aliases.
17-
17+
1818
- If new features are added to these APIs -- which is quite possible --
1919
they will not break or change the meaning of existing methods. In other
2020
words, "stable" does not (necessarily) mean "complete."
21-
21+
2222
- If, for some reason, an API declared stable must be removed or replaced, it
2323
will be declared deprecated but will remain in the API until at least
2424
version 1.1. Warnings will be issued when the deprecated method is
2525
called.
26-
26+
2727
- We'll only break backwards compatibility of these APIs if a bug or
2828
security hole makes it completely unavoidable.
2929

@@ -32,48 +32,48 @@ Stable APIs
3232

3333
These APIs are stable:
3434

35-
- `Caching`_.
36-
37-
- `Custom template tags and libraries`_ (with the possible exception for a
35+
- :doc:`Caching <cache>`.
36+
37+
- :doc:`Custom template tags and libraries <templates_python>` (with the possible exception for a
3838
small change in the way templates are registered and loaded).
39-
40-
- `Database lookup`_ (with the exception of validation; see below).
41-
42-
- `django-admin utility`_.
43-
44-
- `FastCGI integration`_.
45-
46-
- `Flatpages`_.
47-
48-
- `Generic views`_.
49-
50-
- `Internationalization`_.
51-
52-
- `Legacy database integration`_.
53-
54-
- `Model definition`_ (with the exception of generic relations; see below).
55-
56-
- `mod_python integration`_.
57-
58-
- `Redirects`_.
59-
60-
- `Request/response objects`_.
61-
62-
- `Sending email`_.
63-
64-
- `Sessions`_.
65-
66-
- `Settings`_.
67-
68-
- `Syndication`_.
69-
70-
- `Template language`_ (with the exception of some possible disambiguation
39+
40+
- :doc:`Database lookup <db-api>` (with the exception of validation; see below).
41+
42+
- :doc:`django-admin utility <django-admin>`.
43+
44+
- :doc:`FastCGI integration <fastcgi>`.
45+
46+
- :doc:`Flatpages <flatpages>`.
47+
48+
- :doc:`Generic views <generic_views>`.
49+
50+
- :doc:`Internationalization <i18n>`.
51+
52+
- :doc:`Legacy database integration <legacy_databases>`.
53+
54+
- :doc:`Model definition <model-api>` (with the exception of generic relations; see below).
55+
56+
- :doc:`mod_python integration <modpython>`.
57+
58+
- :doc:`Redirects <redirects>`.
59+
60+
- :doc:`Request/response objects <request_response>`.
61+
62+
- :doc:`Sending email <email>`.
63+
64+
- :doc:`Sessions <sessions>`.
65+
66+
- :doc:`Settings <settings>`.
67+
68+
- :doc:`Syndication <syndication_feeds>`.
69+
70+
- :doc:`Template language <templates>` (with the exception of some possible disambiguation
7171
of how tag arguments are passed to tags and filters).
72-
73-
- `Transactions`_.
74-
75-
- `URL dispatch`_.
76-
72+
73+
- :doc:`Transactions <transactions>`.
74+
75+
- :doc:`URL dispatch <url_dispatch>`.
76+
7777
You'll notice that this list comprises the bulk of Django's APIs. That's right
7878
-- most of the changes planned between now and Django 1.0 are either under the
7979
hood, feature additions, or changes to a few select bits. A good estimate is
@@ -82,12 +82,12 @@ that 90% of Django can be considered forwards-compatible at this point.
8282
That said, these APIs should *not* be considered stable, and are likely to
8383
change:
8484

85-
- `Forms and validation`_ will most likely be compeltely rewritten to
85+
- :doc:`Forms and validation <forms>` will most likely be compeltely rewritten to
8686
deemphasize Manipulators in favor of validation-aware models.
8787

88-
- `Serialization`_ is under heavy development; changes are likely.
88+
- :doc:`Serialization <serialization>` is under heavy development; changes are likely.
8989

90-
- The `authentication`_ framework is changing to be far more flexible, and
90+
- The :doc:`authentication <authentication>` framework is changing to be far more flexible, and
9191
API changes may be necessary.
9292

9393
- Generic relations will most likely be moved out of core and into the
@@ -96,28 +96,3 @@ change:
9696

9797
- The comments framework, which is yet undocumented, will likely get a complete
9898
rewrite before Django 1.0. Even if the change isn't quite that drastic,
99-
there will at least be moderate changes.
100-
101-
.. _caching: http://www.djangoproject.com/documentation/cache/
102-
.. _custom template tags and libraries: http://www.djangoproject.com/documentation/templates_python/
103-
.. _database lookup: http://www.djangoproject.com/documentation/db_api/
104-
.. _django-admin utility: http://www.djangoproject.com/documentation/django_admin/
105-
.. _fastcgi integration: http://www.djangoproject.com/documentation/fastcgi/
106-
.. _flatpages: http://www.djangoproject.com/documentation/flatpages/
107-
.. _generic views: http://www.djangoproject.com/documentation/generic_views/
108-
.. _internationalization: http://www.djangoproject.com/documentation/i18n/
109-
.. _legacy database integration: http://www.djangoproject.com/documentation/legacy_databases/
110-
.. _model definition: http://www.djangoproject.com/documentation/model_api/
111-
.. _mod_python integration: http://www.djangoproject.com/documentation/modpython/
112-
.. _redirects: http://www.djangoproject.com/documentation/redirects/
113-
.. _request/response objects: http://www.djangoproject.com/documentation/request_response/
114-
.. _sending email: http://www.djangoproject.com/documentation/email/
115-
.. _sessions: http://www.djangoproject.com/documentation/sessions/
116-
.. _settings: http://www.djangoproject.com/documentation/settings/
117-
.. _syndication: http://www.djangoproject.com/documentation/syndication/
118-
.. _template language: http://www.djangoproject.com/documentation/templates/
119-
.. _transactions: http://www.djangoproject.com/documentation/transactions/
120-
.. _url dispatch: http://www.djangoproject.com/documentation/url_dispatch/
121-
.. _forms and validation: http://www.djangoproject.com/documentation/forms/
122-
.. _serialization: http://www.djangoproject.com/documentation/serialization/
123-
.. _authentication: http://www.djangoproject.com/documentation/authentication/

0 commit comments

Comments
 (0)