From fb1cfc35bf5e9c899946b2d21741468879785a90 Mon Sep 17 00:00:00 2001 From: Iuri de Silvio Date: Sun, 5 Jan 2014 18:15:45 -0200 Subject: [PATCH] Change CATEGORIES_URL and CATEGORIES_SAVE_AS docs to make it consistent with TAGS_URL and TAGS_SAVE_AS. Add default values to CATEGORIES_URL and CATEGORIES_SAVE_AS. --- docs/settings.rst | 4 ++-- pelican/settings.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/settings.rst b/docs/settings.rst index e33d8e09..30507efd 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -248,8 +248,8 @@ Setting name (default value) What does it do? use the default language. `PAGE_LANG_SAVE_AS` (``'pages/{slug}-{lang}.html'``) The location we will save the page which doesn't use the default language. -`CATEGORIES_URL` (``'categories/'``) The URL to use for the category list. -`CATEGORIES_SAVE_AS` (``'categories/index.html'``) The location to save the category list. +`CATEGORIES_URL` (``'categories.html'``) The URL to use for the category list. +`CATEGORIES_SAVE_AS` (``'categories.html'``) The location to save the category list. `CATEGORY_URL` (``'category/{slug}.html'``) The URL to use for a category. `CATEGORY_SAVE_AS` (``'category/{slug}.html'``) The location to save a category. `TAG_URL` (``'tag/{slug}.html'``) The URL to use for a tag. diff --git a/pelican/settings.py b/pelican/settings.py index 99828935..8cbc4694 100644 --- a/pelican/settings.py +++ b/pelican/settings.py @@ -68,6 +68,8 @@ DEFAULT_CONFIG = { 'PDF_GENERATOR': False, 'PDF_STYLE_PATH': '', 'PDF_STYLE': 'twelvepoint', + 'CATEGORIES_URL': 'categories.html', + 'CATEGORIES_SAVE_AS': 'categories.html', 'CATEGORY_URL': 'category/{slug}.html', 'CATEGORY_SAVE_AS': os.path.join('category', '{slug}.html'), 'TAG_URL': 'tag/{slug}.html',