summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2011-10-23 20:44:19 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2011-10-23 20:44:19 (GMT)
commite9126b5e3b087173a5c5348246a806fcb193bc9b (patch)
tree92e1ee6293e658d5821efd5acaae8471d8d4c146 /Misc
parent6d57d212a89b38d31f6bca7b83cf789d8063f6f2 (diff)
parent023611f34ead5bdfbeec73b1598df0023090106a (diff)
downloadcpython-e9126b5e3b087173a5c5348246a806fcb193bc9b.zip
cpython-e9126b5e3b087173a5c5348246a806fcb193bc9b.tar.gz
cpython-e9126b5e3b087173a5c5348246a806fcb193bc9b.tar.bz2
Merge 3.2
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS2
1 files changed, 2 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index e6ee120..be4a27c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1678,6 +1678,8 @@ C-API
Documentation
-------------
+- Issue #13141: Demonstrate recommended style for socketserver examples.
+
- Issue #11818: Fix tempfile examples for Python 3.