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

diff --git a/doc/bugs/rst_plugin_hangs_on_utf-8.mdwn b/doc/bugs/rst_plugin_hangs_on_utf-8.mdwn
new file mode 100644 (file)
index 0000000..2fa8e28
--- /dev/null
+++ b/doc/bugs/rst_plugin_hangs_on_utf-8.mdwn
@@ -0,0 +1,14 @@
+When rendering an rst page with utf-8 characters in (specifically "£"), ikiwiki seems to hang.
+
+Killing with Control-C gives the following traceback:
+
+    Traceback (most recent call last):
+      File "/usr/lib/ikiwiki/plugins/rst", line 97, in ?
+        handler.handle_request()
+      File "/usr/lib/ikiwiki/plugins/rst", line 74, in handle_request
+        ret = rpc_read(processor)
+      File "/usr/lib/ikiwiki/plugins/rst", line 42, in rpc_read
+        line = sys.stdin.readline()
+    KeyboardInterrupt
+
+rst2html on the same file has no problem rendering the file as expected.

diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn
index 68f0b9be201609442f966a6d152186b689316e18..4d377d3f66cb0605ef51c5809fb65f121ed575da 100644 (file)
--- a/doc/todo/enable-htaccess-files.mdwn
+++ b/doc/todo/enable-htaccess-files.mdwn
@@ -39,4 +39,12 @@ access and such .htaccess files should not be accessible through wiki cgi. Of co
 
 > See [[debbug 447267]] for a patch for this.
 
+---
+
+bump! I would like to see some form of this functionality included in ikiwiki. I use a patched version, but
+its a bit of a PITA to constantly apply it (and to forget sometimes!). I know that security concern is important to consider,
+but I use ikiwiki with a very small group of people collaborating so svn/web access is under control
+and htaccess is for limiting access to some areas of wiki.   
+It should be off by default of course. --Max
+
 [[tag patch]]

diff --git a/doc/users/Stefano_Zacchiroli.mdwn b/doc/users/Stefano_Zacchiroli.mdwn
new file mode 100644 (file)
index 0000000..b874df9
--- /dev/null
+++ b/doc/users/Stefano_Zacchiroli.mdwn
@@ -0,0 +1 @@
+<http://upsilon.cc/~zack>