Fix #2968: autodoc: show-inheritance option breaks docstrings

15 files changed, 8 insertions, 7 deletions

diff --git a/CHANGES b/CHANGES
index e91ffda3b..a2b17f126 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,7 @@ Bugs fixed
   target.  Now `code-block` and `literalinclude` does not define hyperlink
   target using its caption automatially.
 * #2962: latex: missing label of longtable
+* #2968: autodoc: show-inheritance option breaks docstrings
 
 Release 1.4.6 (released Aug 20, 2016)
 =====================================
diff --git a/sphinx/locale/fr/LC_MESSAGES/sphinx.mo b/sphinx/locale/fr/LC_MESSAGES/sphinx.mo
index 2fc053015..d3c3535c9 100644
--- a/sphinx/locale/fr/LC_MESSAGES/sphinx.mo
+++ b/sphinx/locale/fr/LC_MESSAGES/sphinx.mo
diff --git a/sphinx/locale/fr/LC_MESSAGES/sphinx.po b/sphinx/locale/fr/LC_MESSAGES/sphinx.po
index 1a2b17b31..c476663be 100644
--- a/sphinx/locale/fr/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/fr/LC_MESSAGES/sphinx.po
@@ -446,7 +446,7 @@ msgstr "Page de recherche"
 #: sphinx/ext/autodoc.py:1265
 #, python-format
 msgid "   Bases: %s"
-msgstr "Bases: %s"
+msgstr "   Bases: %s"
 
 #: sphinx/ext/autodoc.py:1318
 #, python-format
diff --git a/sphinx/locale/it/LC_MESSAGES/sphinx.mo b/sphinx/locale/it/LC_MESSAGES/sphinx.mo
index b94e7dd12..271ff6ade 100644
--- a/sphinx/locale/it/LC_MESSAGES/sphinx.mo
+++ b/sphinx/locale/it/LC_MESSAGES/sphinx.mo
diff --git a/sphinx/locale/it/LC_MESSAGES/sphinx.po b/sphinx/locale/it/LC_MESSAGES/sphinx.po
index a76753180..b37c4410d 100644
--- a/sphinx/locale/it/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/it/LC_MESSAGES/sphinx.po
@@ -441,7 +441,7 @@ msgstr "Cerca"
 #: sphinx/ext/autodoc.py:1265
 #, python-format
 msgid "   Bases: %s"
-msgstr "Basi: %s"
+msgstr "   Basi: %s"
 
 #: sphinx/ext/autodoc.py:1318
 #, python-format
diff --git a/sphinx/locale/ne/LC_MESSAGES/sphinx.mo b/sphinx/locale/ne/LC_MESSAGES/sphinx.mo
index e3407aa17..bc4254590 100644
--- a/sphinx/locale/ne/LC_MESSAGES/sphinx.mo
+++ b/sphinx/locale/ne/LC_MESSAGES/sphinx.mo
diff --git a/sphinx/locale/ne/LC_MESSAGES/sphinx.po b/sphinx/locale/ne/LC_MESSAGES/sphinx.po
index f6a888eac..d1be56a01 100644
--- a/sphinx/locale/ne/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/ne/LC_MESSAGES/sphinx.po
@@ -439,7 +439,7 @@ msgstr "पानामा खोज्नुहोस्"
 #: sphinx/ext/autodoc.py:1265
 #, python-format
 msgid "   Bases: %s"
-msgstr "Bases: %s"
+msgstr "   Bases: %s"
 
 #: sphinx/ext/autodoc.py:1318
 #, python-format
diff --git a/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.mo b/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.mo
index 725899257..73c921db2 100644
--- a/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.mo
+++ b/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.mo
diff --git a/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po b/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po
index 8b9504a62..b920ec68e 100644
--- a/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/pt_BR/LC_MESSAGES/sphinx.po
@@ -440,7 +440,7 @@ msgstr "Página de Busca"
 #: sphinx/ext/autodoc.py:1265
 #, python-format
 msgid "   Bases: %s"
-msgstr "Bases: %s"
+msgstr "   Bases: %s"
 
 #: sphinx/ext/autodoc.py:1318
 #, python-format
diff --git a/sphinx/locale/pt_PT/LC_MESSAGES/sphinx.mo b/sphinx/locale/pt_PT/LC_MESSAGES/sphinx.mo
index d9784a0ca..3f664cff4 100644
--- a/sphinx/locale/pt_PT/LC_MESSAGES/sphinx.mo
+++ b/sphinx/locale/pt_PT/LC_MESSAGES/sphinx.mo
diff --git a/sphinx/locale/pt_PT/LC_MESSAGES/sphinx.po b/sphinx/locale/pt_PT/LC_MESSAGES/sphinx.po
index 73e010beb..e64c81c3c 100644
--- a/sphinx/locale/pt_PT/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/pt_PT/LC_MESSAGES/sphinx.po
@@ -439,7 +439,7 @@ msgstr "Página de Pesquisa"
 #: sphinx/ext/autodoc.py:1265
 #, python-format
 msgid "   Bases: %s"
-msgstr "Bases: %s"
+msgstr "   Bases: %s"
 
 #: sphinx/ext/autodoc.py:1318
 #, python-format
diff --git a/sphinx/locale/ro/LC_MESSAGES/sphinx.mo b/sphinx/locale/ro/LC_MESSAGES/sphinx.mo
index 756b65623..50b1b0f16 100644
--- a/sphinx/locale/ro/LC_MESSAGES/sphinx.mo
+++ b/sphinx/locale/ro/LC_MESSAGES/sphinx.mo
diff --git a/sphinx/locale/ro/LC_MESSAGES/sphinx.po b/sphinx/locale/ro/LC_MESSAGES/sphinx.po
index 79f0f65ad..01b56c264 100644
--- a/sphinx/locale/ro/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/ro/LC_MESSAGES/sphinx.po
@@ -439,7 +439,7 @@ msgstr "Pagină de Căutare"
 #: sphinx/ext/autodoc.py:1265
 #, python-format
 msgid "   Bases: %s"
-msgstr "Baze: %s"
+msgstr "   Baze: %s"
 
 #: sphinx/ext/autodoc.py:1318
 #, python-format
diff --git a/sphinx/locale/sk/LC_MESSAGES/sphinx.mo b/sphinx/locale/sk/LC_MESSAGES/sphinx.mo
index a4a69b2a2..9cbffc96d 100644
--- a/sphinx/locale/sk/LC_MESSAGES/sphinx.mo
+++ b/sphinx/locale/sk/LC_MESSAGES/sphinx.mo
diff --git a/sphinx/locale/sk/LC_MESSAGES/sphinx.po b/sphinx/locale/sk/LC_MESSAGES/sphinx.po
index 236ab8618..d685b82be 100644
--- a/sphinx/locale/sk/LC_MESSAGES/sphinx.po
+++ b/sphinx/locale/sk/LC_MESSAGES/sphinx.po
@@ -440,7 +440,7 @@ msgstr "Stránka hľadania"
 #: sphinx/ext/autodoc.py:1265
 #, python-format
 msgid "   Bases: %s"
-msgstr "Základné: %s"
+msgstr "   Základné: %s"
 
 #: sphinx/ext/autodoc.py:1318
 #, python-format