Commit bf76cf07 authored by Jon Dufresne's avatar Jon Dufresne Committed by Tim Graham
Browse files

[1.9.x] Fixed #25778 -- Updated docs links to use https when available. 

Backport of 7aabd623 from master
parent b4074102

docs/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ pygments_style = 'trac' 
intersphinx_mapping = {

    'python': ('https://docs.python.org/3/', None),

    'sphinx': ('http://sphinx-doc.org/', None),

    'six': ('http://pythonhosted.org/six/', None),

    'six': ('https://pythonhosted.org/six/', None),

    'formtools': ('http://django-formtools.readthedocs.org/en/latest/', None),

    'psycopg2': ('http://initd.org/psycopg/docs/', None),

}

docs/faq/admin.txt

+1 −1
Original line number Diff line number Diff line
@@ -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.

docs/faq/general.txt

+2 −2
Original line number Diff line number Diff line
@@ -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:

docs/faq/install.txt

+2 −2
Original line number Diff line number Diff line
@@ -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:

docs/howto/auth-remote-user.txt

+2 −2
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ intranet sites, with single sign-on solutions such as IIS and Integrated 
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

.. _mod_authnz_ldap: https://httpd.apache.org/docs/2.2/mod/mod_authnz_ldap.html

.. _CAS: https://www.apereo.org/projects/cas

.. _Cosign: http://weblogin.org

.. _WebAuth: http://www.stanford.edu/services/webauth/

.. _WebAuth: https://www.stanford.edu/services/webauth/

.. _mod_auth_sspi: http://sourceforge.net/projects/mod-auth-sspi



When the Web server takes care of authentication it typically sets the