summaryrefslogtreecommitdiffstats
path: root/Doc/whatsnew
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-09-30 13:10:34 (GMT)
committerGeorg Brandl <georg@python.org>2012-09-30 13:10:34 (GMT)
commit7ef90a1a37a17b63cb48c8abd653e0c83455320a (patch)
treec001f9cfc707227195bf8e053038632e6aa1d26f /Doc/whatsnew
parent50de85067fd9f4592a4db1454bcd6bba931c8dee (diff)
parent2cac28b37ef1dfdfc90481cad780c1555c713b04 (diff)
downloadcpython-7ef90a1a37a17b63cb48c8abd653e0c83455320a.zip
cpython-7ef90a1a37a17b63cb48c8abd653e0c83455320a.tar.gz
cpython-7ef90a1a37a17b63cb48c8abd653e0c83455320a.tar.bz2
merge with 3.3
Diffstat (limited to 'Doc/whatsnew')
-rw-r--r--Doc/whatsnew/index.rst8
-rw-r--r--Doc/whatsnew/news.rst14
2 files changed, 22 insertions, 0 deletions
diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst
index bc942fd..e23beea 100644
--- a/Doc/whatsnew/index.rst
+++ b/Doc/whatsnew/index.rst
@@ -24,3 +24,11 @@ anyone wishing to stay up-to-date after a new release.
2.2.rst
2.1.rst
2.0.rst
+
+The "Python News" is a HTML version of the file :source:`Misc/NEWS` which
+contains *all* nontrivial changes to Python.
+
+.. toctree::
+ :maxdepth: 1
+
+ news.rst
diff --git a/Doc/whatsnew/news.rst b/Doc/whatsnew/news.rst
new file mode 100644
index 0000000..2f81ed3
--- /dev/null
+++ b/Doc/whatsnew/news.rst
@@ -0,0 +1,14 @@
++++++++++++
+Python News
++++++++++++
+
+.. raw:: html
+
+ <p>
+ Filter entries by content:
+ <input type="text" value="" id="searchbox" style="width: 50%" onchange="dofilter()">
+ <input type="submit" value="Filter" onclick="dofilter()">
+ </p>
+
+.. miscnews:: ../../Misc/NEWS
+