The behavior of :confval:html_file_suffix changed slightly: the empty string now means "no suffix" instead of "default suffix", use `None` for "default suffix".

This commit is contained in:
Georg Brandl 2010-07-17 19:45:54 +02:00
parent 9f4c61b154
commit 2b29038d0c
4 changed files with 8 additions and 5 deletions

View File

@ -81,6 +81,9 @@ Features added
- Added :confval:`html_show_copyright` config value. - Added :confval:`html_show_copyright` config value.
- Added :confval:`latex_show_pagerefs` and :confval:`latex_show_urls` - Added :confval:`latex_show_pagerefs` and :confval:`latex_show_urls`
config values. config values.
- The behavior of :confval:`html_file_suffix` changed slightly: the
empty string now means "no suffix" instead of "default suffix", use
``None`` for "default suffix".
* New builders: * New builders:

View File

@ -626,8 +626,8 @@ that use Sphinx' HTMLWriter class.
.. confval:: html_file_suffix .. confval:: html_file_suffix
If nonempty, this is the file name suffix for generated HTML files. The This is the file name suffix for generated HTML files. The default is
default is ``".html"``. ``".html"``.
.. versionadded:: 0.4 .. versionadded:: 0.4

View File

@ -99,7 +99,7 @@ class StandaloneHTMLBuilder(Builder):
self.init_templates() self.init_templates()
self.init_highlighter() self.init_highlighter()
self.init_translator_class() self.init_translator_class()
if self.config.html_file_suffix: if self.config.html_file_suffix is not None:
self.out_suffix = self.config.html_file_suffix self.out_suffix = self.config.html_file_suffix
if self.config.html_link_suffix is not None: if self.config.html_link_suffix is not None:

View File

@ -186,8 +186,8 @@ html_static_path = ['%(dot)sstatic']
# base URL from which the finished HTML is served. # base URL from which the finished HTML is served.
#html_use_opensearch = '' #html_use_opensearch = ''
# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml"). # This is the file name suffix for HTML files (e.g. ".xhtml").
#html_file_suffix = '' #html_file_suffix = None
# Output file base name for HTML help builder. # Output file base name for HTML help builder.
htmlhelp_basename = '%(project_fn)sdoc' htmlhelp_basename = '%(project_fn)sdoc'