Merge branch 'master' into sipb

[ikiwiki.git] / doc / bugs / rst_plugin_hangs_when_used_with_Python_3.mdwn

diff --git a/doc/bugs/rst_plugin_hangs_when_used_with_Python_3.mdwn b/doc/bugs/rst_plugin_hangs_when_used_with_Python_3.mdwn
index 6935cf0ba0c711b4e1df5472e37c866717f2bc8a..001d990ca5cbc6965460a3934bbf650ec2069405 100644 (file)
--- a/doc/bugs/rst_plugin_hangs_when_used_with_Python_3.mdwn
+++ b/doc/bugs/rst_plugin_hangs_when_used_with_Python_3.mdwn
@@ -29,6 +29,9 @@ without decode('utf8') is working
 
 > That call was introduced
 > [[to fix a bug under Python 2|bugs/crashes_in_the_python_proxy_even_if_disabled]]
-> so it cannot just be removed, but perhaps it can be improved. This is
-> probably related to
-> [[this follow-up bug under Python 2|bugs/pythonproxy-utf8_again]]. --smcv
+> so it cannot just be removed, but I've put a proposed branch on
+> [[this related bug|bugs/pythonproxy-utf8_again]]. [[!tag patch]] --smcv
+
+tested and fixed with patch [http://git.pseudorandom.co.uk/smcv/ikiwiki.git/commitdiff/38bd51bc1bab0cabd97dfe3cb598220a2c02550a](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/commitdiff/38bd51bc1bab0cabd97dfe3cb598220a2c02550a) and patch [http://git.pseudorandom.co.uk/smcv/ikiwiki.git/commitdiff/81506fae8a6d5360f6d830b0e07190e60a7efd1c](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/commitdiff/81506fae8a6d5360f6d830b0e07190e60a7efd1c)
+
+> [[done]], pending release --[[smcv]]