From e1bf5cad97a235ebee5cf68781bb0fac23ec8b94 Mon Sep 17 00:00:00 2001
From: Cheryl Sabella <cheryl.sabella@gmail.com>
Date: Wed, 26 Dec 2018 13:55:06 -0500
Subject: [PATCH 1/3] bpo-28097: IDLE: Add Previous/Next History to Shell menu

---
 Doc/library/idle.rst                                        | 6 ++++++
 Lib/idlelib/mainmenu.py                                     | 3 +++
 .../next/IDLE/2018-12-26-13-53-34.bpo-28097.95I9NT.rst      | 1 +
 3 files changed, 10 insertions(+)
 create mode 100644 Misc/NEWS.d/next/IDLE/2018-12-26-13-53-34.bpo-28097.95I9NT.rst

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index ef9bd2698f5bfc..6677d97e5637f2 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -235,6 +235,12 @@ View Last Restart
 Restart Shell
   Restart the shell to clean the environment.
 
+Previous History
+  Retrieves the prior command in history which matches the current entry.
+
+Next History
+  Retrieves the next command in history which matches the current entry.
+
 Interrupt Execution
   Stop a running program.
 
diff --git a/Lib/idlelib/mainmenu.py b/Lib/idlelib/mainmenu.py
index 6081a5f1003dc7..f834220fc2bb75 100644
--- a/Lib/idlelib/mainmenu.py
+++ b/Lib/idlelib/mainmenu.py
@@ -82,6 +82,9 @@
    ('_View Last Restart', '<<view-restart>>'),
    ('_Restart Shell', '<<restart-shell>>'),
    None,
+   ('_Previous History', '<<history-previous>>'),
+   ('_Next History', '<<history-next>>'),
+   None,
    ('_Interrupt Execution', '<<interrupt-execution>>'),
    ]),
 
diff --git a/Misc/NEWS.d/next/IDLE/2018-12-26-13-53-34.bpo-28097.95I9NT.rst b/Misc/NEWS.d/next/IDLE/2018-12-26-13-53-34.bpo-28097.95I9NT.rst
new file mode 100644
index 00000000000000..83163cf736fe76
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2018-12-26-13-53-34.bpo-28097.95I9NT.rst
@@ -0,0 +1 @@
+Add Previous/Next History entries to Shell menu.

From 1977a4808328f51be247ae5d0233f788f95a76da Mon Sep 17 00:00:00 2001
From: Cheryl Sabella <cheryl.sabella@gmail.com>
Date: Fri, 28 Dec 2018 09:21:32 -0500
Subject: [PATCH 2/3] Doc changes

---
 Doc/library/idle.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index 6677d97e5637f2..56d7c9f4c2c297 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -236,10 +236,10 @@ Restart Shell
   Restart the shell to clean the environment.
 
 Previous History
-  Retrieves the prior command in history which matches the current entry.
+  Cycle through earlier commands in history which match the current entry.
 
 Next History
-  Retrieves the next command in history which matches the current entry.
+  Cycle through later commands in history which match the current entry.
 
 Interrupt Execution
   Stop a running program.

From e80ccbae26fcef18be8f2ada75f685a5e87b7f97 Mon Sep 17 00:00:00 2001
From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 28 Dec 2018 13:46:19 -0500
Subject: [PATCH 3/3] Update help.html.  Includes code context and zoom height
 changes.

---
 Lib/idlelib/help.html | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html
index 051690bc66a22f..80c87f6ebdf1b2 100644
--- a/Lib/idlelib/help.html
+++ b/Lib/idlelib/help.html
@@ -273,6 +273,10 @@ <h3>Shell menu (Shell window only)<a class="headerlink" href="#shell-menu-shell-
 <dd>Scroll the shell window to the last Shell restart.</dd>
 <dt>Restart Shell</dt>
 <dd>Restart the shell to clean the environment.</dd>
+<dt>Previous History</dt>
+<dd>Cycle through earlier commands in history which match the current entry.</dd>
+<dt>Next History</dt>
+<dd>Cycle through later commands in history which match the current entry.</dd>
 <dt>Interrupt Execution</dt>
 <dd>Stop a running program.</dd>
 </dl>
@@ -309,7 +313,11 @@ <h3>Options menu (Shell and Editor)<a class="headerlink" href="#options-menu-she
 configuration dialog by selecting Preferences in the application
 menu. For more, see
 <a class="reference internal" href="#preferences"><span class="std std-ref">Setting preferences</span></a> under Help and preferences.</dd>
-<dt>Code Context (toggle)(Editor Window only)</dt>
+<dt>Zoom/Restore Height</dt>
+<dd>Toggles the window between normal size and maximum height. The initial size
+defaults to 40 lines by 80 chars unless changed on the General tab of the
+Configure IDLE dialog.</dd>
+<dt>Show/Hide Code Context (Editor Window only)</dt>
 <dd>Open a pane at the top of the edit window which shows the block context
 of the code which has scrolled above the top of the window.  See
 <a class="reference internal" href="#code-context"><span class="std std-ref">Code Context</span></a> in the Editing and Navigation section below.</dd>
@@ -317,14 +325,8 @@ <h3>Options menu (Shell and Editor)<a class="headerlink" href="#options-menu-she
 </div>
 <div class="section" id="window-menu-shell-and-editor">
 <h3>Window menu (Shell and Editor)<a class="headerlink" href="#window-menu-shell-and-editor" title="Permalink to this headline">¶</a></h3>
-<dl class="docutils">
-<dt>Zoom Height</dt>
-<dd>Toggles the window between normal size and maximum height. The initial size
-defaults to 40 lines by 80 chars unless changed on the General tab of the
-Configure IDLE dialog.</dd>
-</dl>
-<p>The rest of this menu lists the names of all open windows; select one to bring
-it to the foreground (deiconifying it if necessary).</p>
+<p>Lists the names of all open windows; select one to bring it to the foreground
+(deiconifying it if necessary).</p>
 </div>
 <div class="section" id="help-menu-shell-and-editor">
 <h3>Help menu (Shell and Editor)<a class="headerlink" href="#help-menu-shell-and-editor" title="Permalink to this headline">¶</a></h3>
@@ -918,7 +920,7 @@ <h3>Navigation</h3>
 <br />
     <br />
 
-    Last updated on Dec 20, 2018.
+    Last updated on Dec 28, 2018.
     <a href="https://docs.python.org/3/bugs.html">Found a bug</a>?
     <br />