From 6e5ed5af1550aad66d10ea645ff21755bb74c018 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 20 Jan 2008 21:27:32 +0100 Subject: Sync with ikiwiki 2.20 part III: Update content. --- ikiwiki/blog.mdwn | 2 ++ ikiwiki/formatting.mdwn | 2 +- ikiwiki/markdown.mdwn | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'ikiwiki') diff --git a/ikiwiki/blog.mdwn b/ikiwiki/blog.mdwn index fe83977..6e5eec4 100644 --- a/ikiwiki/blog.mdwn +++ b/ikiwiki/blog.mdwn @@ -93,3 +93,5 @@ directive: the rss/atom feeds. The default is the same as the `show` value above. * `feedonly` - Only generate the feed, do not display the pages inline on the page. +* `timeformat` - Use this to specify how to display the time or date for pages + in the blog. The format string is passed to the strftime(3) function. diff --git a/ikiwiki/formatting.mdwn b/ikiwiki/formatting.mdwn index 4e8760c..69e2891 100644 --- a/ikiwiki/formatting.mdwn +++ b/ikiwiki/formatting.mdwn @@ -1,4 +1,4 @@ -[[meta title="Help on formatting wiki pages"]] +[[meta title="Formatting wiki pages"]] Text on this wiki is, by default, written in a form very close to how you might write text for an email message. This style of text formatting is diff --git a/ikiwiki/markdown.mdwn b/ikiwiki/markdown.mdwn index e7823bb..73aee9c 100644 --- a/ikiwiki/markdown.mdwn +++ b/ikiwiki/markdown.mdwn @@ -2,7 +2,7 @@ is a minimal markup language that resembles plain text as used in email messages. It is the markup language used by this wiki by default. -For documentation about the markdown syntax, see [[HelpOnFormatting]] and +For documentation about the markdown syntax, see [[formatting]] and [Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). A [markdown mode](http://jrblevin.freeshell.org/software/markdown-mode/) for emacs can help in editing. @@ -10,4 +10,3 @@ emacs can help in editing. Note that [[WikiLink]]s and [[PreProcessorDirective]]s are not part of the markdown syntax, and are the only bit of markup that this wiki handles internally. - -- cgit v1.2.3