summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorPaul Everitt <paul@agendaless.com>2013-08-13 07:36:48 -0400
committerPaul Everitt <paul@agendaless.com>2013-08-13 07:36:48 -0400
commitbf84d90b4dccb9fc52c8fe385e52f7a63e9a5535 (patch)
tree48e9ab6adf9968dd4b6cddbd41881b5fcbe0d42b /docs/conf.py
parent4467834cbd33a955a90fceedd2e595453315ef32 (diff)
downloadpyramid-bf84d90b4dccb9fc52c8fe385e52f7a63e9a5535.tar.gz
pyramid-bf84d90b4dccb9fc52c8fe385e52f7a63e9a5535.tar.bz2
pyramid-bf84d90b4dccb9fc52c8fe385e52f7a63e9a5535.zip
Add Intersphinx for Beaker, clean up some broken references, change from pip to virtualenv (and give an explanation), explain virtualenv on Python 2.7.
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/conf.py b/docs/conf.py
index e60cd7118..1ddcf95da 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -71,6 +71,9 @@ intersphinx_mapping = {
'http://docs.pylonsproject.org/projects/deform/en/latest',
None),
'sqla': ('http://docs.sqlalchemy.org/en/latest', None),
+ 'beaker': (
+ 'http://docs.pylonsproject.org/projects/pyramid_beaker/en/latest',
+ None),
'who': ('http://docs.repoze.org/who/latest', None),
'python': ('http://docs.python.org', None),
'python3': ('http://docs.python.org/3', None),