From: Thomas Schwinge <tschwinge@gnu.org>
Date: Sat, 17 Oct 2009 13:00:12 +0000 (+0200)
Subject: Reflect merge of page.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/f71e84c918827a482158073af45fa7f9acc5ed31

Reflect merge of page.
---

diff --git a/doc/bugs/broken_parentlinks.mdwn b/doc/bugs/broken_parentlinks.mdwn
index f8f96b6ca..556d89b65 100644
--- a/doc/bugs/broken_parentlinks.mdwn
+++ b/doc/bugs/broken_parentlinks.mdwn
@@ -10,7 +10,7 @@ a dead link for every subpage.
 
 This is a bug, but fixing it is very tricky. Consider what would happen if
 example.mdwn were created: example/page.html and the rest of example/*
-would need to be updated to change the parentlink from a bare work to a
+would need to be updated to change the parentlink from a bare word to a
 link to the new page. Now if example.mdwn were removed again, they'd need
 to be updated again. So example/* depends on example. But it's even more
 tricky, because if example.mdwn is modified, we _don't_ want to rebuild
diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 341a52953..3bab61bc1 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -75,7 +75,7 @@ pages could perhaps be passed on to the referred-to page?
 
 ## Sendmail -- [[todo/passwordauth:_sendmail_interface]]
 
-## Parentlinks -- [[bugs/non-existing_pages_in_parentlinks]]
+## [[bugs/Broken Parentlinks]]
 
 ## Discussion Pages of Discussion Pages of...