Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.1.X] Fixed several broken and redirecting URLs in the documentatio…

…n (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
  • Loading branch information...
commit d8ea6831f9042502dbb4f24e51fe521349bd97ad 1 parent ed192ea
Gary Wilson Jr. authored December 26, 2009
2  docs/faq/install.txt
@@ -35,7 +35,7 @@ also need a database engine. PostgreSQL_ is recommended, because we're
35 35
 PostgreSQL fans, and MySQL_, `SQLite 3`_, and Oracle_ are also supported.
36 36
 
37 37
 .. _Python: http://www.python.org/
38  
-.. _WSGI: http://www.python.org/peps/pep-0333.html
  38
+.. _WSGI: http://www.python.org/dev/peps/pep-0333/
39 39
 .. _server arrangements wiki page: http://code.djangoproject.com/wiki/ServerArrangements
40 40
 .. _PostgreSQL: http://www.postgresql.org/
41 41
 .. _MySQL: http://www.mysql.com/
2  docs/howto/auth-remote-user.txt
@@ -12,7 +12,7 @@ Windows Authentication or Apache and `mod_authnz_ldap`_, `CAS`_, `Cosign`_,
12 12
 `WebAuth`_, `mod_auth_sspi`_, etc.
13 13
 
14 14
 .. _mod_authnz_ldap: http://httpd.apache.org/docs/2.2/mod/mod_authnz_ldap.html
15  
-.. _CAS: http://www.ja-sig.org/products/cas/
  15
+.. _CAS: http://www.jasig.org/cas
16 16
 .. _Cosign: http://weblogin.org
17 17
 .. _WebAuth: http://www.stanford.edu/services/webauth/
18 18
 .. _mod_auth_sspi: http://sourceforge.net/projects/mod-auth-sspi
4  docs/howto/deployment/modpython.txt
@@ -375,9 +375,9 @@ set of imports until it stops crashing, so as to find the specific module that
375 375
 causes the problem. Drop down further into modules and look into their imports,
376 376
 as necessary.
377 377
 
378  
-.. _Expat Causing Apache Crash: http://www.dscpl.com.au/articles/modpython-006.html
  378
+.. _Expat Causing Apache Crash: http://www.dscpl.com.au/wiki/ModPython/Articles/ExpatCausingApacheCrash
379 379
 .. _mod_python FAQ entry: http://modpython.org/FAQ/faqw.py?req=show&file=faq02.013.htp
380  
-.. _Getting mod_python Working: http://www.dscpl.com.au/articles/modpython-001.html
  380
+.. _Getting mod_python Working: http://www.dscpl.com.au/wiki/ModPython/Articles/GettingModPythonWorking
381 381
 
382 382
 If you get a UnicodeEncodeError
383 383
 ===============================
10  docs/howto/outputting-pdf.txt
@@ -16,13 +16,13 @@ For example, Django was used at kusports.com_ to generate customized,
16 16
 printer-friendly NCAA tournament brackets, as PDF files, for people
17 17
 participating in a March Madness contest.
18 18
 
19  
-.. _ReportLab: http://www.reportlab.org/rl_toolkit.html
  19
+.. _ReportLab: http://www.reportlab.org/oss/rl-toolkit/
20 20
 .. _kusports.com: http://www.kusports.com/
21 21
 
22 22
 Install ReportLab
23 23
 =================
24 24
 
25  
-Download and install the ReportLab library from http://www.reportlab.org/downloads.html.
  25
+Download and install the ReportLab library from http://www.reportlab.org/oss/rl-toolkit/download/.
26 26
 The `user guide`_ (not coincidentally, a PDF file) explains how to install it.
27 27
 
28 28
 Test your installation by importing it in the Python interactive interpreter::
@@ -138,17 +138,15 @@ Further resources
138 138
 
139 139
     * PDFlib_ is another PDF-generation library that has Python bindings. To
140 140
       use it with Django, just use the same concepts explained in this article.
141  
-    * `Pisa HTML2PDF`_ is yet another PDF-generation library. Pisa ships with
  141
+    * `Pisa XHTML2PDF`_ is yet another PDF-generation library. Pisa ships with
142 142
       an example of how to integrate Pisa with Django.
143 143
     * HTMLdoc_ is a command-line script that can convert HTML to PDF. It
144 144
       doesn't have a Python interface, but you can escape out to the shell
145 145
       using ``system`` or ``popen`` and retrieve the output in Python.
146  
-    * `forge_fdf in Python`_ is a library that fills in PDF forms.
147 146
 
148 147
 .. _PDFlib: http://www.pdflib.org/
149  
-.. _`Pisa HTML2PDF`: http://www.htmltopdf.org/
  148
+.. _`Pisa XHTML2PDF`: http://www.xhtml2pdf.com/
150 149
 .. _HTMLdoc: http://www.htmldoc.org/
151  
-.. _forge_fdf in Python: http://www.accesspdf.com/article.php/20050421092951834
152 150
 
153 151
 Other formats
154 152
 =============
15  docs/internals/contributing.txt
@@ -823,7 +823,8 @@ dependencies:
823 823
     *  Textile_
824 824
     *  Docutils_
825 825
     *  setuptools_
826  
-    *  memcached_, plus the either the python-memcached_ or cmemcached_ Python binding
  826
+    *  memcached_, plus the either the python-memcached_ or cmemcached_
  827
+       Python binding
827 828
 
828 829
 If you want to test the memcached cache backend, you will also need to define
829 830
 a :setting:`CACHE_BACKEND` setting that points at your memcached instance.
@@ -838,7 +839,7 @@ associated tests will be skipped.
838 839
 .. _setuptools: http://pypi.python.org/pypi/setuptools/
839 840
 .. _memcached: http://www.danga.com/memcached/
840 841
 .. _python-memcached: http://pypi.python.org/pypi/python-memcached/
841  
-.. _cmemcached: http://pypi.python.org/pypi/cmemcache
  842
+.. _cmemcached: http://gijsbert.org/cmemcache/index.html
842 843
 
843 844
 To run a subset of the unit tests, append the names of the test modules to the
844 845
 ``runtests.py`` command line. See the list of directories in
@@ -933,9 +934,9 @@ for feature branches:
933 934
        If you want a feature branch in SVN, you'll need to ask in
934 935
        `django-developers`_ for a mentor.
935 936
 
936  
-.. _git: http://git.or.cz/
937  
-.. _mercurial: http://www.selenic.com/mercurial/
938  
-.. _bazaar: http://bazaar-vcs.org/
  937
+.. _git: http://git-scm.com/
  938
+.. _mercurial: http://mercurial.selenic.com/
  939
+.. _bazaar: http://bazaar.canonical.com/
939 940
 .. _django branches: http://code.djangoproject.com/wiki/DjangoBranches
940 941
 
941 942
 Branch rules
@@ -1067,7 +1068,7 @@ If you're using Django 0.95 or earlier and installed it using
1067 1068
 file. Then copy the branch's version of the ``django`` directory into
1068 1069
 ``site-packages``.
1069 1070
 
1070  
-.. _path file: http://docs.python.org/lib/module-site.html
  1071
+.. _path file: http://docs.python.org/library/site.html
1071 1072
 
1072 1073
 Deciding on features
1073 1074
 ====================
@@ -1133,6 +1134,6 @@ requests for commit access are potential flame-war starters, and will be ignored
1133 1134
 .. _django-users: http://groups.google.com/group/django-users
1134 1135
 .. _`#django`: irc://irc.freenode.net/django
1135 1136
 .. _list of tickets with patches: http://code.djangoproject.com/query?status=new&status=assigned&status=reopened&has_patch=1&order=priority
1136  
-.. _pep8.py: http://svn.browsershots.org/trunk/devtools/pep8/pep8.py
  1137
+.. _pep8.py: http://pypi.python.org/pypi/pep8/
1137 1138
 .. _i18n branch: http://code.djangoproject.com/browser/django/branches/i18n
1138 1139
 .. _`tags/releases`: http://code.djangoproject.com/browser/django/tags/releases
2  docs/internals/documentation.txt
@@ -10,7 +10,7 @@ based on docutils__. The basic idea is that lightly-formatted plain-text
10 10
 documentation is transformed into HTML, PDF, and any other output format.
11 11
 
12 12
 __ http://sphinx.pocoo.org/
13  
-__ http://docutils.sf.net/
  13
+__ http://docutils.sourceforge.net/
14 14
 
15 15
 To actually build the documentation locally, you'll currently need to install
16 16
 Sphinx -- ``easy_install Sphinx`` should do the trick.
4  docs/intro/tutorial01.txt
@@ -102,7 +102,7 @@ These files are:
102 102
       contents" of your Django-powered site. You can read more about URLs in
103 103
       :ref:`topics-http-urls`.
104 104
 
105  
-.. _more about packages: http://docs.python.org/tut/node8.html#packages
  105
+.. _more about packages: http://docs.python.org/tutorial/modules.html#packages
106 106
 
107 107
 The development server
108 108
 ----------------------
@@ -361,7 +361,7 @@ Finally, note a relationship is defined, using
361 361
 to a single Poll. Django supports all the common database relationships:
362 362
 many-to-ones, many-to-manys and one-to-ones.
363 363
 
364  
-.. _`Python path`: http://docs.python.org/tut/node8.html#SECTION008110000000000000000
  364
+.. _`Python path`: http://docs.python.org/tutorial/modules.html#the-module-search-path
365 365
 
366 366
 Activating models
367 367
 =================
1  docs/ref/contrib/flatpages.txt
@@ -26,7 +26,6 @@ content in a custom template.
26 26
 
27 27
 Here are some examples of flatpages on Django-powered sites:
28 28
 
29  
-    * http://www.chicagocrime.org/about/
30 29
     * http://www.everyblock.com/about/
31 30
     * http://www.lawrence.com/about/contact/
32 31
 
2  docs/ref/contrib/index.txt
@@ -19,7 +19,7 @@ those packages have.
19 19
     ``'django.contrib.admin'``) to your ``INSTALLED_APPS`` setting and re-run
20 20
     ``manage.py syncdb``.
21 21
 
22  
-.. _"batteries included" philosophy: http://docs.python.org/tut/node12.html#batteries-included
  22
+.. _"batteries included" philosophy: http://docs.python.org/tutorial/stdlib.html#batteries-included
23 23
 
24 24
 .. toctree::
25 25
    :maxdepth: 1
6  docs/ref/contrib/localflavor.txt
@@ -166,7 +166,7 @@ Austria (``at``)
166 166
 
167 167
 .. class:: at.forms.ATStateSelect
168 168
 
169  
-    A ``Select`` widget that uses a list of Austrian states as its choices. 
  169
+    A ``Select`` widget that uses a list of Austrian states as its choices.
170 170
 
171 171
 .. class:: at.forms.ATSocialSecurityNumberField
172 172
 
@@ -516,7 +516,7 @@ Romania (``ro``)
516 516
 
517 517
 .. class:: ro.forms.ROIBANField
518 518
 
519  
-    A form field that validates its input as a Romanian International Bank 
  519
+    A form field that validates its input as a Romanian International Bank
520 520
     Account Number (IBAN). The valid format is ROXX-XXXX-XXXX-XXXX-XXXX-XXXX,
521 521
     with or without hyphens.
522 522
 
@@ -627,7 +627,7 @@ United Kingdom (``uk``)
627 627
 
628 628
     A form field that validates input as a UK postcode. The regular
629 629
     expression used is sourced from the schema for British Standard BS7666
630  
-    address types at http://www.govtalk.gov.uk/gdsc/schemas/bs7666-v2-0.xsd.
  630
+    address types at http://www.cabinetoffice.gov.uk/media/291293/bs7666-v2-0.xml.
631 631
 
632 632
 .. class:: uk.forms.UKCountySelect
633 633
 
2  docs/ref/contrib/syndication.txt
@@ -940,7 +940,7 @@ attributes. Thus, you can subclass the appropriate feed generator class
940 940
 (``Atom1Feed`` or ``Rss201rev2Feed``) and extend these callbacks. They are:
941 941
 
942 942
 .. _georss: http://georss.org/
943  
-.. _itunes podcast format: http://www.apple.com/itunes/store/podcaststechspecs.html
  943
+.. _itunes podcast format: http://www.apple.com/itunes/podcasts/specs.html
944 944
 
945 945
 ``SyndicationFeed.root_attributes(self, )``
946 946
     Return a ``dict`` of attributes to add to the root feed element
2  docs/ref/models/fields.txt
@@ -543,7 +543,7 @@ By default, :class:`FileField` instances are
543 543
 created as ``varchar(100)`` columns in your database. As with other fields, you
