summaryrefslogtreecommitdiff
path: root/docs/intro
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2015-11-29 08:29:46 -0800
committerTim Graham <timograham@gmail.com>2015-12-01 08:03:16 -0500
commitbf76cf07e0e0713020974f47dacfaddcedbe1abf (patch)
tree25d3659624b41be8315d418c577a7b529b4d8ae6 /docs/intro
parentb4074102328180dd53ecc5a03b0afa1322024036 (diff)
[1.9.x] Fixed #25778 -- Updated docs links to use https when available.
Backport of 7aabd6238028f4bb78d0687bbccc97bcf634e28b from master
Diffstat (limited to 'docs/intro')
-rw-r--r--docs/intro/install.txt2
-rw-r--r--docs/intro/reusable-apps.txt4
-rw-r--r--docs/intro/tutorial01.txt4
-rw-r--r--docs/intro/whatsnext.txt2
4 files changed, 6 insertions, 6 deletions
diff --git a/docs/intro/install.txt b/docs/intro/install.txt
index 71cd55daa5..ae6e4bb7a0 100644
--- a/docs/intro/install.txt
+++ b/docs/intro/install.txt
@@ -13,7 +13,7 @@ Being a Python Web framework, Django requires Python. See
:ref:`faq-python-version-support` for details. Python includes a lightweight
database called SQLite_ so you won't need to set up a database just yet.
-.. _sqlite: http://sqlite.org/
+.. _sqlite: https://sqlite.org/
Get the latest version of Python at https://www.python.org/download/ or with
your operating system's package manager.
diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt
index 0c2b87d061..5d1dc2c945 100644
--- a/docs/intro/reusable-apps.txt
+++ b/docs/intro/reusable-apps.txt
@@ -185,7 +185,7 @@ this. For a small app like polls, this process isn't too difficult.
5. Next we'll create a ``setup.py`` file which provides details about how to
build and install the app. A full explanation of this file is beyond the
scope of this tutorial, but the `setuptools docs
- <http://pythonhosted.org/setuptools/setuptools.html>`_ have a good
+ <https://pythonhosted.org/setuptools/setuptools.html>`_ have a good
explanation. Create a file ``django-polls/setup.py`` with the following
contents:
@@ -209,7 +209,7 @@ this. For a small app like polls, this process isn't too difficult.
license='BSD License', # example license
description='A simple Django app to conduct Web-based polls.',
long_description=README,
- url='http://www.example.com/',
+ url='https://www.example.com/',
author='Your Name',
author_email='yourname@example.com',
classifiers=[
diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
index bde7b800de..7255f2b3ee 100644
--- a/docs/intro/tutorial01.txt
+++ b/docs/intro/tutorial01.txt
@@ -331,8 +331,8 @@ finds one that matches.
Note that these regular expressions do not search GET and POST parameters, or
the domain name. For example, in a request to
-``http://www.example.com/myapp/``, the URLconf will look for ``myapp/``. In a
-request to ``http://www.example.com/myapp/?page=3``, the URLconf will also
+``https://www.example.com/myapp/``, the URLconf will look for ``myapp/``. In a
+request to ``https://www.example.com/myapp/?page=3``, the URLconf will also
look for ``myapp/``.
If you need help with regular expressions, see `Wikipedia's entry`_ and the
diff --git a/docs/intro/whatsnext.txt b/docs/intro/whatsnext.txt
index 794aaaa9c5..855490592d 100644
--- a/docs/intro/whatsnext.txt
+++ b/docs/intro/whatsnext.txt
@@ -192,7 +192,7 @@ You can get a local copy of the HTML documentation following a few easy steps:
or newer, but we recommend going straight to Sphinx 1.0.2 or newer.
__ http://sphinx-doc.org/
-__ http://www.gnu.org/software/make/
+__ https://www.gnu.org/software/make/
.. _differences-between-doc-versions: