Merge commit 'origin/master'

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

diff --git a/doc/ikiwiki.mdwn b/doc/ikiwiki.mdwn
index 9f8693ec4a0c04c5d27cd4325734867303c9cc38..e0a971d96b631cc48a39b39f6dc9d27fee52bc6e 100644 (file)
--- a/doc/ikiwiki.mdwn
+++ b/doc/ikiwiki.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]

 This wiki is powered by [ikiwiki](http://ikiwiki.info/).
 [[!if test="enabled(version)"
      then="(Currently running version [[!version ]].)"
 This wiki is powered by [ikiwiki](http://ikiwiki.info/).
 [[!if test="enabled(version)"
      then="(Currently running version [[!version ]].)"


@@ -6,10 +7,10 @@ This wiki is powered by [ikiwiki](http://ikiwiki.info/).
 Some documentation on using ikiwiki:
 
 * [[ikiwiki/formatting]]
 Some documentation on using ikiwiki:
 
 * [[ikiwiki/formatting]]

-* [[ikiwiki/blog]]
-* [[ikiwiki/pagespec]]
-* [[ikiwiki/PreprocessorDirective]]

 * [[ikiwiki/wikilink]]
 * [[ikiwiki/wikilink]]

-* [[ikiwiki/markdown]]

 * [[ikiwiki/subpage]]
 * [[ikiwiki/subpage]]

+* [[ikiwiki/pagespec]]
+* [[ikiwiki/directive]]
+* [[ikiwiki/markdown]]

 * [[ikiwiki/openid]]
 * [[ikiwiki/openid]]

+* [[ikiwiki/searching]]