diff --git a/IPython/html/static/notebook/js/quickhelp.js b/IPython/html/static/notebook/js/quickhelp.js
index 13a8772..e28ccfe 100644
--- a/IPython/html/static/notebook/js/quickhelp.js
+++ b/IPython/html/static/notebook/js/quickhelp.js
@@ -21,36 +21,22 @@ var IPython = (function (IPython) {
         cmd_ctrl = 'Cmd-';
         platform_specific = [
             { shortcut: "Cmd-Up",     help:"go to cell start"  },
-            { shortcut: "Cmd-End",    help:"go to cell start"  },
-            { shortcut: "PageUp",     help:"go to cell start"  },
             { shortcut: "Cmd-Down",   help:"go to cell end"  },
-            { shortcut: "PageDown",   help:"go to cell end"  },
-            { shortcut: "Alt-Left",   help:"go one word left"  },
-            { shortcut: "Alt-Right",  help:"go one word right"  },
-            { shortcut: "Cmd-Left",   help:"go to line start"  },
-            { shortcut: "Home",       help:"go to line start"  },
-            { shortcut: "Cmd-Right",  help:"go to line end"  },
-            { shortcut:"End",         help:"go to line end"  },
-            { shortcut:"Alt-Backspace",      help:"del word before"  },
-            { shortcut:"Ctrl-Alt-Backspace", help:"del word after"  },
-            { shortcut:"Alt-Delete",         help:"del word after"  },
+            { shortcut: "Opt-Left",   help:"go one word left"  },
+            { shortcut: "Opt-Right",  help:"go one word right"  },
+            { shortcut: "Opt-Backspace",      help:"del word before"  },
+            { shortcut: "Opt-Delete",         help:"del word after"  },
         ];
     } else {
         // PC specific
         platform_specific = [
             { shortcut: "Ctrl-Home",  help:"go to cell start"  },
             { shortcut: "Alt-Up",     help:"go to cell start"  },
-            { shortcut: "PageUp",     help:"go to cell start"  },
             { shortcut: "Ctrl-End",   help:"go to cell end"  },
             { shortcut: "Ctrl-Down",  help:"go to cell end"  },
-            { shortcut: "PageDown",   help:"go to cell end"  },
             { shortcut: "Ctrl-Left",  help:"go one word left"  },
             { shortcut: "Ctrl-Right", help:"go one word right"  },
             { shortcut: "Alt-Right",  help:"go to cell end"  },
-            { shortcut: "Alt-Left",   help:"go to line start"  },
-            { shortcut: "Home",       help:"go to line start"  },
-            { shortcut: "Alt-Right",  help:"go to line end"  },
-            { shortcut: "End",        help:"go to line end"  },
             { shortcut: "Ctrl-Backspace", help:"del word before"  },
             { shortcut: "Ctrl-Delete",    help:"del word after"  },
         ];
@@ -63,7 +49,6 @@ var IPython = (function (IPython) {
         { shortcut: cmd_ctrl + "]",   help:"indent"  },
         { shortcut: cmd_ctrl + "[",   help:"dedent"  },
         { shortcut: cmd_ctrl + "a",   help:"select all"  },
-        { shortcut: cmd_ctrl + "d",   help:"delete line"  },
         { shortcut: cmd_ctrl + "z",   help:"undo"  },
         { shortcut: cmd_ctrl + "Shift-z",   help:"redo"  },
         { shortcut: cmd_ctrl + "y",   help:"redo"  },
diff --git a/docs/source/notebook/cm_keyboard.rst b/docs/source/notebook/cm_keyboard.rst
deleted file mode 100644
index 05e69b3..0000000
--- a/docs/source/notebook/cm_keyboard.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-.. _cm_keyboard:
-
-Some additional Codemirror keyboard shortcuts
-=============================================
-
-Because each cell of the IPython notebook is powered by Codemirror,
-you can actually use a set of predetermined keyboard shortcuts to
-write and manipulate your content easily:
-
-==================  ==============  ==================
-Action              PC shortcut     Mac shortcut      
-==================  ==============  ==================
-newline & indent    Enter           Enter             
-toggle overwrite    Insert          Insert            
-code completion     Tab             Tab
-help introspection  Shift-Tab       Shift-Tab
-indent              Ctrl-]          Cmd-]             
-dedent              Ctrl-[          Cmd-[             
-select all          Ctrl-A          Cmd-A             
-delete line         Ctrl-D          Cmd-D             
-undo                Ctrl-Z          Cmd-Z             
-redo                Ctrl-Shift-Z    Cmd-Shift-Z       
-redo                Ctrl-Y          Cmd-Y             
-go to cell start    Ctrl-Home       Cmd-Up            
-go to cell start    Alt-Up          Cmd-End           
-go to cell start    PageUp          PageUp            
-go to cell end      Ctrl-End        ---               
-go to cell end      Ctrl-Down       Cmd-Down          
-go to cell end      PageDown        PageDown          
-go one word left    Ctrl-Left       Alt-Left          
-go one word right   Ctrl-Right      Alt-Right         
-go to line start    Alt-Left        Cmd-Left          
-go to line start    Home            Home              
-go to line end      Alt-Right       Cmd-Right         
-go to line end      End             End               
-del word before     Ctrl-Backspace  Alt-Backspace     
-del word after      ---             Ctrl-Alt-Backspace
-del word after      Ctrl-Delete     Alt-Delete        
-==================  ==============  ==================
-
-.. note::
-
-     These shortcuts are valid for US keyboards, so some shortcuts can change
-     for non-US keyboards.
diff --git a/docs/source/notebook/notebook.rst b/docs/source/notebook/notebook.rst
index c0a4880..98a930b 100644
--- a/docs/source/notebook/notebook.rst
+++ b/docs/source/notebook/notebook.rst
@@ -394,10 +394,6 @@ Ctrl-m .       restart kernel
 Ctrl-m h       show keyboard shortcuts
 ============  ==========================
 
-.. seealso::
-
-    :ref:`Some additional Codemirror keyboard shortcuts <cm_keyboard>`    
-
 
 
 Plotting