From da5db5aac9311d62ddbb5f34060c50ec6ab17138 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Wed, 18 Jul 2012 18:22:31 +0200 Subject: [PATCH 1/5] Add documentation for abbr in reST. --- docs/getting_started.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/getting_started.rst b/docs/getting_started.rst index 93d578a0..4d9af804 100644 --- a/docs/getting_started.rst +++ b/docs/getting_started.rst @@ -142,6 +142,11 @@ following syntax (give your file the ``.rst`` extension):: :category: yeah :author: Alexis Metaireau +Pelican implements an extension of reStructuredText to enable support for the +``abbr`` HTML tag. To use it, write something like this in your post:: + + This will be turned into :abbr:`HTML (HyperText Markup Language)`. + You can also use Markdown syntax (with a file ending in ``.md``). Markdown generation will not work until you explicitly install the ``Markdown`` package, which can be done via ``pip install Markdown``. Metadata syntax for From a84d0bf5c581d8e92c7a5367c10ec6b683c88d04 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Wed, 18 Jul 2012 18:28:34 +0200 Subject: [PATCH 2/5] Add CHANGELOG note about abbr --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 373892cf..02a6f4f7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,7 @@ * Added functional tests * Rsync support in the generated Makefile * Improved feed support (easily pluggable with feedburner for instance) +* Added support for abbr in reST 2.8 From d6f358182a6d4d4e5863002490ed6e94977cd865 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Wed, 18 Jul 2012 18:41:09 +0200 Subject: [PATCH 3/5] Move changelog into docs --- CHANGELOG => docs/changelog.rst | 17 ++++++++++++++++- docs/index.rst | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) rename CHANGELOG => docs/changelog.rst (96%) diff --git a/CHANGELOG b/docs/changelog.rst similarity index 96% rename from CHANGELOG rename to docs/changelog.rst index 02a6f4f7..15d9110c 100644 --- a/CHANGELOG +++ b/docs/changelog.rst @@ -1,4 +1,8 @@ +Release history +############### + 3.0 - XX/XX/XXXX +================ * Refactored the way URL are handled. * Improved the english documentation @@ -16,6 +20,7 @@ * Added support for abbr in reST 2.8 +=== * dotclear importer * Allow the usage of markdown extensions @@ -35,6 +40,7 @@ * Enhanced the documentation 2.7 +=== * Uses logging rather than echoing to stdout * Support custom jinja filters @@ -44,6 +50,7 @@ * Add draft support 2.6 +=== * changes in the output directory structure * makes templates easier to work with / create @@ -61,6 +68,7 @@ * Add skribit support 2.5 +=== * import from wordpress * add some new themes (martyalchin / wide-notmyidea) @@ -72,6 +80,7 @@ * use relative urls not static ones 2.4 +=== * minor themes changes * add disqus support (so we have comments) @@ -80,30 +89,36 @@ * blog entries can also be generated in pdf 2.3 +=== * markdown support 2.2 +=== * Prettify output * Manages static pages as well 2.1 +=== * Put the notmyidea theme by default 2.0 +=== * Refactoring to be more extensible * Change into the setting variables 1.2 +=== * Add a debug option * Add feeds per category * Use filsystem to get dates if no metadata provided * Add pygment support -1.1: +1.1 +=== * first working version diff --git a/docs/index.rst b/docs/index.rst index 34a1355c..32045019 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -69,3 +69,4 @@ A French version of the documentation is available at :doc:`fr/index`. tips contribute report + changelog From 3277a219fd3fd6fc8b5f3a7fa8c42694fedf3d04 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Wed, 18 Jul 2012 18:51:15 +0200 Subject: [PATCH 4/5] Add some reST markup to changelog, tweak language --- docs/changelog.rst | 104 ++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 15d9110c..062e4a36 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -4,94 +4,94 @@ Release history 3.0 - XX/XX/XXXX ================ -* Refactored the way URL are handled. -* Improved the english documentation -* Fixed packaging using setuptools entrypoints -* Added typogrify support +* Refactored the way URLs are handled +* Improved the English documentation +* Fixed packaging using ``setuptools`` entrypoints +* Added ``typogrify`` support * Added a way to disable feed generation -* Added support for DIRECT_TEMPLATES +* Added support for ``DIRECT_TEMPLATES`` * Allow multiple extensions for content files * Added less support * Improved the import script * Fixed a bunch of bugs :-) * Added functional tests * Rsync support in the generated Makefile -* Improved feed support (easily pluggable with feedburner for instance) -* Added support for abbr in reST +* Improved feed support (easily pluggable with Feedburner for instance) +* Added support for ``abbr`` in reST 2.8 === -* dotclear importer -* Allow the usage of markdown extensions +* Dotclear importer +* Allow the usage of Markdown extensions * Themes are now easily extensible -* Don't output pagination information if there is only one page. +* Don't output pagination information if there is only one page * Add a page per author, with all their articles * Improved the test suite -* Made the themes more easy to extend +* Made the themes easier to extend * Removed Skribit support -* Added a "pelican-quickstart" script +* Added a ``pelican-quickstart`` script * Fixed timezone-related issues -* Add some scripts for windows support +* Added some scripts for Windows support * Date can be specified in seconds * Never fail when generating posts (skip and continue) * Allow the use of future dates -* Support having different timezones per languages. +* Support having different timezones per language * Enhanced the documentation 2.7 === -* Uses logging rather than echoing to stdout -* Support custom jinja filters -* Compatibility with python 2.5 -* Add a theme manager -* Packaged for debian -* Add draft support +* Use ``logging`` rather than echoing to stdout +* Support custom Jinja filters +* Compatibility with Python 2.5 +* Added a theme manager +* Packaged for Debian +* Added draft support 2.6 === -* changes in the output directory structure -* makes templates easier to work with / create -* Add RSS support (was only atom previously) -* Add tag support for the feeds +* Changes in the output directory structure +* Makes templates easier to work with / create +* Added RSS support (was Atom-only) +* Added tag support for the feeds * Enhance the documentation -* Add another theme (brownstone) -* Add translations -* Add a way to use "cleaner urls" with a rewrite url module (or equivalent) -* Add a tag cloud -* Add an autoreloading feature: the blog is automatically regenerated each time a modification is detected -* Translate the documentation in french -* import a blog from an rss feed +* Added another theme (brownstone) +* Added translations +* Added a way to use cleaner URLs with a rewrite url module (or equivalent) +* Added a tag cloud +* Added an autoreloading feature: the blog is automatically regenerated each time a modification is detected +* Translate the documentation into French +* Import a blog from an RSS feed * Pagination support -* Add skribit support +* Added Skribit support 2.5 === -* import from wordpress -* add some new themes (martyalchin / wide-notmyidea) -* first bug report ! -* linkedin support -* added a FAQ -* google analytics support -* twitter support -* use relative urls not static ones +* Import from Wordpress +* Added some new themes (martyalchin / wide-notmyidea) +* First bug report! +* Linkedin support +* Added a FAQ +* Google Analytics support +* Twitter support +* Use relative URLs, not static ones 2.4 === -* minor themes changes -* add disqus support (so we have comments) -* another code refactoring -* add config settings about pages -* blog entries can also be generated in pdf +* Minor themes changes +* Add Disqus support (so we have comments) +* Another code refactoring +* Added config settings about pages +* Blog entries can also be generated in PDF 2.3 === -* markdown support +* Markdown support 2.2 === @@ -102,7 +102,7 @@ Release history 2.1 === -* Put the notmyidea theme by default +* Make notmyidea the default theme 2.0 === @@ -113,12 +113,12 @@ Release history 1.2 === -* Add a debug option -* Add feeds per category -* Use filsystem to get dates if no metadata provided -* Add pygment support +* Added a debug option +* Added per-category feeds +* Use filesystem to get dates if no metadata is provided +* Add Pygments support 1.1 === -* first working version +* First working version From 73351e1eab9fe22843863290eb83aeaf4a42099f Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Wed, 18 Jul 2012 18:59:23 +0200 Subject: [PATCH 5/5] Add dates to changelog --- docs/changelog.rst | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 062e4a36..4508b39e 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,7 +1,7 @@ Release history ############### -3.0 - XX/XX/XXXX +3.0 (XXXX-XX-XX) ================ * Refactored the way URLs are handled @@ -19,8 +19,8 @@ Release history * Improved feed support (easily pluggable with Feedburner for instance) * Added support for ``abbr`` in reST -2.8 -=== +2.8 (2012-02-28) +================ * Dotclear importer * Allow the usage of Markdown extensions @@ -39,8 +39,8 @@ Release history * Support having different timezones per language * Enhanced the documentation -2.7 -=== +2.7.0 (2011-06-11) +================== * Use ``logging`` rather than echoing to stdout * Support custom Jinja filters @@ -49,8 +49,8 @@ Release history * Packaged for Debian * Added draft support -2.6 -=== +2.6.0 (2011-03-08) +================== * Changes in the output directory structure * Makes templates easier to work with / create @@ -67,8 +67,8 @@ Release history * Pagination support * Added Skribit support -2.5 -=== +2.5.0 (2010-11-20) +================== * Import from Wordpress * Added some new themes (martyalchin / wide-notmyidea) @@ -79,8 +79,8 @@ Release history * Twitter support * Use relative URLs, not static ones -2.4 -=== +2.4 (2010-11-06) +================ * Minor themes changes * Add Disqus support (so we have comments) @@ -88,37 +88,37 @@ Release history * Added config settings about pages * Blog entries can also be generated in PDF -2.3 -=== +2.3 (2010-10-31) +================ * Markdown support -2.2 -=== +2.2 (2010-10-30) +================ * Prettify output * Manages static pages as well -2.1 -=== +2.1 (2010-10-30) +================ * Make notmyidea the default theme -2.0 -=== +2.0 (2010-10-30) +================ * Refactoring to be more extensible * Change into the setting variables -1.2 -=== +1.2 (2010-09-28) +================ * Added a debug option * Added per-category feeds * Use filesystem to get dates if no metadata is provided * Add Pygments support -1.1 -=== +1.1 (2010-08-19) +================ * First working version