diff options
| author | Michael Merickel <michael@merickel.org> | 2016-04-12 21:09:23 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-04-12 21:09:23 -0500 |
| commit | 231a531fe62b82cd354dd64f5a1ffbab6df14a77 (patch) | |
| tree | d7fd2961735f8a5293885d9623abb42c5fcd7f80 /docs/conf.py | |
| parent | 769da1215a0287f4161e58f36d8d4b7650154202 (diff) | |
| parent | b1527e793bc101327050370c17e1be698f7192ff (diff) | |
| download | pyramid-231a531fe62b82cd354dd64f5a1ffbab6df14a77.tar.gz pyramid-231a531fe62b82cd354dd64f5a1ffbab6df14a77.tar.bz2 pyramid-231a531fe62b82cd354dd64f5a1ffbab6df14a77.zip | |
Merge branch 'master' into feature/require-csrf
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py index a895bc6c3..1600e1f5c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -66,8 +66,7 @@ intersphinx_mapping = { '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), - 'python': ('http://docs.python.org', None), - 'python3': ('http://docs.python.org/3', None), + 'python': ('https://docs.python.org/3', 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), |