aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-08-11 14:58:54 +0200
committerJoey Hess <joey@kitenet.net>2013-08-11 14:58:54 +0200
commit63078f2e4f145f8e14e281ed1eb265a67b87b9ea (patch)
tree9f5b8474f574a6a15497a18caacae9d5ef933575
parent0d5019fcdd069317ab7648c25d8d8c61efbd98ee (diff)
parent854588d33d9cbfa13503bdc988961f17197669e1 (diff)
downloadikiwiki-63078f2e4f145f8e14e281ed1eb265a67b87b9ea.tar
ikiwiki-63078f2e4f145f8e14e281ed1eb265a67b87b9ea.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info
-rw-r--r--doc/bugs/Underscores_in_links_don__39__t_appear.mdwn2
-rw-r--r--doc/index.mdwn4
-rw-r--r--doc/users/chrysn/interests.mdwn1
3 files changed, 5 insertions, 2 deletions
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 b25dfb7fe..b3cacdb6e 100644
--- 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 89802c604..0e2a6ff39 100644
--- 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 a5c8f33bf..f2afbd9c7 100644
--- 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]]