diff options
| author | Michael Merickel <michael@merickel.org> | 2013-03-21 10:09:00 -0700 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2013-03-21 10:09:00 -0700 |
| commit | 1f168300303a8d9cf264cd17eaae06f6e1d7f734 (patch) | |
| tree | e924aa40e5775eda9a0cddeebb368078a273f4e2 /docs/conf.py | |
| parent | ea3e974d84c469cc07648d6be943e1e98ee50d33 (diff) | |
| parent | 2a65f2086ce5b0c2f029fbc0ea165a65cd601ec3 (diff) | |
| download | pyramid-1f168300303a8d9cf264cd17eaae06f6e1d7f734.tar.gz pyramid-1f168300303a8d9cf264cd17eaae06f6e1d7f734.tar.bz2 pyramid-1f168300303a8d9cf264cd17eaae06f6e1d7f734.zip | |
Merge pull request #931 from tshepang/sqla
add hyperlinks to SQLAlchemy docs
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/docs/conf.py b/docs/conf.py index 8d22d4d42..89eb998e7 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -55,13 +55,14 @@ extensions = [ # Looks for objects in external projects intersphinx_mapping = { - 'who': ('http://docs.repoze.org/who/2.0', None), - 'python': ('http://docs.python.org', None), - 'python3': ('http://docs.python.org/3', None), - 'tstring': + 'sqla': ('http://docs.sqlalchemy.org/en/latest', None), + 'who': ('http://docs.repoze.org/who/2.0', None), + 'python': ('http://docs.python.org', None), + 'python3': ('http://docs.python.org/3', None), + 'tstring': ('http://docs.pylonsproject.org/projects/translationstring/en/latest', None), - 'venusian': + 'venusian': ('http://docs.pylonsproject.org/projects/venusian/en/latest', None), } |