summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2013-03-09 19:25:08 (GMT)
committerBrett Cannon <brett@python.org>2013-03-09 19:25:08 (GMT)
commitff73758b8f534ff4c90f2f50e59acc85eb32f8e3 (patch)
tree84d0ecb468338f769b30307209233d961cb99d7d /Misc
parent84fae785ce4b0a15172fb4590d684431def9dea9 (diff)
parentb7e6b895546ac7ae3217480b2161ed0ecbee408a (diff)
downloadcpython-ff73758b8f534ff4c90f2f50e59acc85eb32f8e3.zip
cpython-ff73758b8f534ff4c90f2f50e59acc85eb32f8e3.tar.gz
cpython-ff73758b8f534ff4c90f2f50e59acc85eb32f8e3.tar.bz2
merge
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 42f87f8..fd52b1c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1409,6 +1409,8 @@ Tools/Demos
Documentation
-------------
+- Touched up the Python 2 to 3 porting guide.
+
- Issue #14674: Add a discussion of the `json` module's standard compliance.
Patch by Chris Rebert.