Commit d8ea6831 authored by Gary Wilson Jr's avatar Gary Wilson Jr
Browse files

[1.1.X] Fixed several broken and redirecting URLs in the documentation (fixes #12219, refs #12427). 

Backport of r11994 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent ed192ea5

docs/faq/install.txt

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ also need a database engine. PostgreSQL_ is recommended, because we're 
PostgreSQL fans, and MySQL_, `SQLite 3`_, and Oracle_ are also supported.



.. _Python: http://www.python.org/

.. _WSGI: http://www.python.org/peps/pep-0333.html

.. _WSGI: http://www.python.org/dev/peps/pep-0333/

.. _server arrangements wiki page: http://code.djangoproject.com/wiki/ServerArrangements

.. _PostgreSQL: http://www.postgresql.org/

.. _MySQL: http://www.mysql.com/

docs/howto/auth-remote-user.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Windows Authentication or Apache and `mod_authnz_ldap`_, `CAS`_, `Cosign`_, 
`WebAuth`_, `mod_auth_sspi`_, etc.



.. _mod_authnz_ldap: http://httpd.apache.org/docs/2.2/mod/mod_authnz_ldap.html

.. _CAS: http://www.ja-sig.org/products/cas/

.. _CAS: http://www.jasig.org/cas

.. _Cosign: http://weblogin.org

.. _WebAuth: http://www.stanford.edu/services/webauth/

.. _mod_auth_sspi: http://sourceforge.net/projects/mod-auth-sspi

docs/howto/deployment/modpython.txt

+2 −2
Original line number Diff line number Diff line
@@ -375,9 +375,9 @@ set of imports until it stops crashing, so as to find the specific module that 
causes the problem. Drop down further into modules and look into their imports,

as necessary.



.. _Expat Causing Apache Crash: http://www.dscpl.com.au/articles/modpython-006.html

.. _Expat Causing Apache Crash: http://www.dscpl.com.au/wiki/ModPython/Articles/ExpatCausingApacheCrash

.. _mod_python FAQ entry: http://modpython.org/FAQ/faqw.py?req=show&file=faq02.013.htp

.. _Getting mod_python Working: http://www.dscpl.com.au/articles/modpython-001.html

.. _Getting mod_python Working: http://www.dscpl.com.au/wiki/ModPython/Articles/GettingModPythonWorking



If you get a UnicodeEncodeError

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

docs/howto/outputting-pdf.txt

+4 −6
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ For example, Django was used at kusports.com_ to generate customized, 
printer-friendly NCAA tournament brackets, as PDF files, for people

participating in a March Madness contest.



.. _ReportLab: http://www.reportlab.org/rl_toolkit.html

.. _ReportLab: http://www.reportlab.org/oss/rl-toolkit/

.. _kusports.com: http://www.kusports.com/



Install ReportLab

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



Download and install the ReportLab library from http://www.reportlab.org/downloads.html.

Download and install the ReportLab library from http://www.reportlab.org/oss/rl-toolkit/download/.

The `user guide`_ (not coincidentally, a PDF file) explains how to install it.



Test your installation by importing it in the Python interactive interpreter::
@@ -138,17 +138,15 @@ Further resources 


    * PDFlib_ is another PDF-generation library that has Python bindings. To

      use it with Django, just use the same concepts explained in this article.

    * `Pisa HTML2PDF`_ is yet another PDF-generation library. Pisa ships with

    * `Pisa XHTML2PDF`_ is yet another PDF-generation library. Pisa ships with

      an example of how to integrate Pisa with Django.

    * HTMLdoc_ is a command-line script that can convert HTML to PDF. It

      doesn't have a Python interface, but you can escape out to the shell

      using ``system`` or ``popen`` and retrieve the output in Python.

    * `forge_fdf in Python`_ is a library that fills in PDF forms.



.. _PDFlib: http://www.pdflib.org/

.. _`Pisa HTML2PDF`: http://www.htmltopdf.org/

.. _`Pisa XHTML2PDF`: http://www.xhtml2pdf.com/

.. _HTMLdoc: http://www.htmldoc.org/

.. _forge_fdf in Python: http://www.accesspdf.com/article.php/20050421092951834



Other formats

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

docs/internals/contributing.txt

+8 −7
Original line number Diff line number Diff line
@@ -823,7 +823,8 @@ dependencies: 
    *  Textile_

    *  Docutils_

    *  setuptools_

    *  memcached_, plus the either the python-memcached_ or cmemcached_ Python binding

    *  memcached_, plus the either the python-memcached_ or cmemcached_

       Python binding



If you want to test the memcached cache backend, you will also need to define

a :setting:`CACHE_BACKEND` setting that points at your memcached instance.
@@ -838,7 +839,7 @@ associated tests will be skipped. 
.. _setuptools: http://pypi.python.org/pypi/setuptools/

.. _memcached: http://www.danga.com/memcached/

.. _python-memcached: http://pypi.python.org/pypi/python-memcached/

.. _cmemcached: http://pypi.python.org/pypi/cmemcache

.. _cmemcached: http://gijsbert.org/cmemcache/index.html



To run a subset of the unit tests, append the names of the test modules to the

``runtests.py`` command line. See the list of directories in
@@ -933,9 +934,9 @@ for feature branches: 
       If you want a feature branch in SVN, you'll need to ask in

       `django-developers`_ for a mentor.



.. _git: http://git.or.cz/

.. _mercurial: http://www.selenic.com/mercurial/

.. _bazaar: http://bazaar-vcs.org/

.. _git: http://git-scm.com/

.. _mercurial: http://mercurial.selenic.com/

.. _bazaar: http://bazaar.canonical.com/

.. _django branches: http://code.djangoproject.com/wiki/DjangoBranches



Branch rules
@@ -1067,7 +1068,7 @@ If you're using Django 0.95 or earlier and installed it using 
file. Then copy the branch's version of the ``django`` directory into

``site-packages``.



.. _path file: http://docs.python.org/lib/module-site.html

.. _path file: http://docs.python.org/library/site.html



Deciding on features

====================
@@ -1133,6 +1134,6 @@ requests for commit access are potential flame-war starters, and will be ignored 
.. _django-users: http://groups.google.com/group/django-users

.. _`#django`: irc://irc.freenode.net/django

.. _list of tickets with patches: http://code.djangoproject.com/query?status=new&status=assigned&status=reopened&has_patch=1&order=priority

.. _pep8.py: http://svn.browsershots.org/trunk/devtools/pep8/pep8.py

.. _pep8.py: http://pypi.python.org/pypi/pep8/

.. _i18n branch: http://code.djangoproject.com/browser/django/branches/i18n

.. _`tags/releases`: http://code.djangoproject.com/browser/django/tags/releases