Commit 93620343 authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

[1.2.X] Fixed #14141: docs now use the :doc: construct for links between documents. 

Thanks, Ramiro Morales.

Backport of [13608] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent c9016c15

docs/_ext/djangodocs.py

+3 −3
Original line number Diff line number Diff line
@@ -78,11 +78,11 @@ class VersionDirective(Directive): 
        ret.append(node)

        if not is_nextversion:

            if len(self.arguments) == 1:

                linktext = 'Please, see the release notes <releases-%s>' % (arg0)

                linktext = 'Please, see the release notes </releases/%s>' % (arg0)

                try:

                    xrefs = roles.XRefRole()('std:ref', linktext, linktext, self.lineno, self.state) # Sphinx >= 1.0

                    xrefs = roles.XRefRole()('doc', linktext, linktext, self.lineno, self.state) # Sphinx >= 1.0

                except AttributeError:

                    xrefs = roles.xfileref_role('ref', linktext, linktext, self.lineno, self.state) # Sphinx < 1.0

                    xrefs = roles.xfileref_role('doc', linktext, linktext, self.lineno, self.state) # Sphinx < 1.0

                node.extend(xrefs[0])

            node['version'] = arg0

        else:

docs/faq/admin.txt

+2 −4
Original line number Diff line number Diff line 
.. _faq-admin:



FAQ: The admin

==============
@@ -32,7 +30,7 @@ How can I prevent the cache middleware from caching the admin site? 
-------------------------------------------------------------------



Set the :setting:`CACHE_MIDDLEWARE_ANONYMOUS_ONLY` setting to ``True``. See the

:ref:`cache documentation <topics-cache>` for more information.

:doc:`cache documentation </topics/cache>` for more information.



How do I automatically set a field's value to the user who last edited the object in the admin?

-----------------------------------------------------------------------------------------------
@@ -91,5 +89,5 @@ We like it, but if you don't agree, you can modify the admin site's 
presentation by editing the CSS stylesheet and/or associated image files. The

site is built using semantic HTML and plenty of CSS hooks, so any changes you'd

like to make should be possible by editing the stylesheet. We've got a

:ref:`guide to the CSS used in the admin <obsolete-admin-css>` to get you started.

:doc:`guide to the CSS used in the admin </obsolete/admin-css>` to get you started.

docs/faq/contributing.txt

+1 −3
Original line number Diff line number Diff line 
.. _faq-contributing:



FAQ: Contributing code

======================
@@ -7,7 +5,7 @@ How can I get started contributing code to Django? 
--------------------------------------------------



Thanks for asking! We've written an entire document devoted to this question.

It's titled :ref:`Contributing to Django <internals-contributing>`.

It's titled :doc:`Contributing to Django </internals/contributing>`.



I submitted a bug fix in the ticket system several weeks ago. Why are you ignoring my patch?

--------------------------------------------------------------------------------------------

docs/faq/general.txt

+4 −6
Original line number Diff line number Diff line 
.. _faq-general:



FAQ: General

============
@@ -63,15 +61,15 @@ at any level -- database servers, caching servers or Web/application servers. 


The framework cleanly separates components such as its database layer and

application layer. And it ships with a simple-yet-powerful

:ref:`cache framework <topics-cache>`.

:doc:`cache framework </topics/cache>`.



Who's behind this?

------------------



Django was originally developed at World Online, the Web department of a

newspaper in Lawrence, Kansas, USA. Django's now run by an international team of

volunteers; you can read all about them over at the :ref:`list of committers

<internals-committers>`

volunteers; you can read all about them over at the :doc:`list of committers

</internals/committers>`



Which sites use Django?

-----------------------
@@ -146,7 +144,7 @@ philosophies 100%. 
Like we said: We're picky.



We've documented our philosophies on the

:ref:`design philosophies page <misc-design-philosophies>`.

:doc:`design philosophies page </misc/design-philosophies>`.



Is Django a content-management-system (CMS)?

--------------------------------------------

docs/faq/help.txt

+0 −2
Original line number Diff line number Diff line 
.. _faq-help:



FAQ: Getting Help

=================