Merge with trunk up to revision 45620.
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
index dac5c74..0946bdc 100644
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -733,6 +733,7 @@
 
 .. comment Additional topic: building Python w/ UCS2 or UCS4 support
 .. comment Describe obscure -U switch somewhere?
+.. comment Describe use of codecs.StreamRecoder and StreamReaderWriter
 
 .. comment 
    Original outline: