From 7136cffe1f95d9451ead6914290b4e311d7d448c Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <takowl@gmail.com>
Date: Wed, 9 Apr 2014 17:36:15 -0700
Subject: [PATCH] Remove the outdated keyboard shortcuts from notebook docs

Closes gh-5569

Backport to 2.x.
---
 docs/source/notebook/notebook.rst | 50 ++++---------------------------
 1 file changed, 5 insertions(+), 45 deletions(-)

diff --git a/docs/source/notebook/notebook.rst b/docs/source/notebook/notebook.rst
index c9638623e..ecd1faedf 100644
--- a/docs/source/notebook/notebook.rst
+++ b/docs/source/notebook/notebook.rst
@@ -349,52 +349,12 @@ to remember are the following:
     is thus a shortcut for the sequence :kbd:`Shift-Enter`, :kbd:`Ctrl-m a`.
     (:kbd:`Ctrl-m a` adds a new cell above the current one.)
   
-* :kbd:`Ctrl-m`: 
-  This is the prefix for *all* other shortcuts, which consist of :kbd:`Ctrl-m` 
-  followed by a single letter or character. For example, if you type 
-  :kbd:`Ctrl-m h` (that is, the sole letter :kbd:`h` after :kbd:`Ctrl-m`), 
-  IPython will show you all the available keyboard shortcuts.
-
-
-..
-    TODO: these live in IPython/html/static/notebook/js/quickhelp.js
-    They were last updated for IPython 1.0 release, so update them again for
-    future releases.
-
-Here is the complete set of keyboard shortcuts available:
-
-============  ==========================
-**Shortcut**        **Action**
-------------  --------------------------
-Shift-Enter    run cell
-Ctrl-Enter     run cell in-place
-Alt-Enter      run cell, insert below
-Ctrl-m x       cut cell
-Ctrl-m c       copy cell
-Ctrl-m v       paste cell
-Ctrl-m d       delete cell
-Ctrl-m z       undo last cell deletion
-Ctrl-m -       split cell
-Ctrl-m a       insert cell above
-Ctrl-m b       insert cell below
-Ctrl-m o       toggle output
-Ctrl-m O       toggle output scroll
-Ctrl-m l       toggle line numbers
-Ctrl-m s       save notebook
-Ctrl-m j       move cell down
-Ctrl-m k       move cell up
-Ctrl-m y       code cell
-Ctrl-m m       markdown cell
-Ctrl-m t       raw cell
-Ctrl-m 1-6     heading 1-6 cell
-Ctrl-m p       select previous
-Ctrl-m n       select next
-Ctrl-m i       interrupt kernel
-Ctrl-m .       restart kernel
-Ctrl-m h       show keyboard shortcuts
-============  ==========================
-
+* :kbd:`Esc` and :kbd:`Enter`: Command mode and edit mode
+    In command mode, you can easily navigate around the notebook using keyboard
+    shortcuts. In edit mode, you can edit text in cells.
 
+For the full list of available shortcuts, click :guilabel:`Help`,
+:guilabel:`Keyboard Shortcuts` in the notebook menus.
 
 Plotting
 --------