diff options
| author | Michael Merickel <michael@merickel.org> | 2016-02-29 12:48:09 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-02-29 12:48:09 -0600 |
| commit | a79bac6697fa312cd1ba0ac4e784bbc820c5e603 (patch) | |
| tree | 9f7098358c01622fcae8fbe8a318f6484e5d3c8b /docs/conf.py | |
| parent | 0c185a3f7bd717845b7e5a00bd0d7a267be582b6 (diff) | |
| parent | cb98a90c3dcc40dc42813143a601ef631249f5f4 (diff) | |
| download | pyramid-a79bac6697fa312cd1ba0ac4e784bbc820c5e603.tar.gz pyramid-a79bac6697fa312cd1ba0ac4e784bbc820c5e603.tar.bz2 pyramid-a79bac6697fa312cd1ba0ac4e784bbc820c5e603.zip | |
Merge branch 'master' into feature/alchemy-scaffold-update
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py index 1004e1cf9..a895bc6c3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -69,7 +69,7 @@ intersphinx_mapping = { 'python': ('http://docs.python.org', None), 'python3': ('http://docs.python.org/3', None), 'sqla': ('http://docs.sqlalchemy.org/en/latest', None), - 'tm': ('http://docs.pylonsproject.org/projects/pyramid_tm/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), |