Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/ikiwiki.mdwn b/doc/ikiwiki.mdwn
index ad5485bb7d3827f8aa9957cb275bfeb704890567..e0a971d96b631cc48a39b39f6dc9d27fee52bc6e 100644 (file)
--- a/doc/ikiwiki.mdwn
+++ b/doc/ikiwiki.mdwn
@@ -1,7 +1,16 @@
-IkiWiki is the engine driving this wiki, which exists to document ikiWiki.
-The [[index]] is where you'll find actual useful info about it.
+[[!meta robots="noindex, follow"]]
+This wiki is powered by [ikiwiki](http://ikiwiki.info/).
+[[!if test="enabled(version)"
+     then="(Currently running version [[!version ]].)"
+]]

 
 

-Why call it IkiWiki? Well, partly because I'm sure some people will find
-this a pretty Iky Wiki, since it's so different from other Wikis. Partly
-because "ikiwiki" is a nice palindrome. Partly because its design turns
-the usual design for a Wiki inside-out and backwards.
+Some documentation on using ikiwiki:
+
+* [[ikiwiki/formatting]]
+* [[ikiwiki/wikilink]]
+* [[ikiwiki/subpage]]
+* [[ikiwiki/pagespec]]
+* [[ikiwiki/directive]]
+* [[ikiwiki/markdown]]
+* [[ikiwiki/openid]]
+* [[ikiwiki/searching]]