From 886c8d649c28bb169e91030c1531dfc2c6290dfd Mon Sep 17 00:00:00 2001 From: Justin Mayer Date: Fri, 12 Apr 2013 08:48:42 -0700 Subject: [PATCH] Better defaults for quickstart settings files Since feed generation is usually unnecessary during development (and can produce potentially-confusing warnings when SITEURL is not set), running "make html" will now skip feed generation by default. Feed generation settings have been added to publishconf.py so feeds will be generated when the site is published. Also corrected some URLs in pelicanconf.py. --- pelican/tools/templates/pelicanconf.py.in | 11 ++++++++--- pelican/tools/templates/publishconf.py.in | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pelican/tools/templates/pelicanconf.py.in b/pelican/tools/templates/pelicanconf.py.in index 9ef94553..265b59c2 100644 --- a/pelican/tools/templates/pelicanconf.py.in +++ b/pelican/tools/templates/pelicanconf.py.in @@ -9,10 +9,15 @@ TIMEZONE = 'Europe/Paris' DEFAULT_LANG = $lang +# Feed generation is usually not desired when developing +FEED_ALL_ATOM = None +CATEGORY_FEED_ATOM = None +TRANSLATION_FEED_ATOM = None + # Blogroll -LINKS = (('Pelican', 'http://docs.notmyidea.org/alexis/pelican/'), - ('Python.org', 'http://python.org'), - ('Jinja2', 'http://jinja.pocoo.org'), +LINKS = (('Pelican', 'http://getpelican.com/'), + ('Python.org', 'http://python.org/'), + ('Jinja2', 'http://jinja.pocoo.org/'), ('You can modify those links in your config file', '#'),) # Social widget diff --git a/pelican/tools/templates/publishconf.py.in b/pelican/tools/templates/publishconf.py.in index 20e5ced9..4c4f052a 100755 --- a/pelican/tools/templates/publishconf.py.in +++ b/pelican/tools/templates/publishconf.py.in @@ -12,6 +12,9 @@ from pelicanconf import * SITEURL = '$siteurl' RELATIVE_URLS = False +FEED_ALL_ATOM = 'feeds/all.atom.xml' +CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml' + DELETE_OUTPUT_DIRECTORY = True # Following items are often useful when publishing