From 337cd0983699ea5739746fb2d5066f38f8834bbb Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Fri, 19 Dec 2014 18:07:03 +0100 Subject: [PATCH] Updated some other external links in the docs --- docs/howto/auth-remote-user.txt | 2 +- docs/howto/deployment/index.txt | 2 +- docs/howto/outputting-pdf.txt | 10 +++++----- docs/internals/team.txt | 16 ++++++++-------- docs/ref/contrib/gis/db-api.txt | 4 ++-- docs/ref/contrib/gis/forms-api.txt | 2 +- docs/ref/contrib/gis/geoquerysets.txt | 2 +- docs/ref/contrib/gis/geos.txt | 2 +- docs/ref/contrib/gis/install/geolibs.txt | 4 ++-- docs/ref/contrib/gis/install/postgis.txt | 2 +- docs/ref/contrib/gis/model-api.txt | 4 ++-- docs/ref/contrib/gis/tutorial.txt | 2 +- docs/ref/contrib/staticfiles.txt | 2 +- docs/ref/databases.txt | 2 +- docs/releases/1.2.txt | 2 +- docs/topics/i18n/translation.txt | 5 +---- docs/topics/performance.txt | 2 +- 17 files changed, 31 insertions(+), 34 deletions(-) diff --git a/docs/howto/auth-remote-user.txt b/docs/howto/auth-remote-user.txt index 2edab6bc53..30aad24293 100644 --- a/docs/howto/auth-remote-user.txt +++ b/docs/howto/auth-remote-user.txt @@ -10,7 +10,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.jasig.org/cas +.. _CAS: https://www.apereo.org/cas .. _Cosign: http://weblogin.org .. _WebAuth: http://www.stanford.edu/services/webauth/ .. _mod_auth_sspi: http://sourceforge.net/projects/mod-auth-sspi diff --git a/docs/howto/deployment/index.txt b/docs/howto/deployment/index.txt index 1a5d137596..7b37a4870e 100644 --- a/docs/howto/deployment/index.txt +++ b/docs/howto/deployment/index.txt @@ -31,4 +31,4 @@ the easiest, fastest, and most stable deployment choice. ``mod_python`` was first deprecated, then completely removed in Django 1.5. -.. _chapter 12 of the django book (second edition): http://djangobook.com/en/2.0/chapter12.html +.. _chapter 12 of the django book (second edition): http://www.djangobook.com/en/2.0/chapter12.html diff --git a/docs/howto/outputting-pdf.txt b/docs/howto/outputting-pdf.txt index 2c0cb277cc..4bc413e009 100644 --- a/docs/howto/outputting-pdf.txt +++ b/docs/howto/outputting-pdf.txt @@ -14,16 +14,15 @@ 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.com/software/opensource/rl-toolkit/ +.. _ReportLab: http://www.reportlab.com/opensource/ .. _kusports.com: http://www.kusports.com/ Install ReportLab ================= -Download and install the ReportLab library from -http://www.reportlab.com/software/opensource/rl-toolkit/download/. -The `user guide`_ (not coincidentally, a PDF file) explains how to install it. -Alternatively, you can also install it with ``pip``: +The ReportLab library is `available on PyPI`_. A `user guide`_ (not +coincidentally, a PDF file) is also available for download. +You can install ReportLab with ``pip``: .. code-block:: bash @@ -35,6 +34,7 @@ Test your installation by importing it in the Python interactive interpreter:: If that command doesn't raise any errors, the installation worked. +.. _available on PyPI: https://pypi.python.org/pypi/reportlab .. _user guide: http://www.reportlab.com/docs/reportlab-userguide.pdf Write your view diff --git a/docs/internals/team.txt b/docs/internals/team.txt index ff9a4a554e..3e495855d1 100644 --- a/docs/internals/team.txt +++ b/docs/internals/team.txt @@ -48,13 +48,13 @@ Journal-World`_ of Lawrence, Kansas, USA. .. _lawrence journal-world: http://ljworld.com/ .. _adrian holovaty: http://holovaty.com/ .. _everyblock: http://everyblock.com/ -.. _soundslice: http://www.soundslice.com/ +.. _soundslice: https://www.soundslice.com/ .. _simon willison: http://simonwillison.net/ .. _web-development blog: `simon willison`_ .. _jacob kaplan-moss: http://jacobian.org/ .. _revolution systems: http://revsys.com/ .. _wilson miner: http://wilsonminer.com/ -.. _heroku: http://heroku.com/ +.. _heroku: https://heroku.com/ .. _Rdio: http://rdio.com .. _core-team-list: @@ -151,7 +151,7 @@ Karen Tracey .. _Bauhaus-University Weimar: http://www.uni-weimar.de/ .. _virtualenv: http://www.virtualenv.org/ .. _pip: http://www.pip-installer.org/ - .. _Mozilla: http://www.mozilla.org/ + .. _Mozilla: https://www.mozilla.org/ `Andrew Godwin`_ Andrew is a freelance Python developer and tinkerer, and has been @@ -196,7 +196,7 @@ Ramiro Morales developers). He works remotely as a developer for `Lincoln Loop`_. .. _Chris Beaven: http://smileychris.com/ - .. _Lincoln Loop: http://lincolnloop.com/ + .. _Lincoln Loop: https://lincolnloop.com/ Honza Král Honza first discovered Django in 2006 and started using it right away, @@ -329,7 +329,7 @@ Jeremy Dunck and `shoutcaster`_ in the after-hours. Bryan lives in Los Angeles, CA, USA. .. _bryan veloso: http://avalonstar.com/ - .. _vlogger: http://youtube.com/bryanveloso/ + .. _vlogger: https://youtube.com/bryanveloso/ .. _shoutcaster: http://twitch.tv/vlogalonstar/ `Preston Holmes`_ @@ -405,7 +405,7 @@ Baptiste Mispelon Baptiste currently lives in Budapest, Hungary and works for `M2BPO`_, a small French company providing services to architects. - .. _M2BPO: http://www.m2bpo.fr + .. _M2BPO: https://www.m2bpo.fr Daniele Procida Daniele unexpectedly became a Django developer on 29th April 2009. Since @@ -416,7 +416,7 @@ Daniele Procida He is the author of `Arkestra`_ and `Don't be afraid to commit`_. He lives in Cardiff, Wales, and works for `Divio`_. - .. _Divio: http://divio.ch/ + .. _Divio: https://divio.ch/ .. _Arkestra: http://arkestra-project.org/ .. _Don\'t be afraid to commit: https://dont-be-afraid-to-commit.readthedocs.org @@ -518,7 +518,7 @@ Robert Wittams Alex lives in San Francisco, CA, USA. - .. _Alex Gaynor: http://alexgaynor.net + .. _Alex Gaynor: https://alexgaynor.net `Simon Meers`_ Simon discovered Django 0.96 during his Computer Science PhD research and diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt index 1597d7501c..089783c044 100644 --- a/docs/ref/contrib/gis/db-api.txt +++ b/docs/ref/contrib/gis/db-api.txt @@ -300,9 +300,9 @@ Method PostGIS Oracle SpatiaLite .. rubric:: Footnotes .. [#fnwkt] *See* Open Geospatial Consortium, Inc., `OpenGIS Simple Feature Specification For SQL `_, Document 99-049 (May 5, 1999), at Ch. 3.2.5, p. 3-11 (SQL Textual Representation of Geometry). -.. [#fnewkb] *See* `PostGIS EWKB, EWKT and Canonical Forms `_, PostGIS documentation at Ch. 4.1.2. +.. [#fnewkb] *See* `PostGIS EWKB, EWKT and Canonical Forms `_, PostGIS documentation at Ch. 4.1.2. .. [#fngeojson] *See* Howard Butler, Martin Daly, Allan Doyle, Tim Schaub, & Christopher Schmidt, `The GeoJSON Format Specification `_, Revision 1.0 (June 16, 2008). -.. [#fndistsphere15] *See* `PostGIS 1.5 documentation `_ on ``ST_distance_sphere``. +.. [#fndistsphere15] *See* `PostGIS 1.5 documentation `_ on ``ST_distance_sphere``. .. [#fnmysqlidx] *See* `Creating Spatial Indexes `_ in the MySQL Reference Manual: diff --git a/docs/ref/contrib/gis/forms-api.txt b/docs/ref/contrib/gis/forms-api.txt index dfe004c6b2..a2ea314d7c 100644 --- a/docs/ref/contrib/gis/forms-api.txt +++ b/docs/ref/contrib/gis/forms-api.txt @@ -161,7 +161,7 @@ Widget classes the inner ``Media`` class (see :ref:`assets-as-a-static-definition`). You can host a copy of ``openlayers.js`` `tailored to your needs`_ on your own server or refer to a copy from a - content-delivery network like http://cdnjs.com/. This will also allow + content-delivery network like https://cdnjs.com/. This will also allow you to serve the JavaScript file(s) using the ``https`` protocol if needed. .. _tailored to your needs: http://docs.openlayers.org/library/deploying.html diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt index 48a45310e2..ab37a4a2d5 100644 --- a/docs/ref/contrib/gis/geoquerysets.txt +++ b/docs/ref/contrib/gis/geoquerysets.txt @@ -1230,4 +1230,4 @@ Returns the same as the :meth:`GeoQuerySet.union` aggregate method. .. [#fnde9im] *See* `OpenGIS Simple Feature Specification For SQL `_, at Ch. 2.1.13.2, p. 2-13 (The Dimensionally Extended Nine-Intersection Model). .. [#fnsdorelate] *See* `SDO_RELATE documentation `_, from Ch. 11 of the Oracle Spatial User's Guide and Manual. .. [#fncovers] For an explanation of this routine, read `Quirks of the "Contains" Spatial Predicate `_ by Martin Davis (a PostGIS developer). -.. [#fncontainsproperly] Refer to the PostGIS ``ST_ContainsProperly`` `documentation `_ for more details. +.. [#fncontainsproperly] Refer to the PostGIS ``ST_ContainsProperly`` `documentation `_ for more details. diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt index 28606cd615..3be3af7bba 100644 --- a/docs/ref/contrib/gis/geos.txt +++ b/docs/ref/contrib/gis/geos.txt @@ -943,7 +943,7 @@ Returns the WKT of the given geometry. Example:: .. rubric:: Footnotes -.. [#fnogc] *See* `PostGIS EWKB, EWKT and Canonical Forms `_, PostGIS documentation at Ch. 4.1.2. +.. [#fnogc] *See* `PostGIS EWKB, EWKT and Canonical Forms `_, PostGIS documentation at Ch. 4.1.2. .. [#fncascadedunion] For more information, read Paul Ramsey's blog post about `(Much) Faster Unions in PostGIS 1.4 `_ and Martin Davis' blog post on `Fast polygon merging in JTS using Cascaded Union `_. Settings diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index 48f134c670..4cc2730e51 100644 --- a/docs/ref/contrib/gis/install/geolibs.txt +++ b/docs/ref/contrib/gis/install/geolibs.txt @@ -51,7 +51,7 @@ totally fine with GeoDjango. Your mileage may vary. required -- just import them as normal from :mod:`django.contrib.gis`. .. _PROJ.4: http://trac.osgeo.org/proj/ -__ http://postgis.refractions.net/ +__ http://postgis.net/ __ http://www.gaia-gis.it/gaia-sins/ @@ -107,7 +107,7 @@ internal geometry representation used by GeoDjango (it's behind the "lazy" geometries). Specifically, the C API library is called (e.g., ``libgeos_c.so``) directly from Python using ctypes. -First, download GEOS 3.3.8 from the refractions Web site and untar the source +First, download GEOS 3.3.8 from the GEOS Web site and untar the source archive:: $ wget http://download.osgeo.org/geos/geos-3.3.8.tar.bz2 diff --git a/docs/ref/contrib/gis/install/postgis.txt b/docs/ref/contrib/gis/install/postgis.txt index ab7da31861..689f7e1b5e 100644 --- a/docs/ref/contrib/gis/install/postgis.txt +++ b/docs/ref/contrib/gis/install/postgis.txt @@ -46,7 +46,7 @@ Finally, make and install:: the section on :ref:`spatialdb_template91` or :ref:`spatialdb_template_earlier` for more information. -__ http://postgis.refractions.net/ +__ http://postgis.net/ Post-installation ================= diff --git a/docs/ref/contrib/gis/model-api.txt b/docs/ref/contrib/gis/model-api.txt index 6dd4710e69..1eb25f3de5 100644 --- a/docs/ref/contrib/gis/model-api.txt +++ b/docs/ref/contrib/gis/model-api.txt @@ -214,7 +214,7 @@ available for geography columns: For more information, the PostGIS documentation contains a helpful section on determining `when to use geography data type over geometry data type -`_. +`_. ``GeoManager`` ============== @@ -253,4 +253,4 @@ for example:: .. [#fnharvard] Harvard Graduate School of Design, `An Overview of Geodesy and Geographic Referencing Systems `_. This is an excellent resource for an overview of principles relating to geographic and Cartesian coordinate systems. .. [#fnthematic] Terry A. Slocum, Robert B. McMaster, Fritz C. Kessler, & Hugh H. Howard, *Thematic Cartography and Geographic Visualization* (Prentice Hall, 2nd edition), at Ch. 7.1.3. .. [#fndist] This limitation does not apply to PostGIS 1.5. It should be noted that even in previous versions of PostGIS, this isn't impossible using GeoDjango; you could for example, take a known point in a projected coordinate system, buffer it to the appropriate radius, and then perform an intersection operation with the buffer transformed to the geographic coordinate system. -.. [#fngeography] Please refer to the `PostGIS Geography Type `_ documentation for more details. +.. [#fngeography] Please refer to the `PostGIS Geography Type `_ documentation for more details. diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt index fa14df5e8b..eb11721c12 100644 --- a/docs/ref/contrib/gis/tutorial.txt +++ b/docs/ref/contrib/gis/tutorial.txt @@ -338,7 +338,7 @@ besides the tools included within GeoDjango, you may also use the following: PostGIS. .. _ogr2ogr: http://www.gdal.org/ogr2ogr.html -.. _shp2pgsql: http://postgis.refractions.net/documentation/manual-1.5/ch04.html#shp2pgsql_usage +.. _shp2pgsql: http://postgis.net/docs/manual-1.5/ch04.html#shp2pgsql_usage .. _gdalinterface: diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt index 16e9c8bf7c..cddcd966e6 100644 --- a/docs/ref/contrib/staticfiles.txt +++ b/docs/ref/contrib/staticfiles.txt @@ -306,7 +306,7 @@ By default it calculates a MD5 hash from the content's chunks as mentioned above. Feel free to override this method to use your own hashing algorithm. -.. _`far future Expires headers`: http://developer.yahoo.com/performance/rules.html#expires +.. _`far future Expires headers`: https://developer.yahoo.com/performance/rules.html#expires .. _`@import`: http://www.w3.org/TR/CSS2/cascade.html#at-import .. _`url()`: http://www.w3.org/TR/CSS2/syndata.html#uri .. _`Cascading Style Sheets`: http://www.w3.org/Style/CSS/ diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 68d8043afc..c764095d9b 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -246,7 +246,7 @@ In addition to a DB API driver, Django needs an adapter to access the database drivers from its ORM. Django provides an adapter for MySQLdb/mysqlclient while MySQL Connector/Python includes `its own`_. -.. _its own: http://dev.mysql.com/doc/refman/5.6/en/connector-python-django-backend.html +.. _its own: http://dev.mysql.com/doc/refman/5.6/en/connector-python-info.html MySQLdb ~~~~~~~ diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt index c4380e79a9..422dff10e5 100644 --- a/docs/releases/1.2.txt +++ b/docs/releases/1.2.txt @@ -351,7 +351,7 @@ are now included: * ``django.contrib.gis.db.backends.spatialite`` GeoDjango now supports the rich capabilities added -in the `PostGIS 1.5 release `_. +in the `PostGIS 1.5 release `_. New features include support for the :ref:`geography type ` and enabling of :ref:`distance queries ` with non-point geometries on geographic coordinate systems. diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index d7e389a1dc..5a61162809 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -1428,8 +1428,7 @@ files of this type, but if you want to create your own message files, or want to test or compile a changed message file, you will need the ``gettext`` utilities: * Download the following zip files from the GNOME servers - http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/ or from one - of its mirrors_ + https://download.gnome.org/binaries/win32/dependencies/ * ``gettext-runtime-X.zip`` * ``gettext-tools-X.zip`` @@ -1446,8 +1445,6 @@ test or compile a changed message file, you will need the ``gettext`` utilities: * Add ``;C:\Program Files\gettext-utils\bin`` at the end of the ``Variable value`` field. -.. _mirrors: http://ftp.gnome.org/pub/GNOME/MIRRORS - You may also use ``gettext`` binaries you have obtained elsewhere, so long as the ``xgettext --version`` command works properly. Do not attempt to use Django translation utilities with a ``gettext`` package if the command ``xgettext diff --git a/docs/topics/performance.txt b/docs/topics/performance.txt index 65835fb35f..cb391c2fdd 100644 --- a/docs/topics/performance.txt +++ b/docs/topics/performance.txt @@ -75,7 +75,7 @@ These can't report on the internals of your code, but can provide a useful insight into your site's overall performance, including aspects that can't be adequately measured from within Django environment. Examples include: -* `Yahoo's Yslow `_ +* `Yahoo's Yslow `_ * `Google PageSpeed `_ There are also several paid-for services that perform a similar analysis,