summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMads Jensen <mje@inducks.org>2018-11-10 23:40:50 +0100
committerTim Graham <timograham@gmail.com>2018-11-10 17:41:02 -0500
commit747253ce842ba98e4a3d19cac07e58d1bef78559 (patch)
treede0c94f074a295612c03357439710cd9bdf1ec33
parentda84fbfcb5d568818bb504e8ea3f76f79b8e2237 (diff)
[2.1.x] Updated some links to https and new locations.
Backport of 961f8e99850ecb334d63a943b53b3cb1180ef538 from master.
-rw-r--r--docs/faq/general.txt4
-rw-r--r--docs/howto/deployment/wsgi/index.txt2
-rw-r--r--docs/howto/deployment/wsgi/modwsgi.txt4
-rw-r--r--docs/internals/contributing/writing-code/javascript.txt2
-rw-r--r--docs/ref/contrib/gis/install/geolibs.txt8
-rw-r--r--docs/topics/install.txt2
6 files changed, 11 insertions, 11 deletions
diff --git a/docs/faq/general.txt b/docs/faq/general.txt
index 2d89f97360..da0a75b0a2 100644
--- a/docs/faq/general.txt
+++ b/docs/faq/general.txt
@@ -42,7 +42,7 @@ Django is pronounced **JANG**-oh. Rhymes with FANG-oh. The "D" is silent.
We've also recorded an `audio clip of the pronunciation`_.
.. _Django Reinhardt: https://en.wikipedia.org/wiki/Django_Reinhardt
-.. _audio clip of the pronunciation: http://red-bean.com/~adrian/django_pronunciation.mp3
+.. _audio clip of the pronunciation: https://www.red-bean.com/~adrian/django_pronunciation.mp3
Is Django stable?
=================
@@ -203,4 +203,4 @@ If you need a name, just use "Django", without any tagline.
If you need a publication date, use the year of release of the version you're
referencing (e.g., 2013 for v1.5)
-.. _APA style: http://www.apastyle.org
+.. _APA style: https://www.apastyle.org
diff --git a/docs/howto/deployment/wsgi/index.txt b/docs/howto/deployment/wsgi/index.txt
index 282ab10af6..b49de1ec9f 100644
--- a/docs/howto/deployment/wsgi/index.txt
+++ b/docs/howto/deployment/wsgi/index.txt
@@ -5,7 +5,7 @@ How to deploy with WSGI
Django's primary deployment platform is WSGI_, the Python standard for web
servers and applications.
-.. _WSGI: http://www.wsgi.org
+.. _WSGI: https://wsgi.readthedocs.io/en/latest/
Django's :djadmin:`startproject` management command sets up a simple default
WSGI configuration for you, which you can tweak as needed for your project,
diff --git a/docs/howto/deployment/wsgi/modwsgi.txt b/docs/howto/deployment/wsgi/modwsgi.txt
index 217a3c7709..c2e74d3bae 100644
--- a/docs/howto/deployment/wsgi/modwsgi.txt
+++ b/docs/howto/deployment/wsgi/modwsgi.txt
@@ -6,13 +6,13 @@ Deploying Django with Apache_ and `mod_wsgi`_ is a tried and tested way to get
Django into production.
.. _Apache: https://httpd.apache.org/
-.. _mod_wsgi: http://www.modwsgi.org/
+.. _mod_wsgi: https://modwsgi.readthedocs.io/en/develop/
mod_wsgi is an Apache module which can host any Python WSGI_ application,
including Django. Django will work with any version of Apache which supports
mod_wsgi.
-.. _WSGI: http://www.wsgi.org
+.. _WSGI: https://wsgi.readthedocs.io/en/latest/
The `official mod_wsgi documentation`_ is your source for all the details about
how to use mod_wsgi. You'll probably want to start with the `installation and
diff --git a/docs/internals/contributing/writing-code/javascript.txt b/docs/internals/contributing/writing-code/javascript.txt
index 0140d3791c..941fa085e8 100644
--- a/docs/internals/contributing/writing-code/javascript.txt
+++ b/docs/internals/contributing/writing-code/javascript.txt
@@ -147,6 +147,6 @@ Then run the tests with:
.. _Closure Compiler: https://developers.google.com/closure/compiler/
.. _EditorConfig: https://editorconfig.org/
.. _Java: https://www.java.com
-.. _jshint: http://jshint.com/
+.. _jshint: https://jshint.com/
.. _node.js: https://nodejs.org/
.. _qunit: https://qunitjs.com/
diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt
index 7ad98ba44e..7f1c339ad7 100644
--- a/docs/ref/contrib/gis/install/geolibs.txt
+++ b/docs/ref/contrib/gis/install/geolibs.txt
@@ -101,7 +101,7 @@ directly from Python using ctypes.
First, download GEOS from the GEOS website and untar the source archive::
- $ wget http://download.osgeo.org/geos/geos-X.Y.Z.tar.bz2
+ $ wget https://download.osgeo.org/geos/geos-X.Y.Z.tar.bz2
$ tar xjf geos-X.Y.Z.tar.bz2
Next, change into the directory where GEOS was unpacked, run the configure
@@ -159,8 +159,8 @@ reference systems.
First, download the PROJ.4 source code and datum shifting files [#]_::
- $ wget http://download.osgeo.org/proj/proj-X.Y.Z.tar.gz
- $ wget http://download.osgeo.org/proj/proj-datumgrid-X.Y.tar.gz
+ $ wget https://download.osgeo.org/proj/proj-X.Y.Z.tar.gz
+ $ wget https://download.osgeo.org/proj/proj-datumgrid-X.Y.tar.gz
Next, untar the source code archive, and extract the datum shifting files in the
``nad`` subdirectory. This must be done *prior* to configuration::
@@ -189,7 +189,7 @@ supports :doc:`GDAL's vector data <../gdal>` capabilities [#]_.
First download the latest GDAL release version and untar the archive::
- $ wget http://download.osgeo.org/gdal/X.Y.Z/gdal-X.Y.Z.tar.gz
+ $ wget https://download.osgeo.org/gdal/X.Y.Z/gdal-X.Y.Z.tar.gz
$ tar xzf gdal-X.Y.Z.tar.gz
$ cd gdal-X.Y.Z
diff --git a/docs/topics/install.txt b/docs/topics/install.txt
index 9498d45191..3586160366 100644
--- a/docs/topics/install.txt
+++ b/docs/topics/install.txt
@@ -60,7 +60,7 @@ very well with `nginx`_. Additionally, Django follows the WSGI spec
.. _Apache: https://httpd.apache.org/
.. _nginx: https://nginx.org/
-.. _mod_wsgi: http://www.modwsgi.org/
+.. _mod_wsgi: https://modwsgi.readthedocs.io/en/develop/
.. _database-installation: