Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / plugins / prettydate.mdwn

diff --git a/doc/plugins/prettydate.mdwn b/doc/plugins/prettydate.mdwn
index 17d6ae3e901c4678b2bb26c70ce1a95c8399a0e5..11ad4252fb16b1862b1a0bb0474de957eb5ec350 100644 (file)
--- a/doc/plugins/prettydate.mdwn
+++ b/doc/plugins/prettydate.mdwn
@@ -1,9 +1,9 @@
-[[template id=plugin name=prettydate author="[[Joey]]"]]
-[[tag type/format]]
+[[!template id=plugin name=prettydate author="[[Joey]]"]]
+[[!tag type/date]]

 
 Enabling this plugin changes the dates displayed on pages in the wiki to
 
 Enabling this plugin changes the dates displayed on pages in the wiki to

-a format that is nice and easy to read. Examples: "in late evening on
-February 14th, 2007", "at noon on March 15th, 2007"
+a format that is nice and easy to read. Examples: "late Wednesday evening, 
+February 14th, 2007", "at midnight, March 15th, 2007"

 
 The names given to each of the hours in the day can be customised by
 setting the `timetable` configuration variable in ikiwiki's setup file.
 
 The names given to each of the hours in the day can be customised by
 setting the `timetable` configuration variable in ikiwiki's setup file.


@@ -14,6 +14,6 @@ since they do not occupy the whole hour.
 
 The format used for the date can be customised using the `prettydateformat`
 configuration variable in the setup file. `%X` will be expanded to the
 
 The format used for the date can be customised using the `prettydateformat`
 configuration variable in the setup file. `%X` will be expanded to the

-prettified time value. The default prettydateformat is `"%X %B %o, %Y"`.
+prettified time value. The default prettydateformat is `"%X, %B %o, %Y"`.

 
 

-This plugin uses the [[cpan TimeDate]] perl module.
+This plugin uses the [[!cpan TimeDate]] perl module.