Issue #19548: clean up merge issues in codecs docs

Patch by Martin Panter to clean up some problems with the merge
of the codecs docs changes from Python 3.4.