From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Feb 2011 19:52:46 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110225~62
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/78e0eea5e7fd38903d6a80c9453275a7e074427e?hp=4786e4ed2a06bc79bf7281f9d8bbf680acf397fe

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---

diff --git a/doc/examples/blog/posts/sec_post.mdwn b/doc/examples/blog/posts/sec_post.mdwn
deleted file mode 100644
index 98a7c96fb..000000000
--- a/doc/examples/blog/posts/sec_post.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Hi there..
diff --git a/doc/tips/optimising_ikiwiki.mdwn b/doc/tips/optimising_ikiwiki.mdwn
index caed75ba6..d66ee9343 100644
--- a/doc/tips/optimising_ikiwiki.mdwn
+++ b/doc/tips/optimising_ikiwiki.mdwn
@@ -138,7 +138,7 @@ all the pages on a traditional, highly WikiLinked wiki, is asking for things
 to be slow. But using it to map a few related pages is probably fine.
 
 This site's own [[plugins/linkmap]] rarely slows it down, because it
-only shows the [[index]] page, and the small set of pages that link to it.
+only shows the index page, and the small set of pages that link to it.
 That is accomplished as follows:
 
 	\[[!linkmap pages="index or (backlink(index)"]]
diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index da0389261..7b65eba2e 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -147,7 +147,7 @@ wrong direction. (fixed --[[Joey]] )
 >>>> regardless whether the corresponding page exists or not.
 >>>> --[[David_Riebenbauer]]
 
->>>>> Sorry, I'll try to be clearer: `autoindex` hard-codes that the [[index]] page
+>>>>> Sorry, I'll try to be clearer: `autoindex` hard-codes that the index page
 >>>>> of the entire wiki is the one responsible for storing the page state. That
 >>>>> page isn't responsible for the creation of the tag page, it's just an
 >>>>> arbitrary page that's (more or less) guaranteed to exist. --[[smcv]]
diff --git a/doc/todo/toplevel_index.mdwn b/doc/todo/toplevel_index.mdwn
index 77e315811..92cef99ac 100644
--- a/doc/todo/toplevel_index.mdwn
+++ b/doc/todo/toplevel_index.mdwn
@@ -1,7 +1,7 @@
 Some inconsistences around the toplevel [[index]] page:
 
 * [[ikiwiki]] is a separate page; links to [[ikiwiki]] should better go to
-  the [[index]] though.
+  the index though.
 
   > At least for this wiki, I turned out to have a use for [[ikiwiki]]
   > pointing to a different page, though the general point might still