Reflect merge of page.

diff --git a/doc/bugs/broken_parentlinks.mdwn b/doc/bugs/broken_parentlinks.mdwn
index f8f96b6cadbb45ce30004878ad7c59fd01369074..556d89b65eb0515de9ff250ed85c2649ba6382c1 100644 (file)
--- 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/*
 
 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
 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 341a5295346c06c8067d734f48f85b802f22f7d6..3bab61bc12c7f4f5429f3388717e3713bcc72027 100644 (file)
--- 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]]
 
 
 ## Sendmail -- [[todo/passwordauth:_sendmail_interface]]
 

-## Parentlinks -- [[bugs/non-existing_pages_in_parentlinks]]
+## [[bugs/Broken Parentlinks]]

 
 ## Discussion Pages of Discussion Pages of...
 
 
 ## Discussion Pages of Discussion Pages of...