Commits

Georg Brandl committed 17eead0 Merge

merge with 0.6

  • Participants
  • Parent commits 528c766, 2162efa

Comments (0)

Files changed (7)

 1f4cba6a285ae9042762fb7cdcf88c6db55b9da7 0.1.61843
 6d93c72d97d9e3cc7d2f3c03f279af0c7b1e85ff 0.1.61798
 17af190a72e157f767e30a284f49bdcd2b5a3689 0.1.61611
+24a2061063212f1951507a35ed589a55cd9dd962 0.6.4
 * 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.
 

File doc/_templates/index.html

   <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;

File sphinx/__init__.py

File contents unchanged.

File sphinx/builders/latex.py

             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")
 

File sphinx/config.py

             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)
 

File sphinx/ext/graphviz.py

File contents unchanged.