Merge branch 'master' into cvs

4 files changed, 41 insertions, 2 deletions

diff --git a/doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn b/doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn
new file mode 100644
index 000000000..ab4dc8953
--- /dev/null
+++ b/doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn
@@ -0,0 +1,13 @@
+I'm writing [pykipandoc plugin](https://github.com/temmen/pykipandoc/blob/master/pykipandoc), that work at least as pandoc-iki.
+
+It works in compile mode, editing pages in web mode however results in 
+
+    pandoc: : hGetContents: invalid argument (Invalid or incomplete multibyte or wide character)
+
+I think that is because HTTP POST request building editpage doesn't correctly manage utf-8 contents: see strange chars in this form-data name="editcontent"?
+
+    This principle has guided pandoc’s decisions in finding syntax for tables, footnotes, and other extensions.
+
+Please, any advice can be sent to [GitHub pykipandoc](https://github.com/temmen/pykipandoc) (some other info there on the [README](https://github.com/temmen/pykipandoc/blob/master/README.md)) and to [temmenel(at)gmail(dot)com](mailto:temmenel@gmail.com).
+
+¡Thank you all!
diff --git a/doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8/discussion.mdwn b/doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8/discussion.mdwn
new file mode 100644
index 000000000..9cdc9e746
--- /dev/null
+++ b/doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8/discussion.mdwn
@@ -0,0 +1,23 @@
+	# plugins to add to the default configuration
+	add_plugins => [qw{
+		    brokenlinks
+		    map
+		    orphans
+		    pagecount
+		    pagestats
+		    tag
+		    template
+		    openid
+		    attachment
+		    edittemplate
+		    remove
+		    listdirectives
+		    shortcut
+		    pykipandoc}],
+	# plugins to disable
+	disable_plugins => [qw{passwordauth mdwn}],
+
+and
+
+	# UTF-8 locale to use
+	locale => 'it_IT.UTF-8',
diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn
index 7df9e6b9f..fdd2fbfd4 100644
--- a/doc/rcs/cvs/discussion.mdwn
+++ b/doc/rcs/cvs/discussion.mdwn
@@ -172,4 +172,7 @@ Bugs found and fixed so far:
 > Merged to current head. --[[Joey]] 
 
 * Return bounded output from `rcs_diff()` when asked, as the API states.
-   (6753235d98a3903364af26c0614106c47d93ae35
+   (6753235d98a3903364af26c0614106c47d93ae35)
+* When adding a text file under a name formerly tracked as binary,
+  fix CVS keyword substitution behavior by explicitly setting `-kkv`.
+   (e45175d5454cc72b261507260accb309f13b5e8b)
diff --git a/doc/tips/html5.mdwn b/doc/tips/html5.mdwn
index cb71c0887..b47c3fe39 100644
--- a/doc/tips/html5.mdwn
+++ b/doc/tips/html5.mdwn
@@ -14,7 +14,7 @@ The html5 support is still experimental, and may break in some browsers.
 No care is taken to add backwards compatibility hacks for browsers that
 are not html5 aware (like MSIE). If you want to include the javascript with
 those hacks, you can edit `page.tmpl` to do so. 
-[Dive Into HTML5](http://diveintohtml5.org/) is a good reference for
+[Dive Into HTML5](http://diveintohtml5.info/) is a good reference for
 current compatability issues and workarounds with html5.  And a remotely-loadable
 JS shiv for enabling HTML5 elements in IE is available through [html5shiv at Google Code](http://code.google.com/p/html5shiv/).