Merge branch '3.x'

Resolved Conflicts:
	sphinx/texinputs/sphinx.sty

	modified:   CHANGES
	modified:   sphinx/texinputs/sphinxlatexstyleheadings.sty

1 files changed, 5 insertions, 5 deletions

diff --git a/sphinx/texinputs/sphinxlatexstyleheadings.sty b/sphinx/texinputs/sphinxlatexstyleheadings.sty
index 177fe8c1f..6d9f0f689 100644
--- a/sphinx/texinputs/sphinxlatexstyleheadings.sty
+++ b/sphinx/texinputs/sphinxlatexstyleheadings.sty
@@ -35,16 +35,16 @@
 % Augment the sectioning commands used to get our own font family in place,
 % and reset some internal data items (\titleformat from titlesec package)
 \titleformat{\section}{\Large\py@HeaderFamily}%
-            {\py@TitleColor\thesection}{0.5em}{\py@TitleColor}{\py@NormalColor}
+            {\py@TitleColor\thesection}{0.5em}{\py@TitleColor}
 \titleformat{\subsection}{\large\py@HeaderFamily}%
-            {\py@TitleColor\thesubsection}{0.5em}{\py@TitleColor}{\py@NormalColor}
+            {\py@TitleColor\thesubsection}{0.5em}{\py@TitleColor}
 \titleformat{\subsubsection}{\py@HeaderFamily}%
-            {\py@TitleColor\thesubsubsection}{0.5em}{\py@TitleColor}{\py@NormalColor}
+            {\py@TitleColor\thesubsubsection}{0.5em}{\py@TitleColor}
 % By default paragraphs (and subsubsections) will not be numbered because
 % sphinxmanual.cls and sphinxhowto.cls set secnumdepth to 2
 \titleformat{\paragraph}{\py@HeaderFamily}%
-            {\py@TitleColor\theparagraph}{0.5em}{\py@TitleColor}{\py@NormalColor}
+            {\py@TitleColor\theparagraph}{0.5em}{\py@TitleColor}
 \titleformat{\subparagraph}{\py@HeaderFamily}%
-            {\py@TitleColor\thesubparagraph}{0.5em}{\py@TitleColor}{\py@NormalColor}
+            {\py@TitleColor\thesubparagraph}{0.5em}{\py@TitleColor}
 
 \endinput
\ No newline at end of file