Merge remote-tracking branch 'upstream/master'

Conflicts:
	docs/conf.py
This commit is contained in:
Andrew Macgregor
2012-10-20 09:17:18 +08:00
+1 -1
View File
@@ -103,7 +103,7 @@ html_theme_path = ['_themes']
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
html_title = u'The Hitchhikers Guide to Python'
html_title = 'The Hitchhiker\'s Guide to Python'
# A shorter title for the navigation bar. Default is the same as html_title.
#html_short_title = None