From 7e84566772db39ec7e28558a0ec5c8c0c3987f4b Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Thu, 13 Mar 2014 21:06:14 -0700
Subject: [PATCH 1/5] Update copyright in README to be more accurate

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 77866b8..005fd6f 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ paramiko
 
 :Paramiko: Python SSH module
 :Copyright: Copyright (c) 2003-2009  Robey Pointer <robeypointer@gmail.com>
-:Copyright: Copyright (c) 2014  Jeff Forcier <jeff@bitprophet.org>
+:Copyright: Copyright (c) 2013-2014  Jeff Forcier <jeff@bitprophet.org>
 :License: LGPL
 :Homepage: https://github.com/paramiko/paramiko/
 :API docs: http://docs.paramiko.org

From 7a709498dce3d75d5c8125270760305ac1354a44 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sun, 6 Apr 2014 12:36:50 -0700
Subject: [PATCH 2/5] Formatting

---
 setup.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 2910a7f..4a85832 100644
--- a/setup.py
+++ b/setup.py
@@ -40,9 +40,10 @@ import sys
 try:
     from setuptools import setup
     kw = {
-        'install_requires': ['pycrypto >= 2.1, != 2.4',
-                             'ecdsa',
-                             ],
+        'install_requires': [
+            'pycrypto >= 2.1, != 2.4',
+            'ecdsa',
+        ],
     }
 except ImportError:
     from distutils.core import setup

From 4fe3ad2220996354b7f096cbd2d3000caf5cfdf0 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sun, 6 Apr 2014 18:52:58 -0700
Subject: [PATCH 3/5] Nuke Fab-oriented link color override

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

diff --git a/sites/shared_conf.py b/sites/shared_conf.py
index c61ca63..c265fc4 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 = {
     '**': [

From a1c2a9829a620c3ace6ddc6187bf05262e10b137 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 14 Apr 2014 10:48:33 -0400
Subject: [PATCH 4/5] 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(-)

diff --git a/sites/docs/conf.py b/sites/docs/conf.py
index f935571..5674fed 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 c265fc4..e0afe92 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 1c6c925..c782820 100644
--- a/sites/www/conf.py
+++ b/sites/www/conf.py
@@ -25,9 +25,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'] = {

From 24309559bbdc4742a94854eb33c9d6047635497c Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Tue, 15 Apr 2014 15:04:46 -0400
Subject: [PATCH 5/5] Show Travis status in website sidebar

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

diff --git a/sites/shared_conf.py b/sites/shared_conf.py
index e0afe92..6990838 100644
--- a/sites/shared_conf.py
+++ b/sites/shared_conf.py
@@ -14,6 +14,7 @@ html_theme_options = {
     'github_repo': 'paramiko',
     'gittip_user': 'bitprophet',
     'analytics_id': 'UA-18486793-2',
+    'travis_button': True,
 }
 html_sidebars = {
     '**': [