Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / bugs / Spaces_in_link_text_for_ikiwiki_links.mdwn

diff --git a/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn b/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn
index 56cda026f606047ef67539287c8f5c22bf22f7b5..8aea5cd29d19bd401e53ee1a27515da99cc91e30 100644 (file)
--- a/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn
+++ b/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn
@@ -1,7 +1,7 @@
 Versions 2.0 and 2.1 of ikiwiki, and I think earlier versions as well,
-allowed wiki links to have spaces in the link text. For example, [[ikiwiki
+allowed wiki links to have spaces in the link text. For example, [[!ikiwiki
 logo page|logo]] should create an anchor tag referencing the logo page, and
-[[ikiwiki logo|logo/ikiwiki.png]] should create an image tag referencing
+[[!ikiwiki logo|logo/ikiwiki.png]] should create an image tag referencing
 the logo.
 
 As of version 2.2, this no longer works. I think the pattern \\[[...|...]]
@@ -16,7 +16,7 @@ reported in [[index/discussion#index11h1]].
 > want multiple words.
 >
 > This was a decision I made a long time ago due to the ambiguity between a
-> WikiLink and a [[ikiwiki/PreProcessorDirective]]. Is "\[[foo bar|baz]]" a wikilink to
+> WikiLink and a [[ikiwiki/Directive]]. Is "\[[foo bar|baz]]" a wikilink to
 > baz with a link text of "foo bar", or an instance of preprocessor
 > directive "foo" with a parameter of "bar|baz"? If it's interpreted as a 
 > wikilink today, that could change tomorrow if a new preprocessor directive
@@ -44,7 +44,7 @@ reported in [[index/discussion#index11h1]].
 >> 
 >> If there was ever a future, syntax-breaking major release of ikiwiki
 >> (similar to python3000) I'd like to see this fixed as part of that.
->> --[[JonDowland]]
+>> --[[users/Jon]]
 
 >>> You can enable `prefix_directives` and get the disambiguated behavior
 >>> and spaces in wikilinks today. It will become the default in 3.0.