IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge with 0.6

Browse Source
This commit is contained in:
Georg Brandl
2010-01-12 23:40:26 +00:00
parent 59a7070e7e fa00d30daf
commit a7d9a4894b
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -76,8 +76,8 @@ Release 1.0 (in development)
* Added ``htmltitle`` block in layout template.
Release 0.6.4 (in development)
==============================
Release 0.6.4 (Jan 12, 2010)
============================
* Improve the handling of non-Unicode strings in the configuration.

6
doc/_templates/index.html vendored
View File

@@ -46,8 +46,10 @@
<p>
The <a href="http://docs.python.org/dev/">Python documentation</a> and
this page are different examples of Sphinx in use.
You can also download a <a href="http://sphinx.pocoo.org/sphinx.pdf">PDF version</a>
of the Sphinx documentation, generated from the LaTeX Sphinx produces.
You can also download PDF versions of the Sphinx documentation:
a <a href="http://sphinx.pocoo.org/sphinx.pdf">version</a> generated from
the LaTeX Sphinx produces, and a
<a href="http://sphinx.pocoo.org/sphinx-rst2pdf.pdf">version</a> generated by rst2pdf.
</p>
<p>
For examples of how Sphinx source files look, use the &#8220;Show source&#8221;

2
sphinx/builders/latex.py
View File

@@ -107,7 +107,7 @@ class LaTeXBuilder(Builder):
except UnicodeError:
self.warn("a Unicode error occurred when writing the output. "
"Please make sure all config values that contain "
"non-ASCII content are Unicode strings." % pagename)
"non-ASCII content are Unicode strings.")
return
self.info("done")

11
sphinx/config.py
View File

@@ -144,11 +144,12 @@ class Config(object):
config['tags'] = tags
olddir = os.getcwd()
try:
os.chdir(dirname)
execfile(config['__file__'], config)
except SyntaxError, err:
raise ConfigError('There is a syntax error in your '
'configuration file: ' + str(err))
try:
os.chdir(dirname)
execfile(config['__file__'], config)
except SyntaxError, err:
raise ConfigError('There is a syntax error in your '
'configuration file: ' + str(err))
finally:
os.chdir(olddir)