diff --git a/docs/intro/whatsnext.txt b/docs/intro/whatsnext.txt
index 012bfe3..3c0c86e 100644
a
|
b
|
On the Web
|
110 | 110 | ---------- |
111 | 111 | |
112 | 112 | The most recent version of the Django documentation lives at |
113 | | http://www.djangoproject.com/documentation/ . These HTML pages are generated |
| 113 | http://docs.djangoproject.com/ . These HTML pages are generated |
114 | 114 | automatically from the text files in source control. That means they reflect the |
115 | 115 | "latest and greatest" in Django -- they include the very latest corrections and |
116 | 116 | additions, and they discuss the latest Django features, which may only be |
… |
… |
We follow this policy:
|
232 | 232 | * The `main documentation Web page`_ includes links to documentation for |
233 | 233 | all previous versions. |
234 | 234 | |
235 | | .. _main documentation Web page: http://www.djangoproject.com/documentation/ |
| 235 | .. _main documentation Web page: http://docs.djangoproject.com/ |
diff --git a/docs/man/daily_cleanup.1 b/docs/man/daily_cleanup.1
index 9186dd6..444d4d0 100644
a
|
b
|
It should be in Python-import form, e.g. "myproject.settings".
|
22 | 22 | .SH "SEE ALSO" |
23 | 23 | The sessions documentation: |
24 | 24 | .sp |
25 | | .I http://www.djangoproject.com/documentation/sessions/ |
| 25 | .I http://docs.djangoproject.com/en/dev/topics/http/sessions/ |
26 | 26 | |
27 | 27 | .SH "AUTHORS/CREDITS" |
28 | 28 | Originally developed at World Online in Lawrence, Kansas, USA. Refer to the |
diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1
index 7f65fd0..fad66a9 100644
a
|
b
|
It should be in Python-import form, e.g. "myproject.settings".
|
168 | 168 | Full descriptions of all these options, with examples, as well as documentation |
169 | 169 | for the rest of the Django framework, can be found on the Django site: |
170 | 170 | .sp |
171 | | .I http://www.djangoproject.com/documentation/ |
| 171 | .I http://docs.djangoproject.com/ |
172 | 172 | .sp |
173 | 173 | or in the distributed documentation. |
174 | 174 | .SH "AUTHORS/CREDITS" |
diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt
index e22660a..fd30b81 100644
a
|
b
|
The basics:
|
22 | 22 | |
23 | 23 | .. seealso:: |
24 | 24 | |
25 | | A companion to this document is the `official repository of model |
26 | | examples`_. (In the Django source distribution, these examples are in the |
| 25 | A companion to this document is the official repository of model |
| 26 | examples. (In the Django source distribution, these examples are in the |
27 | 27 | ``tests/modeltests`` directory.) |
28 | 28 | |
29 | | .. _official repository of model examples: http://www.djangoproject.com/documentation/models/ |
30 | | |
31 | 29 | Quick example |
32 | 30 | ============= |
33 | 31 | |
… |
… |
whatever you want. For example::
|
298 | 296 | company_that_makes_it = models.ForeignKey(Manufacturer) |
299 | 297 | # ... |
300 | 298 | |
301 | | .. seealso:: |
302 | | |
303 | | See the `Many-to-one relationship model example`_ for a full example. |
304 | | |
305 | | .. _Many-to-one relationship model example: http://www.djangoproject.com/documentation/models/many_to_one/ |
306 | | |
307 | 299 | :class:`~django.db.models.ForeignKey` fields also accept a number of extra |
308 | 300 | arguments which are explained in :ref:`the model field reference |
309 | 301 | <foreign-key-arguments>`. These options help define how the relationship should |
… |
… |
because it's more natural to think about a ``Pizza`` having toppings than a
|
353 | 345 | topping being on multiple pizzas. The way it's set up above, the ``Pizza`` admin |
354 | 346 | form would let users select the toppings. |
355 | 347 | |
356 | | .. seealso:: |
357 | | |
358 | | See the `Many-to-many relationship model example`_ for a full example. |
359 | | |
360 | | .. _Many-to-many relationship model example: http://www.djangoproject.com/documentation/models/many_to_many/ |
361 | | |
362 | 348 | :class:`~django.db.models.ManyToManyField` fields also accept a number of extra |
363 | 349 | arguments which are explained in :ref:`the model field reference |
364 | 350 | <manytomany-arguments>`. These options help define how the relationship should |