544 544
 can change the maximum length using the :attr:`~CharField.max_length` argument.
545 545
 
546  
-.. _`strftime formatting`: http://docs.python.org/lib/module-time.html#l2h-1941
  546
+.. _`strftime formatting`: http://docs.python.org/library/time.html#time.strftime
547 547
 
548 548
 ``FilePathField``
549 549
 -----------------
2  docs/ref/models/querysets.txt
@@ -94,7 +94,7 @@ the query construction and is not part of the public API. However, it is safe
94 94
 (and fully supported) to pickle and unpickle the attribute's contents as
95 95
 described here.
96 96
 
97  
-.. _pickle: http://docs.python.org/lib/module-pickle.html
  97
+.. _pickle: http://docs.python.org/library/pickle.html
98 98
 
99 99
 .. _queryset-api:
100 100
 
2  docs/ref/settings.txt
@@ -534,7 +534,7 @@ system's standard umask.
534 534
     get totally incorrect behavior.
535 535
 
536 536
 
537  
-.. _documentation for os.chmod: http://docs.python.org/lib/os-file-dir.html
  537
+.. _documentation for os.chmod: http://docs.python.org/library/os.html#os.chmod
538 538
 
539 539
 .. setting:: FIXTURE_DIRS
540 540
 
6  docs/ref/unicode.txt
@@ -21,8 +21,8 @@ data. Normally, this means giving it an encoding of UTF-8 or UTF-16. If you use
21 21
 a more restrictive encoding -- for example, latin1 (iso8859-1) -- you won't be
22 22
 able to store certain characters in the database, and information will be lost.
23 23
 
24  
- * MySQL users, refer to the `MySQL manual`_ (section 10.3.2 for MySQL 5.1) for
25  
-   details on how to set or alter the database character set encoding.
  24
+ * MySQL users, refer to the `MySQL manual`_ (section 9.1.3.2 for MySQL 5.1)
  25
+   for details on how to set or alter the database character set encoding.
26 26
 
27 27
  * PostgreSQL users, refer to the `PostgreSQL manual`_ (section 21.2.2 in
28 28
    PostgreSQL 8) for details on creating databases with the correct encoding.
@@ -30,7 +30,7 @@ able to store certain characters in the database, and information will be lost.
30 30
  * SQLite users, there is nothing you need to do. SQLite always uses UTF-8
31 31
    for internal encoding.
32 32
 
33  
-.. _MySQL manual: http://www.mysql.org/doc/refman/5.1/en/charset-database.html
  33
+.. _MySQL manual: http://dev.mysql.com/doc/refman/5.1/en/charset-database.html
34 34
 .. _PostgreSQL manual: http://www.postgresql.org/docs/8.2/static/multibyte.html#AEN24104
35 35
 
36 36
 All of Django's database backends automatically convert Unicode strings into
4  docs/releases/0.96.txt
@@ -227,8 +227,8 @@ start of your tests. This makes testing with real data much easier.
227 227
 
228 228
 See `the testing documentation`_ for the full details.
229 229
 
230  
-.. _doctest: http://docs.python.org/lib/module-doctest.html
231  
-.. _unittest: http://docs.python.org/lib/module-unittest.html
  230
+.. _doctest: http://docs.python.org/library/doctest.html
  231
+.. _unittest: http://docs.python.org/library/unittest.html
232 232
 .. _the testing documentation: http://www.djangoproject.com/documentation/0.96/testing/
233 233
 .. _serialization formats: http://www.djangoproject.com/documentation/0.96/serialization/
234 234
 
2  docs/topics/db/queries.txt
@@ -327,7 +327,7 @@ translates (roughly) into the following SQL::
327 327
    arguments whose names and values are evaluated at runtime. For more
328 328
    information, see `Keyword Arguments`_ in the official Python tutorial.
329 329
 
