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

2012-10-28 23:50:49 +01:00 · 2012-10-28 23:50:49 +01:00 · 92d8208309
commit 92d8208309
parent 0ebba1c4ab 4234bfc1c2
9 changed files with 42 additions and 20 deletions
--- a/pelican/settings.py
+++ b/pelican/settings.py
@ -34,6 +34,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                   'PDF_GENERATOR': False,
                   'OUTPUT_SOURCES': False,
                   'OUTPUT_SOURCES_EXTENSION': '.text',
+                   'USE_FOLDER_AS_CATEGORY': True,
                   'DEFAULT_CATEGORY': 'misc',
                   'DEFAULT_DATE': 'fs',
                   'WITH_FUTURE_DATES': True,