From e1d92087fae4ba0404c40ef1ee383294777476b8 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Tue, 1 Apr 2014 11:13:26 -0700
Subject: Minor site cleanup

---
 sites/shared_conf.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'sites/shared_conf.py')

diff --git a/sites/shared_conf.py b/sites/shared_conf.py
index 86ecdfe8..eb899834 100644
--- a/sites/shared_conf.py
+++ b/sites/shared_conf.py
@@ -1,6 +1,4 @@
 from datetime import datetime
-import os
-import sys
 
 import alabaster
 
-- 
cgit v1.2.3


From 658d202cc780f7cf536668cbca62601659369285 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Tue, 1 Apr 2014 13:28:54 -0700
Subject: This setting no longer needed & causes warnings if left in

---
 sites/shared_conf.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'sites/shared_conf.py')

diff --git a/sites/shared_conf.py b/sites/shared_conf.py
index eb899834..18c3bb4b 100644
--- a/sites/shared_conf.py
+++ b/sites/shared_conf.py
@@ -7,7 +7,6 @@ import alabaster
 html_theme_path = [alabaster.get_path()]
 extensions = ['alabaster']
 # Paths relative to invoking conf.py - not this shared file
-html_static_path = ['../_shared_static']
 html_theme = 'alabaster'
 html_theme_options = {
     'description': "A Python implementation of SSHv2.",
-- 
cgit v1.2.3


From 57e647341f416c879ae3841c9a7be50c52a21327 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sun, 6 Apr 2014 18:52:58 -0700
Subject: Nuke Fab-oriented link color override

---
 sites/shared_conf.py | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'sites/shared_conf.py')

diff --git a/sites/shared_conf.py b/sites/shared_conf.py
index c61ca638..c265fc49 100644
--- a/sites/shared_conf.py
+++ b/sites/shared_conf.py
@@ -14,9 +14,6 @@ html_theme_options = {
     'github_repo': 'paramiko',
     'gittip_user': 'bitprophet',
     'analytics_id': 'UA-18486793-2',
-
-    'link': '#3782BE',
-    'link_hover': '#3782BE',
 }
 html_sidebars = {
     '**': [
-- 
cgit v1.2.3


From be7c679942b9b3a1838cce692f87e1c3d45092cf Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 14 Apr 2014 10:48:33 -0400
Subject: Errything uses intersphinx to Python

---
 sites/docs/conf.py   | 7 +------
 sites/shared_conf.py | 7 ++++++-
 sites/www/conf.py    | 4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'sites/shared_conf.py')

diff --git a/sites/docs/conf.py b/sites/docs/conf.py
index f9355715..5674fed1 100644
--- a/sites/docs/conf.py
+++ b/sites/docs/conf.py
@@ -5,16 +5,11 @@ sys.path.append(os.path.abspath('../..'))
 from shared_conf import *
 
 # Enable autodoc, intersphinx
-extensions.extend(['sphinx.ext.autodoc', 'sphinx.ext.intersphinx'])
+extensions.extend(['sphinx.ext.autodoc'])
 
 # Autodoc settings
 autodoc_default_flags = ['members', 'special-members']
 
-# Intersphinx connection to stdlib
-intersphinx_mapping = {
-    'python': ('http://docs.python.org/2.6', None),
-}
-
 # Sister-site links to WWW
 html_theme_options['extra_nav_links'] = {
     "Main website": 'http://www.paramiko.org',
diff --git a/sites/shared_conf.py b/sites/shared_conf.py
index c265fc49..e0afe92e 100644
--- a/sites/shared_conf.py
+++ b/sites/shared_conf.py
@@ -5,7 +5,7 @@ import alabaster
 
 # Alabaster theme + mini-extension
 html_theme_path = [alabaster.get_path()]
-extensions = ['alabaster']
+extensions = ['alabaster', 'sphinx.ext.intersphinx']
 # Paths relative to invoking conf.py - not this shared file
 html_theme = 'alabaster'
 html_theme_options = {
@@ -24,6 +24,11 @@ html_sidebars = {
     ]
 }
 
+# Everything intersphinx's to Python
+intersphinx_mapping = {
+    'python': ('http://docs.python.org/2.6', None),
+}
+
 # Regular settings
 project = 'Paramiko'
 year = datetime.now().year
diff --git a/sites/www/conf.py b/sites/www/conf.py
index 5047fa67..bdb5929a 100644
--- a/sites/www/conf.py
+++ b/sites/www/conf.py
@@ -20,9 +20,7 @@ target = join(dirname(__file__), '..', 'docs', '_build')
 if os.environ.get('READTHEDOCS') == 'True':
     # TODO: switch to docs.paramiko.org post go-live of sphinx API docs
     target = 'http://docs.paramiko.org/en/latest/'
-intersphinx_mapping = {
-    'docs': (target, None),
-}
+intersphinx_mapping['docs'] = (target, None)
 
 # Sister-site links to API docs
 html_theme_options['extra_nav_links'] = {
-- 
cgit v1.2.3