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

diff --git a/doc/bugs/Pages_with_non-ascii_characters_like_öäå_in_name_not_found_directly_after_commit.mdwn b/doc/bugs/Pages_with_non-ascii_characters_like_öäå_in_name_not_found_directly_after_commit.mdwn
index e7cb43bee7b700cd8a3a09d354438756ab2b226a..a08ec6fd0957178681cb8a553b0143737252bb10 100644 (file)
--- a/doc/bugs/Pages_with_non-ascii_characters_like_öäå_in_name_not_found_directly_after_commit.mdwn
+++ b/doc/bugs/Pages_with_non-ascii_characters_like_öäå_in_name_not_found_directly_after_commit.mdwn
@@ -7,4 +7,15 @@ Happens also after editing the page. Here's an example:
  * page name displayed in 404: http://mcfrisk.kapsi.fi/skiing/posts/Iso-Sy%F6te%20Freeride%202011%20Teaser.html?updated
  * page name in the blog feed: http://mcfrisk.kapsi.fi/skiing/posts/Iso-Sy%C3%B6te%20Freeride%202011%20Teaser.html
 
-Difference is in the word Iso-Syöte. Pehaps also the browsers is part of the game, I use Iceweasel from Debian unstable with default settings.
+Difference is in the word Iso-Syöte. Pehaps also the browsers is part of
+the game, I use Iceweasel from Debian unstable with default settings.
+
+> I remember seeing this problem twice before, and both times it was caused
+> by a bug in the *web server* configuration. I think at least one case it was
+> due to an apache rewrite rule that did a redirect and mangled the correct
+> encoding.
+> 
+> I recommend you check there. If you cannot find the problem with your web
+> server, I recommend you get a http protocol dump while saving the page,
+> and post it here for analysis. You could use tcpdump, or one of the
+> browser plugins that allows examining the http protocol. --[[Joey]]

diff --git a/doc/git.mdwn b/doc/git.mdwn
index ce20938f44fe1323c68776ae299c0d2a779e153b..c30b0111460855922b16378ff5e9ee761aa549fb 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -65,7 +65,7 @@ think about merging them. This is recommended. :-)
 * [[privat]] `git://github.com/privat/ikiwiki.git`
 * [[blipvert]] `git://github.com/blipvert/ikiwiki.git`
 * [[bzed|BerndZeimetz]] `git://git.recluse.de/users/bzed/ikiwiki.git`
-* [[wtk]]: `git://github.com/wking/ikiwiki.git`
+* [[wtk]] `git://github.com/wking/ikiwiki.git`
 
 ## branches
 

diff --git a/doc/todo/configurable_markdown_path.mdwn b/doc/todo/configurable_markdown_path.mdwn
index 931f980259675197a501ee8343218cc43d08ced5..7c5307277be332d49612a05e56fe4d12b4211e3c 100644 (file)
--- a/doc/todo/configurable_markdown_path.mdwn
+++ b/doc/todo/configurable_markdown_path.mdwn
@@ -8,3 +8,13 @@ Make it easy to configure the Markdown implementation used by the
 external Markdown executable in your ikiwiki config file.  If you do
 not set a path, the plugin will use the usual config options to
 determine which Perl module to use.
+
+> This adds a configuration in which a new process has to be worked
+> for every single page rendered. Actually, it doesn't only add
+> such a configuration, it makes it be done by *default*.
+> 
+> Markdown is ikiwiki's default, standard renderer. A configuration
+> that makes it slow will make ikiwiki look bad.
+> 
+> I would not recommend using Gruber's perl markdown. It is old, terminally
+> buggy, and unmaintained. --[[Joey]]