summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2016-09-09 20:15:47 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2016-09-09 20:15:47 (GMT)
commitc45599d0d12b1006deed41c97c7839d646dea62c (patch)
tree2f8a5ce27f341f8bcffdb15cffba3aef704ba346
parent9c858284639ce98c79d2c33fe639a0dcb7febc5d (diff)
parent9b32bda851c113cf4a85cdc01c603a1daba4d5d4 (diff)
downloadcpython-c45599d0d12b1006deed41c97c7839d646dea62c.zip
cpython-c45599d0d12b1006deed41c97c7839d646dea62c.tar.gz
cpython-c45599d0d12b1006deed41c97c7839d646dea62c.tar.bz2
Issue #19489: Merge with 3.5
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index d81a424..07fc183 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -59,6 +59,7 @@ Alicia Arlen
Jeffrey Armstrong
Jason Asbahr
David Ascher
+Ammar Askar
Chris AtLee
Aymeric Augustin
John Aycock
diff --git a/Misc/NEWS b/Misc/NEWS
index 61a1381..1943256 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -773,6 +773,9 @@ Tools/Demos
Documentation
-------------
+- Issue #19489: Moved the search box from the sidebar to the header and footer
+ of each page. Patch by Ammar Askar.
+
- Issue #27285: Update documentation to reflect the deprecation of ``pyvenv``
and normalize on the term "virtual environment". Patch by Steve Piercy.