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.
This commit is contained in:
Justin Mayer 2013-04-12 08:48:42 -07:00
commit 886c8d649c
2 changed files with 11 additions and 3 deletions

View file

@ -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

View file

@ -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