summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Mayer <entroP@gmail.com>2014-09-18 16:17:46 -0700
committerJustin Mayer <entroP@gmail.com>2014-09-18 16:17:46 -0700
commit426c7428d694db21d89195de699f2867e57b753e (patch)
tree11b8144a503b12f378a5666b5b358a61d65f3ab5
parentfbc65e0d7b5bc9d4f4597f56def97fe18759afd4 (diff)
parentb3b65d77e0893f52d81b436693d4dd03999067cc (diff)
downloadpelican-426c7428d694db21d89195de699f2867e57b753e.tar.gz
Merge pull request #1426 from barrysteyn/DOCUTILS_SETTINGS
Documents DOCUTILS_SETTINGS and initializes it. Fixes #1425
-rw-r--r--docs/settings.rst5
-rw-r--r--pelican/settings.py1
2 files changed, 6 insertions, 0 deletions
diff --git a/docs/settings.rst b/docs/settings.rst
index 87465437..bd29a409 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -58,6 +58,10 @@ Setting name (followed by default value, if any)
``datetime.datetime`` constructor.
``DEFAULT_METADATA = ()`` The default metadata you want to use for all articles
and pages.
+``DOCUTILS_SETTINGS = {}`` Extra configuration settings for the docutils publisher
+ (applicable only to reStructuredText). See `Docutils
+ Configuration`_ settings for more details.
+
``FILENAME_METADATA =`` ``'(?P<date>\d{4}-\d{2}-\d{2}).*'`` The regexp that will be used to extract any metadata
from the filename. All named groups that are matched
will be set in the metadata object.
@@ -845,3 +849,4 @@ Example settings
.. _Jinja custom filters documentation: http://jinja.pocoo.org/docs/api/#custom-filters
+.. _Docutils Configuration: http://docutils.sourceforge.net/docs/user/config.html
diff --git a/pelican/settings.py b/pelican/settings.py
index 361e1ed5..631c6d24 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -49,6 +49,7 @@ DEFAULT_CONFIG = {
'SITENAME': 'A Pelican Blog',
'DISPLAY_PAGES_ON_MENU': True,
'DISPLAY_CATEGORIES_ON_MENU': True,
+ 'DOCUTILS_SETTINGS': {},
'OUTPUT_SOURCES': False,
'OUTPUT_SOURCES_EXTENSION': '.text',
'USE_FOLDER_AS_CATEGORY': True,