Commit 7f2b3605 authored by Gabriel Hurley's avatar Gabriel Hurley
Browse files

Fixed #10904 -- Corrected inappropriate usage of the term "absolute URL"... 

Fixed #10904 -- Corrected inappropriate usage of the term "absolute URL" throughout the docs. Replaced with the (RFC 2396-compliant) terms "absolute path reference" or "absolute path" as appropriate for the context. Thanks to sharan666 for the report, and Malcolm, Chris, and dwillis for their work in supplying a solution and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 1a878f30

docs/faq/usage.txt

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ Using a :class:`~django.db.models.FileField` or an 
       (relative to :setting:`MEDIA_ROOT`). You'll most likely want to use the

       convenience :attr:`~django.core.files.File.url` attribute provided by

       Django. For example, if your :class:`~django.db.models.ImageField` is

       called ``mug_shot``, you can get the absolute URL to your image in a

       called ``mug_shot``, you can get the absolute path to your image in a

       template with ``{{ object.mug_shot.url }}``.



How do I make a variable available to all my templates?

docs/intro/tutorial03.txt

+2 −2
Original line number Diff line number Diff line
@@ -538,9 +538,9 @@ this:: 
The idea behind :func:`~django.conf.urls.defaults.include` and URLconf

decoupling is to make it easy to plug-and-play URLs. Now that polls are in their

own URLconf, they can be placed under "/polls/", or under "/fun_polls/", or

under "/content/polls/", or any other URL root, and the app will still work.

under "/content/polls/", or any other path root, and the app will still work.



All the poll app cares about is its relative URLs, not its absolute URLs.

All the poll app cares about is its relative path, not its absolute path.



When you're comfortable with writing views, read :doc:`part 4 of this tutorial

</intro/tutorial04>` to learn about simple form processing and generic views.

docs/ref/contrib/sitemaps.txt

+10 −9
Original line number Diff line number Diff line
@@ -143,21 +143,22 @@ Sitemap class reference 


        **Optional.** Either a method or attribute.



        If it's a method, it should return the absolute URL for a given object as

        returned by :attr:`~Sitemap.items()`.

        If it's a method, it should return the absolute path for a given object

        as returned by :attr:`~Sitemap.items()`.



        If it's an attribute, its value should be a string representing an absolute URL

        to use for *every* object returned by :attr:`~Sitemap.items()`.

        If it's an attribute, its value should be a string representing an

        absolute path to use for *every* object returned by

        :attr:`~Sitemap.items()`.



        In both cases, "absolute URL" means a URL that doesn't include the protocol or

        domain. Examples:

        In both cases, "absolute path" means a URL that doesn't include the

        protocol or domain. Examples:



            * Good: :file:`'/foo/bar/'`

            * Bad: :file:`'example.com/foo/bar/'`

            * Bad: :file:`'http://example.com/foo/bar/'`



        If :attr:`~Sitemap.location` isn't provided, the framework will call the

        ``get_absolute_url()`` method on each object as returned by

        If :attr:`~Sitemap.location` isn't provided, the framework will call

        the ``get_absolute_url()`` method on each object as returned by

        :attr:`~Sitemap.items()`.



    .. attribute:: Sitemap.lastmod
@@ -300,7 +301,7 @@ that: :func:`django.contrib.sitemaps.ping_google()`. 
.. function:: ping_google



    :func:`ping_google` takes an optional argument, :data:`sitemap_url`,

    which should be the absolute URL of your site's sitemap (e.g.,

    which should be the absolute path to your site's sitemap (e.g.,

    :file:`'/sitemap.xml'`). If this argument isn't provided,

    :func:`ping_google` will attempt to figure out your

    sitemap by performing a reverse looking in your URLconf.

docs/ref/contrib/syndication.txt

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ comes directly from your :setting:`LANGUAGE_CODE` setting. 
URLs

----



The :attr:`link` method/attribute can return either an absolute URL (e.g.

The :attr:`link` method/attribute can return either an absolute path (e.g.

:file:`"/blog/"`) or a URL with the fully-qualified domain and protocol (e.g.

``"http://www.example.com/blog/"``). If :attr:`link` doesn't return the domain,

the syndication framework will insert the domain of the current site, according

docs/ref/models/fields.txt

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ takes a few steps: 
       (relative to :setting:`MEDIA_ROOT`). You'll most likely want to use the

       convenience :attr:`~django.core.files.File.url` function provided by

       Django. For example, if your :class:`ImageField` is called ``mug_shot``,

       you can get the absolute URL to your image in a template with

       you can get the absolute path to your image in a template with

       ``{{ object.mug_shot.url }}``.



For example, say your :setting:`MEDIA_ROOT` is set to ``'/home/media'``, and