From b54de860108c89ae9b3428b696d377b202f091d6 Mon Sep 17 00:00:00 2001 From: Gary Wilson Jr Date: Sat, 4 Aug 2007 03:19:14 +0000 Subject: [PATCH] Fixed #5078 -- Fixed several broken links to the syndication documentation. git-svn-id: http://code.djangoproject.com/svn/django/trunk@5796 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/add_ons.txt | 2 +- docs/api_stability.txt | 2 +- docs/model-api.txt | 4 +++- docs/overview.txt | 4 +++- docs/sitemaps.txt | 2 +- docs/sites.txt | 2 +- docs/url_dispatch.txt | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/add_ons.txt b/docs/add_ons.txt index ffc4f7420f..8682208970 100644 --- a/docs/add_ons.txt +++ b/docs/add_ons.txt @@ -214,7 +214,7 @@ A framework for generating syndication feeds, in RSS and Atom, quite easily. See the `syndication documentation`_. -.. _syndication documentation: ../syndication/ +.. _syndication documentation: ../syndication_feeds/ Other add-ons ============= diff --git a/docs/api_stability.txt b/docs/api_stability.txt index cfaffeac6b..700486fe25 100644 --- a/docs/api_stability.txt +++ b/docs/api_stability.txt @@ -114,7 +114,7 @@ change: .. _sending email: ../email/ .. _sessions: ../sessions/ .. _settings: ../settings/ -.. _syndication: ../syndication/ +.. _syndication: ../syndication_feeds/ .. _template language: ../templates/ .. _transactions: ../transactions/ .. _url dispatch: ../url_dispatch/ diff --git a/docs/model-api.txt b/docs/model-api.txt index 6a706c57cb..3509fa4ba0 100644 --- a/docs/model-api.txt +++ b/docs/model-api.txt @@ -1942,10 +1942,12 @@ Django uses this in its admin interface. If an object defines link that will jump you directly to the object's public view, according to ``get_absolute_url()``. -Also, a couple of other bits of Django, such as the syndication-feed framework, +Also, a couple of other bits of Django, such as the `syndication feed framework`_, use ``get_absolute_url()`` as a convenience to reward people who've defined the method. +.. syndication feed framework: ../syndication_feeds/ + It's good practice to use ``get_absolute_url()`` in templates, instead of hard-coding your objects' URLs. For example, this template code is bad:: diff --git a/docs/overview.txt b/docs/overview.txt index 46211432cb..e722ac8790 100644 --- a/docs/overview.txt +++ b/docs/overview.txt @@ -288,11 +288,13 @@ This has been only a quick overview of Django's functionality. Some more useful features: * A caching framework that integrates with memcached or other backends. - * A syndication framework that makes creating RSS and Atom feeds as easy as + * A `syndication framework`_ 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. +.. _syndication framework: ../syndication_feeds/ + The next obvious steps are for you to `download Django`_, read `the tutorial`_ and join `the community`_. Thanks for your interest! diff --git a/docs/sitemaps.txt b/docs/sitemaps.txt index 550f448de1..1d4fba2626 100644 --- a/docs/sitemaps.txt +++ b/docs/sitemaps.txt @@ -21,7 +21,7 @@ you express this information in Python code. It works much like Django's `syndication framework`_. To create a sitemap, just write a ``Sitemap`` class and point to it in your URLconf_. -.. _syndication framework: ../syndication/ +.. _syndication framework: ../syndication_feeds/ .. _URLconf: ../url_dispatch/ Installation diff --git a/docs/sites.txt b/docs/sites.txt index e9982f745a..8a295f81c1 100644 --- a/docs/sites.txt +++ b/docs/sites.txt @@ -318,7 +318,7 @@ Here's how Django uses the sites framework: .. _redirects framework: ../redirects/ .. _flatpages framework: ../flatpages/ -.. _syndication framework: ../syndication/ +.. _syndication framework: ../syndication_feeds/ .. _authentication framework: ../authentication/ ``RequestSite`` objects diff --git a/docs/url_dispatch.txt b/docs/url_dispatch.txt index 716686ff50..f9723a6a89 100644 --- a/docs/url_dispatch.txt +++ b/docs/url_dispatch.txt @@ -404,7 +404,7 @@ This technique is used in `generic views`_ and in the `syndication framework`_ to pass metadata and options to views. .. _generic views: ../generic_views/ -.. _syndication framework: ../syndication/ +.. _syndication framework: ../syndication_feeds/ .. admonition:: Dealing with conflicts