Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / todo / absolute_urls_in_wikilinks.mdwn

diff --git a/doc/todo/absolute_urls_in_wikilinks.mdwn b/doc/todo/absolute_urls_in_wikilinks.mdwn
index fd47cb08969e7dd3a0991a9ff2588682d7e302be..a0fe83e44f640b031fc3612bc325cf5a3bcd75ae 100644 (file)
--- a/doc/todo/absolute_urls_in_wikilinks.mdwn
+++ b/doc/todo/absolute_urls_in_wikilinks.mdwn
@@ -2,7 +2,7 @@
 
 An option to have absolute urls in wikilinks instead of relative ones would be useful, 
 for pages included into other pages out of the wiki rendering process (shtml for example)
 
 An option to have absolute urls in wikilinks instead of relative ones would be useful, 
 for pages included into other pages out of the wiki rendering process (shtml for example)

-since these pages can be included from a subdir. Ditto, links from \[[ inline ..]] or \[[map ..]].
+since these pages can be included from a subdir. Ditto, links from \[[!inline ..]] or \[[!map ..]].

 
 > You can make a wikilink absolute by prefixing it with a /, see 
 > [[ikiwiki/subpage/linkingrules/]]. Pagespecs match absolute by default. But what do
 
 > You can make a wikilink absolute by prefixing it with a /, see 
 > [[ikiwiki/subpage/linkingrules/]]. Pagespecs match absolute by default. But what do


@@ -10,11 +10,11 @@ since these pages can be included from a subdir. Ditto, links from \[[ inline ..
 > change. --Ethan
 
 >> I want the "last pages" in my sidebar. and some links to a few special pages.
 > change. --Ethan
 
 >> I want the "last pages" in my sidebar. and some links to a few special pages.

->> \[[inline ]] or \\[[map ]] in the sidebar is a bad idea, (because each update rebuilds
+>> \[[!inline ]] or \\[[!map ]] in the sidebar is a bad idea, (because each update rebuilds

 >> all the wiki), so I use server-side-include instead of the sidebar plugin; 
 >> this reduces the dependencies
 >> my sidebar is generated as http://foo.org/menu/index.html, so all the links generated by 
 >> all the wiki), so I use server-side-include instead of the sidebar plugin; 
 >> this reduces the dependencies
 >> my sidebar is generated as http://foo.org/menu/index.html, so all the links generated by 

->> \[[inline ]] or \[[map ]] are relative to this position. 
+>> \[[!inline ]] or \[[!map ]] are relative to this position. 

 >> Included from http://foo.org/section/sub/blah/index.shtml, the links are broken.
 >>
 >> — NicolasLimare
 >> Included from http://foo.org/section/sub/blah/index.shtml, the links are broken.
 >>
 >> — NicolasLimare