From 1e63f34d2eb553262ba068e1a21a29f022a7b9e4 Mon Sep 17 00:00:00 2001
From: tk0miya <i.tkomiya@gmail.com>
Date: Wed, 1 Oct 2014 10:12:20 +0900
Subject: [PATCH 1/3] Fix Builder.imgpath has not been initialized correctly

---
 sphinx/builders/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py
index ee55830fc..7d1bd9206 100644
--- a/sphinx/builders/__init__.py
+++ b/sphinx/builders/__init__.py
@@ -71,9 +71,9 @@ class Builder(object):
         # images that need to be copied over (source -> dest)
         self.images = {}
         # basename of images directory
-        imagedir = ""
+        self.imagedir = ""
         # relative path to image directory from current docname (used at writing docs)
-        imgpath = ""
+        self.imgpath = ""
 
         # these get set later
         self.parallel_ok = False

From a3f12e1cccb2eb819ae566914f9c0590f39ca4a0 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 1 Oct 2014 19:26:37 +0200
Subject: [PATCH 2/3] bizstyle: we now emit "code" instead of "tt".

---
 sphinx/themes/bizstyle/static/bizstyle.css_t | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sphinx/themes/bizstyle/static/bizstyle.css_t b/sphinx/themes/bizstyle/static/bizstyle.css_t
index 80b6dfe37..2b3964c2d 100644
--- a/sphinx/themes/bizstyle/static/bizstyle.css_t
+++ b/sphinx/themes/bizstyle/static/bizstyle.css_t
@@ -244,13 +244,13 @@ cite, code, tt {
     letter-spacing: 0.01em;
 }
 
-tt {
+code {
     background-color: #F2F2F2;
     border-bottom: 1px solid #ddd;
     color: #333;
 }
 
-tt.descname, tt.descclassname, tt.xref {
+code.descname, code.descclassname, code.xref {
     border: 0;
 }
 
@@ -259,12 +259,12 @@ hr {
     margin: 2em;
 }
 
-a tt {
+a code {
     border: 0;
     color: #CA7900;
 }
 
-a tt:hover {
+a code:hover {
     color: #2491CF;
 }
 

From ee245c7bf15b601c5369475ea1ab0854f39765f9 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 1 Oct 2014 19:58:36 +0200
Subject: [PATCH 3/3] Closes #1584: Point to master doc in HTML "top" link.

---
 CHANGES                         | 1 +
 sphinx/themes/basic/layout.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index b2c6fa2b8..a13654ee5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,7 @@ Bugs fixed
   searchindex. Thanks to Nathan Goldbaum.
 * #1576: Special toctree entry "self" located after another entry that also has
   a toctree was replaced with wrong title and link.
+* #1584: Point to master doc in HTML "top" link.
 
 
 Release 1.2.3 (released Sep 1, 2014)
diff --git a/sphinx/themes/basic/layout.html b/sphinx/themes/basic/layout.html
index f01c3aa07..552da6381 100644
--- a/sphinx/themes/basic/layout.html
+++ b/sphinx/themes/basic/layout.html
@@ -139,7 +139,7 @@
     {%- if hasdoc('copyright') %}
     <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
     {%- endif %}
-    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}" />
+    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto(master_doc) }}" />
     {%- if parents %}
     <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}" />
     {%- endif %}