summaryrefslogtreecommitdiff
path: root/docs/faq
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/faq
parentb4074102328180dd53ecc5a03b0afa1322024036 (diff)
[1.9.x] Fixed #25778 -- Updated docs links to use https when available.
Backport of 7aabd6238028f4bb78d0687bbccc97bcf634e28b from master
Diffstat (limited to 'docs/faq')
-rw-r--r--docs/faq/admin.txt2
-rw-r--r--docs/faq/general.txt4
-rw-r--r--docs/faq/install.txt4
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/faq/admin.txt b/docs/faq/admin.txt
index 61e84fa974..ce89203c76 100644
--- a/docs/faq/admin.txt
+++ b/docs/faq/admin.txt
@@ -10,7 +10,7 @@ things:
* Set the :setting:`SESSION_COOKIE_DOMAIN` setting in your admin config
file to match your domain. For example, if you're going to
- "http://www.example.com/admin/" in your browser, in "myproject.settings" you
+ "https://www.example.com/admin/" in your browser, in "myproject.settings" you
should set :setting:`SESSION_COOKIE_DOMAIN` = 'www.example.com'.
I can't log in. When I enter a valid username and password, it brings up the login page again, with a "Please enter a correct username and password" error.
diff --git a/docs/faq/general.txt b/docs/faq/general.txt
index d8f9e1fedc..4bc8e6dfe3 100644
--- a/docs/faq/general.txt
+++ b/docs/faq/general.txt
@@ -24,7 +24,7 @@ Django. Django would not be possible without a whole host of open-source
projects -- `Apache`_, `Python`_, and `PostgreSQL`_ to name a few -- and we're
thrilled to be able to give something back to the open-source community.
-.. _Apache: http://httpd.apache.org/
+.. _Apache: https://httpd.apache.org/
.. _Python: https://www.python.org/
.. _PostgreSQL: http://www.postgresql.org/
@@ -75,7 +75,7 @@ Which sites use Django?
`DjangoSites.org`_ features a constantly growing list of Django-powered sites.
-.. _DjangoSites.org: http://djangosites.org
+.. _DjangoSites.org: https://djangosites.org
.. _faq-mtv:
diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index dfc18252d0..d6355f3a4f 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -33,8 +33,8 @@ PostgreSQL fans, and MySQL_, `SQLite 3`_, and Oracle_ are also supported.
.. _Python: https://www.python.org/
.. _PostgreSQL: http://www.postgresql.org/
-.. _MySQL: http://www.mysql.com/
-.. _`SQLite 3`: http://www.sqlite.org/
+.. _MySQL: https://www.mysql.com/
+.. _`SQLite 3`: https://www.sqlite.org/
.. _Oracle: http://www.oracle.com/
.. _faq-python-version-support: