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

4 files changed, 24 insertions, 7 deletions

diff --git a/doc/bugs/unicode_encoded_urls_and_recentchanges.mdwn b/doc/bugs/unicode_encoded_urls_and_recentchanges.mdwn
index 88dbfc39b..262aa24fc 100644
--- a/doc/bugs/unicode_encoded_urls_and_recentchanges.mdwn
+++ b/doc/bugs/unicode_encoded_urls_and_recentchanges.mdwn
@@ -2,7 +2,7 @@ it appears that unicode characters in the title that are unicode letters are spa
 
 > Filenames can have any alphanumerics in them without the __ escaping.
 > Your locale determines whether various unicode characters are considered
-> alphanumeric. In other words, it just looks at the [[:alpha:]] character
+> alphanumeric. In other words, it just looks at the \[[:alpha:]] character
 > class, whatever your locale defines it to be. --[[Joey]]
 
 this is not a problem per se, but (at least with git backend) the recent changes missinterpret the file name character set (it seems to read the filenames as latin1) and both display wrong titles and create broken links.
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index d38bc5015..a98abf578 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -126,6 +126,7 @@ Personal sites and blogs
 * [tumashu's page](http://tumashu.github.com) This is my personal site in github  created with ikiwiki and only a page,you can get the [source](http://github.com/tumashu/tumashu/tree/master)  
 * [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage
 * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
+* [Weakish Jiang's Homepage](http://weakish.pigro.net)
 
 Please feel free to add your own ikiwiki site!
 
diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index b3fe9f86c..e2eb56d47 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -286,7 +286,7 @@ Mediawiki.pm - A plugin which supports mediawiki format.
 	}
 	
 	
-	# Called to handle bookmarks like [[#heading]] or <span class="createlink"><a href="http://u32.net/cgi-bin/ikiwiki.cgi?page=%20text%20&amp;from=Mediawiki_Plugin%2Fmediawiki&amp;do=create" rel="nofollow">?</a>#a</span>
+	# Called to handle bookmarks like \[[#heading]] or <span class="createlink"><a href="http://u32.net/cgi-bin/ikiwiki.cgi?page=%20text%20&amp;from=Mediawiki_Plugin%2Fmediawiki&amp;do=create" rel="nofollow">?</a>#a</span>
 	sub generate_fragment_link
 	{
 	   my $url = shift;
@@ -316,10 +316,10 @@ Mediawiki.pm - A plugin which supports mediawiki format.
 	
 	   # Ikiwiki's link link plugin wrecks this line when displaying on the site.
 	   # Until the code highlighter plugin can turn off link finding,
-	   # always escape double brackets in double quotes: [[
+	   # always escape double brackets in double quotes: \[[
 	   if($inlink eq '..') {
-	      # Mediawiki doesn't touch links like [[..#hi|ho]].
-	      return "[[" . $inlink . ($anchor?"#$anchor":"") .
+	      # Mediawiki doesn't touch links like \[[..#hi|ho]].
+	      return "\[[" . $inlink . ($anchor?"#$anchor":"") .
 	         ($title?"|$title":"") . "]]" . $trailing;
 	   }
 	
@@ -380,7 +380,7 @@ Mediawiki.pm - A plugin which supports mediawiki format.
 	      add_depends($page, $redir_page);
 	      my $link=bestlink($page, underscorize(translate_path($page,$redir_page)));
 	      if (! length $link) {
-	         return "<b>Redirect Error:</b> <nowiki>[[$redir_page]] not found.</nowiki>";
+	         return "<b>Redirect Error:</b> <nowiki>\[[$redir_page]] not found.</nowiki>";
 	      }
 	
 	      $value=urlto($link, $page);
@@ -393,7 +393,7 @@ Mediawiki.pm - A plugin which supports mediawiki format.
 	      my %seen;
 	      while (exists $pagestate{$at}{mediawiki}{redir}) {
 	         if ($seen{$at}) {
-	            return "<b>Redirect Error:</b> cycle found on <nowiki>[[$at]]</nowiki>";
+	            return "<b>Redirect Error:</b> cycle found on <nowiki>\[[$at]]</nowiki>";
 	         }
 	         $seen{$at}=1;
 	         $at=$pagestate{$at}{mediawiki}{redir};
diff --git a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
index afe50cf07..e42f22970 100644
--- a/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
+++ b/doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
@@ -87,6 +87,17 @@ be very convenient.
 >> rst_header (that you sensibly would do, I think) that couldn't be done in
 >> the Python script. `rst_header` has very limited use, but it is another
 >> possibility, mainly for the user-editable aspect. --[[ulrik]]
+>>
+>> (I foresaw only two things to be added to the rst_header: the default
+>> role could be configured there (as with rst_wikirole), and if you have a
+>> meta-role like :shortcut:, shortcuts could be defined there.)
+>
+> I have some discussion on the [docutils mailing list][dml], the developers
+> of docutils seems to favor "Proposal 1", while I defend my ideas. They
+> want all users of ReST to use only the basic featureset to remain
+> compatible, of course. -- [[ulrik]]
+
+[dml]: http://thread.gmane.org/gmane.text.docutils.user/5376
 
 Some rst-custom [examples are here](http://kaizer.se/wiki/rst_examples/)
 
@@ -203,6 +214,11 @@ picture before it.
 >> -- [[ulrik]] 
 
 >>> Seems it could be, yes. --[[Joey]]
+>>>
+>>>> It is not clear how we can work around reST wrapping directives with
+>>>> paragraph tags. Also, some escaping of xml characters & <> might
+>>>> happen, but I can't imagine right now what breakage can come from that.
+>>>> -- [[ulrik]]
 
 [tracrst]: http://trac.edgewall.org/wiki/WikiRestructuredText