Merge remote-tracking branch 'origin/master'

Receiving Matt's Javascript fix.

Author: bengrunfeld

docs/conf.py

@@ -145,6 +145,8 @@
 # typographically correct entities.
 html_use_smartypants = True
 
+html_add_permalinks = None
+
 # Custom sidebar templates, maps document names to template names.
 #html_sidebars = {}
 

docs/theme/deis/layout.html

@@ -13,6 +13,7 @@
     <link rel="stylesheet" href="{{ pathto('_static/css/bootstrap.css', 1) }}" type="text/css">
     <link rel="stylesheet" href="{{ pathto('_static/css/bootstrap-responsive.css', 1) }}" type="text/css">
     <link rel="stylesheet" href="{{ pathto('_static/css/main.css', 1) }}" type="text/css">
+    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css">
     <link rel="shortcut icon" href="{{ pathto('_static/favicon.ico', 1) }}">
     <script
     <script src="{{ pathto('_static/js/modernizr-2.6.2-respond-1.1.0.min.js', 1) }}"></script>
@@ -80,18 +81,15 @@
 
   <footer>
   </footer>
-
-{%- macro script() %}
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '{{ url_root }}',
-        VERSION:     '{{ release|e }}',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
-        HAS_SOURCE:  {{ has_source|lower }}
-      };
-    </script>
-{%- endmacro %}
+  <script type="text/javascript">
+    var DOCUMENTATION_OPTIONS = {
+      URL_ROOT:    '{{ url_root }}',
+      VERSION:     '{{ release|e }}',
+      COLLAPSE_INDEX: false,
+      FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
+      HAS_SOURCE:  {{ has_source|lower }}
+    };
+  </script>
   <script type="text/javascript" src="{{ pathto('_static/underscore.js', 1) }}" type="text/css"></script>
   <script type="text/javascript" src="{{ pathto('_static/doctools.js', 1) }}" type="text/css"></script>
   <script type="text/javascript" src="{{ pathto('_static/searchtools.js', 1) }}" type="text/css"></script>