330  
-   .. _`Keyword Arguments`: http://docs.python.org/tut/node6.html#SECTION006720000000000000000
  330
+   .. _`Keyword Arguments`: http://docs.python.org/tutorial/controlflow.html#keyword-arguments
331 331
 
332 332
 If you pass an invalid keyword argument, a lookup function will raise
333 333
 ``TypeError``.
3  docs/topics/db/sql.txt
@@ -85,5 +85,4 @@ A final note: If all you want to do is a custom ``WHERE`` clause, you can just
85 85
 use the ``where``, ``tables`` and ``params`` arguments to the
86 86
 :ref:`extra clause <extra>` in the standard queryset API.
87 87
 
88  
-.. _Python DB-API: http://www.python.org/peps/pep-0249.html
89  
-
  88
+.. _Python DB-API: http://www.python.org/dev/peps/pep-0249/
2  docs/topics/files.txt
@@ -55,7 +55,7 @@ Internally, Django uses a ``django.core.files.File`` any time it needs to
55 55
 represent a file. This object is a thin wrapper around Python's `built-in file
56 56
 object`_ with some Django-specific additions.
57 57
 
58  
-.. _built-in file object: http://docs.python.org/lib/bltin-file-objects.html
  58
+.. _built-in file object: http://docs.python.org/library/stdtypes.html#bltin-file-objects
59 59
 
60 60
 Most of the time you'll simply use a ``File`` that Django's given you (i.e. a
61 61
 file attached to a model as above, or perhaps an uploaded file).
20  docs/topics/http/file-uploads.txt
@@ -30,7 +30,7 @@ is a dictionary containing a key for each ``FileField`` (or ``ImageField``, or
30 30
 other ``FileField`` subclass) in the form. So the data from the above form would
31 31
 be accessible as ``request.FILES['file']``.
32 32
 
33  
-Note that ``request.FILES`` will only contain data if the request method was 
  33
+Note that ``request.FILES`` will only contain data if the request method was
34 34
 ``POST`` and the ``<form>`` that posted the request has the attribute
35 35
 ``enctype="multipart/form-data"``. Otherwise, ``request.FILES`` will be empty.
36 36
 
@@ -140,19 +140,19 @@ Three settings control Django's file upload behavior:
140 140
 
141 141
         Defaults to your system's standard temporary directory (i.e. ``/tmp`` on
142 142
         most Unix-like systems).
143  
-        
  143
+
144 144
     :setting:`FILE_UPLOAD_PERMISSIONS`
145 145
         The numeric mode (i.e. ``0644``) to set newly uploaded files to. For
146 146
         more information about what these modes mean, see the `documentation for
