From b1b92284f496800a4dfd2cea72cb9be07ba8661c Mon Sep 17 00:00:00 2001
From: Paul Everitt <paul@agendaless.com>
Date: Fri, 13 Sep 2013 16:52:14 -0400
Subject: First cut at import of quick tutorial.

---
 docs/conf.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'docs/conf.py')

diff --git a/docs/conf.py b/docs/conf.py
index a7a4a441a..799ec7820 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -90,8 +90,39 @@ intersphinx_mapping = {
     'zcml':
         ('http://docs.pylonsproject.org/projects/pyramid_zcml/en/latest',
          None),
+    'pyramid': (
+        'http://docs.pylonsproject.org/projects/pyramid/en/latest/',
+        None)
 }
 
+
+#intersphinx_mapping = {
+#    'python': (
+#        'http://docs.python.org/2',
+#        None),
+#    'sqla': (
+#        'http://docs.sqlalchemy.org/en/latest',
+#        None),
+#    'pyramid': (
+#        'http://docs.pylonsproject.org/projects/pyramid/en/latest/',
+#        None),
+#    'jinja2': (
+#        'http://docs.pylonsproject.org/projects/pyramid_jinja2/en/latest/',
+#        None),
+#    'toolbar': (
+#        'http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/en/latest',
+#        None),
+#    'deform': (
+#        'http://docs.pylonsproject.org/projects/deform/en/latest',
+#        None),
+#    'colander': (
+#        'http://docs.pylonsproject.org/projects/colander/en/latest',
+#        None),
+#    'tutorials': (
+#        'http://docs.pylonsproject.org/projects/pyramid_tutorials/en/latest/',
+#        None),
+#}
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
-- 
cgit v1.2.3


From 4042c772c8043ac96a22db439a736fec9ea2aafa Mon Sep 17 00:00:00 2001
From: Paul Everitt <paul@agendaless.com>
Date: Fri, 13 Sep 2013 17:09:35 -0400
Subject: All the references re-wired.

---
 docs/conf.py | 30 ------------------------------
 1 file changed, 30 deletions(-)

(limited to 'docs/conf.py')

diff --git a/docs/conf.py b/docs/conf.py
index 799ec7820..ee852aa51 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -90,39 +90,9 @@ intersphinx_mapping = {
     'zcml':
         ('http://docs.pylonsproject.org/projects/pyramid_zcml/en/latest',
          None),
-    'pyramid': (
-        'http://docs.pylonsproject.org/projects/pyramid/en/latest/',
-        None)
 }
 
 
-#intersphinx_mapping = {
-#    'python': (
-#        'http://docs.python.org/2',
-#        None),
-#    'sqla': (
-#        'http://docs.sqlalchemy.org/en/latest',
-#        None),
-#    'pyramid': (
-#        'http://docs.pylonsproject.org/projects/pyramid/en/latest/',
-#        None),
-#    'jinja2': (
-#        'http://docs.pylonsproject.org/projects/pyramid_jinja2/en/latest/',
-#        None),
-#    'toolbar': (
-#        'http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/en/latest',
-#        None),
-#    'deform': (
-#        'http://docs.pylonsproject.org/projects/deform/en/latest',
-#        None),
-#    'colander': (
-#        'http://docs.pylonsproject.org/projects/colander/en/latest',
-#        None),
-#    'tutorials': (
-#        'http://docs.pylonsproject.org/projects/pyramid_tutorials/en/latest/',
-#        None),
-#}
-
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
-- 
cgit v1.2.3


From 66be39bf656a2840931603bc959e38ff95e53164 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 2 Oct 2013 15:35:24 -0400
Subject: - Removed mention of ``pyramid_beaker`` from docs.  Beaker is no
 longer   maintained.  Point people at ``pyramid_redis_sessions`` instead.

---
 docs/conf.py | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'docs/conf.py')

diff --git a/docs/conf.py b/docs/conf.py
index ee852aa51..3b6e75a17 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -73,9 +73,6 @@ 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),
-- 
cgit v1.2.3