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

diff --git a/doc/bugs/Underscores_in_links_don__39__t_appear.mdwn b/doc/bugs/Underscores_in_links_don__39__t_appear.mdwn
index b25dfb7fe2af1b3e27f562cda1c0c8581c9e1d0b..b3cacdb6e1128561626809d921c180d86608e2bd 100644 (file)
--- a/doc/bugs/Underscores_in_links_don__39__t_appear.mdwn
+++ b/doc/bugs/Underscores_in_links_don__39__t_appear.mdwn
@@ -16,3 +16,5 @@ I would like to be able to create links with underscores. I realize this is a fe
 > i assume that this behavior stems from times when wikilinks and [[ikiwiki/directive]]s were not distinguished by \[[ vs \[[! but by the use of whitespace in directives, so whitespace had to be avoided in wikilinks.
 >
 > --[[chrysn]]
+
+> having hacked around in the [[plugins/link]] plugin, i can confirm that the link texts are explicitly de-escaped, and that when no pipe is inside the link (ie links like `\[[cmd_test]]`), the string `"cmd_test"` is regarded as a link (that will subsequently be converted to a readable text) rather than as a readable text (for which a suitable link target is found automatically). --[[chrysn]]

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 89802c604c0803af0d78e4db7254a97751ff7fc8..0e2a6ff399a642e1b4da295de735eb4e412b55f2 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -20,11 +20,11 @@ All wikis are supposed to have a [[sandbox]], so this one does too.
 This site generally runs the latest release of ikiwiki; currently, it runs
 ikiwiki [[!version ]].
 
-## developer resources
+## developer resources 
 
 The [[RoadMap]] describes where the project is going.
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
-can be submitted and tracked using this wiki.
+can be submitted and tracked using this wiki. [[portedeurope.org|http://www.portedeurope.org]]
 
 Ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].

diff --git a/doc/users/chrysn/interests.mdwn b/doc/users/chrysn/interests.mdwn
index a5c8f33bf218a90f7a819efec8a85d4f8a872321..f2afbd9c7e58723a1ba3835a821a9b0c4e70e929 100644 (file)
--- a/doc/users/chrysn/interests.mdwn
+++ b/doc/users/chrysn/interests.mdwn
@@ -2,6 +2,7 @@ these are the topics [[chrysn]] is or was interested in inside ikiwiki:
 
 * [[bugs/linkmap displays underscore escapes]]
 * [[bugs/methodResponse in add__95__plugins]]
+* [[bugs/preprocessing loop control too tight]]
 * [[bugs/proxy.py utf8 troubles]]
 * [[bugs/Underscores in links don't appear]]
 * [[bugs/unicode encoded urls and recentchanges]]