Merge branch 'master' into sipb

[ikiwiki.git] / doc / bugs / pythonproxy-utf8_again.mdwn

diff --git a/doc/bugs/pythonproxy-utf8_again.mdwn b/doc/bugs/pythonproxy-utf8_again.mdwn
index 0434e3684398421e74771ac8b3fb26bd4ec02a94..f068782b416e4abda5b4257ff59c34e497995d5f 100644 (file)
--- a/doc/bugs/pythonproxy-utf8_again.mdwn
+++ b/doc/bugs/pythonproxy-utf8_again.mdwn
@@ -59,6 +59,12 @@ patch.
 >>>> to `str` under Python 2. However, Python 3 is still broken.
 >>>>
 >>>> My `ready/more-proxy-utf8-fail` branch, based on yours,
->>>> [[fixes the`rst` test when run under Python 3|bugs/rst_plugin_hangs_when_used_with_Python_3]]
+>>>> [[fixes the `rst` test when run under Python 3|bugs/rst_plugin_hangs_when_used_with_Python_3]]
 >>>> and hopefully also fixes this one. Please check that it still
->>>> fixes your test-case too. --[[smcv]]
+>>>> fixes your test-case too.
+>>>>
+>>>> Joey, I think this is [[ready for merge|users/smcv/ready]] even if it
+>>>> doesn't fix chrysn's bug - it does fix Python 3 support
+>>>> in general. --[[smcv]]
+
+>>>>> [[merged|done]] --[[smcv]]