Merge branch 'master' of github.com:ametaireau/pelican

2012-03-11 02:50:37 +01:00 · 2012-03-11 02:50:37 +01:00 · 189da25c5b
commit 189da25c5b
parent d43bd1dcb8 f076f64404
5 changed files with 34 additions and 12 deletions
--- a/pelican/settings.py
+++ b/pelican/settings.py
@ -8,6 +8,10 @@ from pelican import log
 DEFAULT_THEME = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
                              "themes/notmyidea"])
 _DEFAULT_CONFIG = {'PATH': None,
+                   'ARTICLE_DIR': '',
+                   'ARTICLE_EXCLUDES': ('pages',),
+                   'PAGE_DIR': 'pages',
+                   'PAGE_EXCLUDES': (),
                   'THEME': DEFAULT_THEME,
                   'OUTPUT_PATH': 'output/',
                   'MARKUP': ('rst', 'md'),