summaryrefslogtreecommitdiff
path: root/ikiwiki
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-01-20 21:27:32 +0100
committerJonas Smedegaard <dr@jones.dk>2008-01-20 21:27:32 +0100
commit6e5ed5af1550aad66d10ea645ff21755bb74c018 (patch)
treedb2466dc4e7b4c034991c59bcb13cd05d30a1f8c /ikiwiki
parent4db4a3da3cce013edf2a38dd3f638014e4782edf (diff)
Sync with ikiwiki 2.20 part III: Update content.
Diffstat (limited to 'ikiwiki')
-rw-r--r--ikiwiki/blog.mdwn2
-rw-r--r--ikiwiki/formatting.mdwn2
-rw-r--r--ikiwiki/markdown.mdwn3
3 files changed, 4 insertions, 3 deletions
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.
-