Merge 3.2

diff --cc Doc/library/socketserver.rst
Simple merge

diff --cc Misc/NEWS
index e6ee12006daa3763fda53815fb58e1d4bf308098,100fcecf8da388d32d986bb241bed56e4a961d41..be4a27c2d7315840a3a069c854171b271982533f
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1678,6 -1100,6 +1678,8 @@@ C-AP
  Documentation
  -------------
  
++- Issue #13141: Demonstrate recommended style for socketserver examples.
++
  - Issue #11818: Fix tempfile examples for Python 3.