147 147
         os.chmod`_
148  
-        
  148
+
149 149
         If this isn't given or is ``None``, you'll get operating-system
150 150
         dependent behavior. On most platforms, temporary files will have a mode
151 151
         of ``0600``, and files saved from memory will be saved using the
152 152
         system's standard umask.
153  
-        
  153
+
154 154
         .. warning::
155  
-        
  155
+
156 156
             If you're not familiar with file modes, please note that the leading
157 157
             ``0`` is very important: it indicates an octal number, which is the
158 158
             way that modes must be specified. If you try to use ``644``, you'll
@@ -173,7 +173,7 @@ Three settings control Django's file upload behavior:
173 173
         Which means "try to upload to memory first, then fall back to temporary
174 174
         files."
175 175
 
176  
-.. _documentation for os.chmod: http://docs.python.org/lib/os-file-dir.html 
  176
+.. _documentation for os.chmod: http://docs.python.org/library/os.html#os.chmod
177 177
 
178 178
 ``UploadedFile`` objects
179 179
 ========================
@@ -197,17 +197,17 @@ define the following methods/attributes:
197 197
     ``UploadedFile.temporary_file_path()``
198 198
         Only files uploaded onto disk will have this method; it returns the full
199 199
         path to the temporary uploaded file.
200  
-        
  200
+
201 201
 .. note::
202 202
 
203 203
     Like regular Python files, you can read the file line-by-line simply by
204 204
     iterating over the uploaded file:
205  
-    
  205
+
206 206
     .. code-block:: python
207  
-        
  207
+
208 208
         for line in uploadedfile:
209 209
             do_something_with(line)
210  
-            
  210
+
211 211
     However, *unlike* standard Python files, :class:`UploadedFile` only
212 212
     understands ``\n`` (also known as "Unix-style") line endings. If you know
213 213
     that you need to handle uploaded files with different line endings, you'll
4  docs/topics/install.txt
@@ -53,7 +53,7 @@ for each platform.
53 53
 
54 54
 .. _Apache: http://httpd.apache.org/
55 55
 .. _mod_wsgi: http://code.google.com/p/modwsgi/
56  
-.. _WSGI: http://www.python.org/peps/pep-0333.html
  56
+.. _WSGI: http://www.python.org/dev/peps/pep-0333/
57 57
 .. _server-arrangements wiki page: http://code.djangoproject.com/wiki/ServerArrangements
58 58
 
59 59
 .. _database-installation:
@@ -125,7 +125,7 @@ Django will need permission to create a test database.
125 125
 .. _compiled Windows version: http://stickpeople.com/projects/python/win-psycopg/
126 126
 .. _MySQLdb: http://sourceforge.net/projects/mysql-python
127 127
 .. _SQLite: http://www.sqlite.org/
128  
-.. _pysqlite: http://pysqlite.org/
  128
+.. _pysqlite: http://trac.edgewall.org/wiki/PySqlite
129 129
 .. _cx_Oracle: http://cx-oracle.sourceforge.net/
130 130
 .. _Oracle: http://www.oracle.com/
131 131
 .. _Sybase SQL Anywhere: http://code.google.com/p/sqlany-django/
14  docs/topics/testing.txt
@@ -147,7 +147,7 @@ as must have ``CREATE DATABASE`` rights.
147 147
 For more details about how doctest works, see the `standard library
148 148
 documentation for doctest`_.
149 149
 
150  
-.. _doctest: http://docs.python.org/lib/module-doctest.html
  150
+.. _doctest: http://docs.python.org/library/doctest.html
151 151
 .. _standard library documentation for doctest: doctest_
152 152
 
153 153
 Writing unit tests
@@ -197,9 +197,9 @@ suite.
197 197
 For more details about ``unittest``, see the `standard library unittest
198 198
 documentation`_.
199 199
 
200  
-.. _unittest: http://docs.python.org/lib/module-unittest.html
  200
+.. _unittest: http://docs.python.org/library/unittest.html
201 201
 .. _standard library unittest documentation: unittest_
202  
-.. _suggested organization: http://docs.python.org/lib/organizing-tests.html
  202
+.. _suggested organization: http://docs.python.org/library/unittest.html#organizing-tests
203 203
 
204 204
 Which should I use?
205 205
 -------------------
@@ -412,7 +412,7 @@ a different focus. In short:
412 412
 A comprehensive test suite should use a combination of both test types.
413 413
 
414 414
 .. _Twill: http://twill.idyll.org/
415  
-.. _Selenium: http://www.openqa.org/selenium/
  415
+.. _Selenium: http://seleniumhq.org/
416 416
 
417 417
 Overview and a quick example
418 418
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -465,8 +465,8 @@ Note a few important things about how the test client works:
465 465
       This black magic (essentially a patching of Django's template system in
466 466
       memory) only happens during test running.
467 467
 
468  
-.. _urllib: http://docs.python.org/lib/module-urllib.html
469  
-.. _urllib2: http://docs.python.org/lib/module-urllib2.html
  468
+.. _urllib: http://docs.python.org/library/urllib.html
  469
+.. _urllib2: http://docs.python.org/library/urllib2.html
470 470
 
471 471
 Making requests
472 472
 ~~~~~~~~~~~~~~~
@@ -807,7 +807,7 @@ can access these properties as part of a test condition.
807 807
     A dictionary-like object containing session information. See the
808 808
     :ref:`session documentation<topics-http-sessions>` for full details.
809 809
 
810  
-.. _Cookie module documentation: http://docs.python.org/lib/module-Cookie.html
  810
+.. _Cookie module documentation: http://docs.python.org/library/cookie.html
811 811
 
812 812
 Example
813 813
 ~~~~~~~

0 notes on commit d8ea683

Please sign in to comment.
Something went wrong with that request. Please try again.