merge the plugin branch

This commit is contained in:
Alexis Metaireau 2012-06-10 01:14:30 +02:00
commit 6a0937a9e8
14 changed files with 356 additions and 3 deletions

View file

@ -61,6 +61,7 @@ Setting name (default value) What doe
`rst2pdf`.
`RELATIVE_URLS` (``True``) Defines whether Pelican should use relative URLs or
not.
`PLUGINS` (``[]``) The list of plugins to load. See :ref:`plugins`.
`SITENAME` (``'A Pelican Blog'``) Your site name
`SITEURL` Base URL of your website. Not defined by default,
which means the base URL is assumed to be "/" with a