From 260895df7aa9073d09090aabfdea7e52c262f8bc Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Mon, 26 Jun 2017 14:01:26 +0200
Subject: [PATCH] Merge pull request #3104 from stevepiercy/1.8-branch
---
docs/conf.py | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index b9581a1..63bbe0d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -62,25 +62,25 @@
# Looks for objects in external projects
intersphinx_mapping = {
- 'colander': ('http://docs.pylonsproject.org/projects/colander/en/latest', None),
- 'cookbook': ('http://docs.pylonsproject.org/projects/pyramid-cookbook/en/latest/', None),
+ 'colander': ('https://docs.pylonsproject.org/projects/colander/en/latest', None),
+ 'cookbook': ('https://docs.pylonsproject.org/projects/pyramid-cookbook/en/latest/', None),
'cookiecutter': ('https://cookiecutter.readthedocs.io/en/latest/', None),
- 'deform': ('http://docs.pylonsproject.org/projects/deform/en/latest', None),
- 'jinja2': ('http://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/', None),
- 'pylonswebframework': ('http://docs.pylonsproject.org/projects/pylons-webframework/en/latest/', None),
+ 'deform': ('https://docs.pylonsproject.org/projects/deform/en/latest', None),
+ 'jinja2': ('https://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/', None),
+ 'pylonswebframework': ('https://docs.pylonsproject.org/projects/pylons-webframework/en/latest/', None),
'python': ('https://docs.python.org/3', None),
'pytest': ('https://docs.pytest.org/en/latest/', None),
'sphinx': ('http://www.sphinx-doc.org/en/latest', None),
'sqla': ('http://docs.sqlalchemy.org/en/latest', None),
- 'tm': ('http://docs.pylonsproject.org/projects/pyramid-tm/en/latest/', None),
- 'toolbar': ('http://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest', None),
- 'tstring': ('http://docs.pylonsproject.org/projects/translationstring/en/latest', None),
- 'tutorials': ('http://docs.pylonsproject.org/projects/pyramid-tutorials/en/latest/', None),
- 'venusian': ('http://docs.pylonsproject.org/projects/venusian/en/latest', None),
+ 'tm': ('https://docs.pylonsproject.org/projects/pyramid-tm/en/latest/', None),
+ 'toolbar': ('https://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest', None),
+ 'tstring': ('https://docs.pylonsproject.org/projects/translationstring/en/latest', None),
+ 'tutorials': ('https://docs.pylonsproject.org/projects/pyramid-tutorials/en/latest/', None),
+ 'venusian': ('https://docs.pylonsproject.org/projects/venusian/en/latest', None),
'webob': ('http://docs.webob.org/en/latest', None),
'webtest': ('http://webtest.pythonpaste.org/en/latest', None),
'who': ('http://repozewho.readthedocs.io/en/latest', None),
- 'zcml': ('http://docs.pylonsproject.org/projects/pyramid-zcml/en/latest', None),
+ 'zcml': ('https://docs.pylonsproject.org/projects/pyramid-zcml/en/latest', None),
'zcomponent': ('http://zopecomponent.readthedocs.io/en/latest/', None),
'zinterface': ('http://zopeinterface.readthedocs.io/en/latest/', None),
}
@@ -135,7 +135,7 @@
# -----------------------
# enable pylons_sphinx_latesturl when this branch is no longer "latest"
# pylons_sphinx_latesturl_base = (
-# 'http://docs.pylonsproject.org/projects/pyramid/en/latest/')
+# 'https://docs.pylonsproject.org/projects/pyramid/en/latest/')
# pylons_sphinx_latesturl_pagename_overrides = {
# # map old pagename -> new pagename
# 'whatsnew-1.0': 'index',
--
Gitblit v1.9.3