diff options
| author | Steve Piercy <web@stevepiercy.com> | 2013-03-21 13:32:14 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2013-03-21 13:32:14 -0700 |
| commit | a17c712f7f836b3506be069f60ee9ed8a8edb42b (patch) | |
| tree | d42a28e8b692fd6da1289c2ca8f99a18a8a3e59f /docs/conf.py | |
| parent | 124daa3f3de2350ee4079d684736acd10b415046 (diff) | |
| parent | f38126c3214c936f022e68a1cac88c3cd8644879 (diff) | |
| download | pyramid-a17c712f7f836b3506be069f60ee9ed8a8edb42b.tar.gz pyramid-a17c712f7f836b3506be069f60ee9ed8a8edb42b.tar.bz2 pyramid-a17c712f7f836b3506be069f60ee9ed8a8edb42b.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
docs/tutorials/wiki2/installation.rst
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..eff6db488 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/latest', 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), } |