update key+mouse bindings page to reflect default current bindings for 2.5

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3532 d708f5d6-7413-0410-9779-e7cbd77b26cf

16 files changed, 1071 insertions, 384 deletions

diff --git a/manual/xml/editor_aligning_key_bindings.xml b/manual/xml/editor_aligning_key_bindings.xml
index 8a6c677272..6f7fb183df 100644
--- a/manual/xml/editor_aligning_key_bindings.xml
+++ b/manual/xml/editor_aligning_key_bindings.xml
@@ -23,47 +23,45 @@
         </row>
       </thead>
       <tbody>
-        <row>
-          <entry>
-            <keycombo><keycap>a</keycap> </keycombo>
-          </entry>
+	<row>
+	  <entry>
+	    <keycombo><keycap>a</keycap></keycombo>
+	  </entry>
 
-          <entry>
-            relative alignment of region sync points or starts
-          </entry>
-        </row>
+	  <entry>
+	  align regions using sync points and keeping relative positions
+	  </entry>
+	</row>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Meta</keycap><keycap>a</keycap> </keycombo>
-          </entry>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Alt</keycap><keycap>a</keycap></keycombo>
+	  </entry>
 
-          <entry>
-            absolute alignment of region sync points or starts
-          </entry>
-        </row>
+	  <entry>
+	  align region ends
+	  </entry>
+	</row>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap><keycap>a</keycap>
-            </keycombo>
-          </entry>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Shift</keycap><keycap>a</keycap></keycombo>
+	  </entry>
 
-          <entry>
-            relative alignment of region ends
-          </entry>
-        </row>
+	  <entry>
+	  align region sync points without keeping relative positions
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Mod4</keycap><keycap>a</keycap></keycombo>
+	  </entry>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>Meta</keycap><keycap>a</keycap>
-            </keycombo>
-          </entry>
+	  <entry>
+	  align region starts and keeping relative positions
+	  </entry>
+	</row>
 
-          <entry>
-            align region ends
-          </entry>
-        </row>
       </tbody>
     </tgroup>
   </table>
diff --git a/manual/xml/editor_canvas_key_bindings.xml b/manual/xml/editor_canvas_key_bindings.xml
index e9b3eb4d08..f28eef0a03 100644
--- a/manual/xml/editor_canvas_key_bindings.xml
+++ b/manual/xml/editor_canvas_key_bindings.xml
@@ -23,85 +23,65 @@
         </row>
       </thead>
       <tbody>
-        <row>
-          <entry>
-            <keycombo><keycap>left arrow</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            move editor timeline earlier
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>b</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            move editor timeline earlier
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>right arrow</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            move editor timeline later
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>f</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            move editor timeline later
-          </entry>
-        </row>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Page_Up</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            scroll track display up
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Page_Down</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            scroll track display down
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Up arrow</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            step track display up
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Down arrow</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            step track display down
-          </entry>
-        </row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>f</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  fit tracks
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>Up</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  step tracks up
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Down</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  step tracks down
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>Page_Down</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  scroll tracks down
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Page_Up</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  scroll tracks up
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>Shift</keycap><keycap>e</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  show editor mixer
+	  </entry>
+	</row>
+	
       </tbody>
     </tgroup>
   </table>
diff --git a/manual/xml/editor_edit_cursor_position_key_bindings.xml b/manual/xml/editor_edit_cursor_position_key_bindings.xml
index 1190e3efa7..a601c81cd3 100644
--- a/manual/xml/editor_edit_cursor_position_key_bindings.xml
+++ b/manual/xml/editor_edit_cursor_position_key_bindings.xml
@@ -23,13 +23,109 @@
         </row>
       </thead>
       <tbody>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>`</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  cycle-edit-point
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>~</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  cycle-edit-point-with-marker
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>e</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  set-edit-point
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Alt</keycap><keycap>Return</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  edit-to-playhead
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>F1</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  edit-cursor-to-range-start
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>F2</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  edit-cursor-to-range-end
+	  </entry>
+	</row>
+
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>'</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  edit-cursor-to-previous-region-sync
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>;</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  edit-cursor-to-next-region-sync
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap><keycap>Left</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  selected-marker-to-previous-region-boundary
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap><keycap>Right</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  selected-marker-to-next-region-boundary
+	  </entry>
+	</row>
+
+
         <row>
           <entry>
             <keycombo><keycap>e</keycap> </keycombo>
           </entry>
 
           <entry>
-            position edit cursor at mouse pointer
+            position selected marker at mouse pointer
           </entry>
         </row>
 
@@ -40,7 +136,7 @@
           </entry>
 
           <entry>
-            move edit cursor to playhead
+            move selected marker to playhead
           </entry>
         </row>
 
@@ -50,7 +146,7 @@
           </entry>
 
           <entry>
-            move edit cursor to earlier region start
+            move selected marker to earlier region start
           </entry>
         </row>
 
@@ -60,7 +156,7 @@
           </entry>
 
           <entry>
-            move edit cursor to earlier region end
+            move selected marker to earlier region end
           </entry>
         </row>
 
@@ -70,7 +166,7 @@
           </entry>
 
           <entry>
-            move edit cursor to next region start
+            move selected marker to next region start
           </entry>
         </row>
 
@@ -80,17 +176,17 @@
           </entry>
 
           <entry>
-            move edit cursor to next region end
+            move selected marker to next region end
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>&#8221;&#8221;&#8217;</keycap> </keycombo>
+            <keycombo><keycap>'</keycap> </keycombo>
           </entry>
 
           <entry>
-            move edit cursor to next region sync
+            move selected marker to next region sync
           </entry>
         </row>
 
@@ -100,7 +196,7 @@
           </entry>
 
           <entry>
-            moved edit cursor to previous region sync
+            moved selected marker to previous region sync
           </entry>
         </row>
 
@@ -110,7 +206,7 @@
           </entry>
 
           <entry>
-            move edit cursor to start of range selection (if defined)
+            move selected marker to start of range selection (if defined)
           </entry>
         </row>
 
@@ -120,7 +216,7 @@
           </entry>
 
           <entry>
-            move edit cursor to end of range selection (if defined)
+            move selected marker to end of range selection (if defined)
           </entry>
         </row>
       </tbody>
diff --git a/manual/xml/editor_locations_marks_key_bindings.xml b/manual/xml/editor_locations_marks_key_bindings.xml
index d83c446578..51c550f630 100644
--- a/manual/xml/editor_locations_marks_key_bindings.xml
+++ b/manual/xml/editor_locations_marks_key_bindings.xml
@@ -33,25 +33,126 @@
           </entry>
         </row>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Keypad &gt;</keycap> </keycombo>
-          </entry>
+	<row>
+	  <entry>
+	    <keycombo><keycap>]</keycap></keycombo>
+	  </entry>
 
-          <entry>
-            move playhead to next marker
-          </entry>
-        </row>
+	  <entry>
+	  set loop range from edit range
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Alt</keycap><keycap>]</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  set loop range from selected region(s)
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>[</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  set punch range from edit range
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Alt</keycap><keycap>[</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  set punch range from selected region(s)
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>KP_1</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  goto mark 1
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>KP_2</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  goto mark 2
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>KP_3</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  goto mark 3
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>KP_4</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  goto mark 4
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>KP_5</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  goto mark 5
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>KP_6</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  goto mark 6
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>KP_7</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  goto mark 7
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>KP_8</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  goto mark 8
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>KP_9</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  goto mark 9
+	  </entry>
+	</row>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Keypad &lt;</keycap> </keycombo>
-          </entry>
 
-          <entry>
-            move playhead to previous marker
-          </entry>
-        </row>
       </tbody>
     </tgroup>
   </table>
diff --git a/manual/xml/editor_marker_bindings.xml b/manual/xml/editor_marker_bindings.xml
new file mode 100644
index 0000000000..b757a7b90d
--- /dev/null
+++ b/manual/xml/editor_marker_bindings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+]>
+
+<section id="sn-editor-canvas-key-bindings">
+  <title>Mark &amp; Range Key Bindings</title>
+  <table id="tbl-editor-canvas-key-bindings">
+    <title>Editor Canvas Key Bindings</title>
+    <tgroup cols = "2">
+      <colspec colnum="1" colname="Key Binding" colwidth="1"/>
+      <colspec colnum="2" colname="Action" colwidth= "2"/>
+      <thead>
+        <row>
+          <entry>
+            Key Binding
+          </entry>
+
+          <entry>
+            Action
+          </entry>
+        </row>
+      </thead>
+      <tbody>
+
+
+      </tbody>
+    </tgroup>
+  </table>
+<!--
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+		href="Some_Subsection.xml" />
+	-->
+</section>
diff --git a/manual/xml/editor_miscellaneous_key_bindings.xml b/manual/xml/editor_miscellaneous_key_bindings.xml
index 1fd40d13ea..bf23091251 100644
--- a/manual/xml/editor_miscellaneous_key_bindings.xml
+++ b/manual/xml/editor_miscellaneous_key_bindings.xml
@@ -23,25 +23,85 @@
         </row>
       </thead>
       <tbody>
-        <row>
-          <entry>
-            <keycombo><keycap>l</keycap> </keycombo>
-          </entry>
 
-          <entry>
-            toggle auto loop
-          </entry>
-        </row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>1</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  toggle edit mode
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>2</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  cycle snap mode
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>3</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  cycle snap choice
+	  </entry>
+	</row>
 
         <row>
           <entry>
-            <keycombo><keycap>f</keycap> </keycombo>
+            <keycombo><keycap>Ctrl</keycap><keycap>f</keycap> </keycombo>
           </entry>
 
           <entry>
             toggle follow playhead
           </entry>
         </row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>9</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  set tempo from region
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>0</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  set tempo from edit range
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>t</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  insert time
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>Delete</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  remove last capture
+	  </entry>
+	</row>
+
+
       </tbody>
     </tgroup>
   </table>
diff --git a/manual/xml/editor_nudging_key_bindings.xml b/manual/xml/editor_nudging_key_bindings.xml
index 8c0560d0b8..116a409c14 100644
--- a/manual/xml/editor_nudging_key_bindings.xml
+++ b/manual/xml/editor_nudging_key_bindings.xml
@@ -6,6 +6,10 @@
 
 <section id="sn-editor-nudging-key-bindings">
   <title>Nudging Key Bindings</title>
+  <para>
+  Nudging will move selected regions if there are any, otherwise the
+  playhead.
+  </para>
   <table id="tbl-editor-nudging-key-bindings">
     <title>Nudging Key Bindings</title>
     <tgroup cols = "2">
@@ -23,46 +27,29 @@
         </row>
       </thead>
       <tbody>
-        <row>
-          <entry>
-            <keycombo><keycap>+</keycap> </keycombo> (keypad)
-          </entry>
 
-          <entry>
-            nudge forward
-          </entry>
-        </row>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>+</keycap> </keycombo>
-            (keypad)
-          </entry>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Keypad +</keycap></keycombo>
+	  </entry>
 
-          <entry>
-            nudge next forward
-          </entry>
-        </row>
+	  <entry>
+	  nudge forward
+	  </entry>
+	</row>
 
-        <row>
-          <entry>
-            <keycombo><keycap>-</keycap> </keycombo> (keypad)
-          </entry>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Keypad -</keycap></keycombo>
+	  </entry>
 
-          <entry>
-            nudge backward
-          </entry>
-        </row>
+	  <entry>
+	  nudge backward
+	  </entry>
+	</row>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>-</keycap> </keycombo>
-          </entry>
 
-          <entry>
-            nudge next backward
-          </entry>
-        </row>
       </tbody>
     </tgroup>
   </table>
diff --git a/manual/xml/editor_play_position_key_bindings.xml b/manual/xml/editor_play_position_key_bindings.xml
index 52024cbb59..b13dfd751b 100644
--- a/manual/xml/editor_play_position_key_bindings.xml
+++ b/manual/xml/editor_play_position_key_bindings.xml
@@ -23,95 +23,168 @@
         </row>
       </thead>
       <tbody>
-        <row>
-          <entry>
-            <keycombo><keycap>p</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            position playhead at mouse pointer
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Return</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            move playhead to edit cursor
-          </entry>
-        </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Tab</keycap> </keycombo>
+            <keycombo><keycap>Home</keycap></keycombo>
           </entry>
 
           <entry>
-            move playhead to later region start
+            Move playhead to session start
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>Tab</keycap> </keycombo>
+            <keycombo><keycap>End</keycap></keycombo>
           </entry>
 
           <entry>
-            move playhead to later region end
+            Move playhead to session end
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>`</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            move playhead to earlier region start
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>`</keycap> </keycombo>
+            <keycombo><keycap>p</keycap> </keycombo>
           </entry>
 
           <entry>
-            move playhead to next mark
+            position playhead at mouse pointer
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>|</keycap> </keycombo> (keypad)
+            <keycombo><keycap>Return</keycap> </keycombo>
           </entry>
 
           <entry>
-            move playhead to previous mark
+            move playhead to selected marker (if any)
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>l</keycap> </keycombo>
+            <keycombo><keycap>Alt</keycap><keycap>Return</keycap> </keycombo>
           </entry>
 
           <entry>
-            center screen around playhead
+            move selected marker (if any) to playhead
           </entry>
         </row>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>g</keycap> </keycombo>
-          </entry>
+	<row>
+	  <entry>
+	    <keycombo><keycap>.</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  playhead to next region boundary
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>.</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  playhead to next region sync
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>,</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  playhead to previous region boundary
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>,</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  playhead to previous region sync
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>Right</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  tab to transient forwards
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>Left</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  tab to transient backwards
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>Left</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  playhead to previous region boundary
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Alt</keycap><keycap>Left</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  nudge playhead backward
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Right</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  playhead to next region boundary
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Alt</keycap><keycap>Right</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  nudge playhead forward
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>Keypad Right</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  jump forward to mark
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>Keypad Left</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  jump backward to mark
+	  </entry>
+	</row>
 
-          <entry>
-            goto
-          </entry>
-        </row>
       </tbody>
     </tgroup>
   </table>
diff --git a/manual/xml/editor_range_operations_key_bindings.xml b/manual/xml/editor_range_operations_key_bindings.xml
index 111de889de..715f952c8a 100644
--- a/manual/xml/editor_range_operations_key_bindings.xml
+++ b/manual/xml/editor_range_operations_key_bindings.xml
@@ -23,56 +23,36 @@
         </row>
       </thead>
       <tbody>
-        <row>
-          <entry>
-            <keycombo><keycap>Keypad Down arrow</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            begin range definition while transport rolls
-          </entry>
-        </row>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Keypad Up arrow</keycap> </keycombo>
-          </entry>
+	<row>
+	  <entry>
+	    <keycombo><keycap>F6</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  select range using edit range
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>&gt;</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  extend range to end of region
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>&lt;</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  extend range to start of region
+	  </entry>
+	</row>
 
-          <entry>
-            end range definition while transport rolls
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Shift</keycap><keycap>Tab</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            extend range to end of region
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap><keycap>Tab</keycap>
-            </keycombo>
-          </entry>
-
-          <entry>
-            extend range to start of region
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Meta</keycap><keycap>s</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            duplicate range
-          </entry>
-        </row>
       </tbody>
     </tgroup>
   </table>
diff --git a/manual/xml/editor_region_operations_key_bindings.xml b/manual/xml/editor_region_operations_key_bindings.xml
index e830c2c338..db140b83d5 100644
--- a/manual/xml/editor_region_operations_key_bindings.xml
+++ b/manual/xml/editor_region_operations_key_bindings.xml
@@ -6,6 +6,12 @@
 
 <section id="sn-editor-region-operation-key-bindings">
   <title>Region Operations Key Bindings</title>
+  <para>
+  Region operations generally operate on the currently selected
+  regions, if any. If none are selected but 1 or more tracks are selected
+  then regions in those tracks at the edit point will be used. If no
+  tracks are selected, then any region at the edit point will be used.
+  </para>
   <table id="tbl-editor-region-operation-key-bindings">
     <title>Region Operation Key Bindings</title>
     <tgroup cols = "2">
@@ -29,59 +35,171 @@
           </entry>
 
           <entry>
-            split region(s) at mouse
+            split region(s) at edit point
           </entry>
         </row>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Alt</keycap><keycap>s</keycap> </keycombo>
-          </entry>
+	<row>
+	  <entry>
+	    <keycombo><keycap>i</keycap></keycombo>
+	  </entry>
 
-          <entry>
-            split region(s) at edit cursor
-          </entry>
-        </row>
+	  <entry>
+	  insert region (from region list)
+	  </entry>
+	</row>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Insert</keycap> </keycombo>
-          </entry>
+	<row>
+	  <entry>
+	    <keycombo><keycap>d</keycap></keycombo>
+	  </entry>
 
-          <entry>
-            insert selected region (from region list)
-          </entry>
-        </row>
+	  <entry>
+	  duplicate region
+	  </entry>
+	</row>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Meta</keycap><keycap>d</keycap> </keycombo>
-          </entry>
+	<row>
+	  <entry>
+	    <keycombo><keycap>n</keycap></keycombo>
+	  </entry>
 
-          <entry>
-            duplicate region
-          </entry>
-        </row>
+	  <entry>
+	  normalize region
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>m</keycap></keycombo>
+	  </entry>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Alt</keycap><keycap>r</keycap> </keycombo>
-          </entry>
+	  <entry>
+	  mute/unmute region
+	  </entry>
+	</row>
 
-          <entry>
-            reverse region
-          </entry>
-        </row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>~</keycap></keycombo>
+	  </entry>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Alt</keycap><keycap>n</keycap> </keycombo>
-          </entry>
+	  <entry>
+	  boost region gain
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>&amp;</keycap></keycombo>
+	  </entry>
 
-          <entry>
-            normalize region
-          </entry>
-        </row>
+	  <entry>
+	  cut region gain
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>h</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  play selected regions
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>j</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  trim to start at edit point
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>k</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  trim to end at edit point
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>/</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  set fade in length (via edit point)
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>\</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  set fade out length (via edit point)
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Shift</keycap><keycap>{</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  trim from start to edit point
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Shift</keycap><keycap>}</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  trim from edit point to end
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>F3</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  crop (to edit range)
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>F4</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  separate (using edit range)
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>v</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  set region sync point(s) at edit point
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>F5</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  pitch shift region
+	  </entry>
+	</row>
+	
       </tbody>
     </tgroup>
   </table>
diff --git a/manual/xml/editor_selection_key_bindings.xml b/manual/xml/editor_selection_key_bindings.xml
new file mode 100644
index 0000000000..106d999030
--- /dev/null
+++ b/manual/xml/editor_selection_key_bindings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+]>
+
+<section id="sn-editor-selection-key-bindings">
+  <title>Selection Key Bindings</title>
+  <table id="tbl-window-key-bindings">
+    <title>Selection Key Bindings</title>
+    <tgroup cols = "2">
+      <colspec colnum="1" colname="Key Binding" colwidth="1"/>
+      <colspec colnum="2" colname="Action" colwidth= "2"/>
+      <thead>
+        <row>
+          <entry>
+            Key Binding
+          </entry>
+
+          <entry>
+            Action
+          </entry>
+        </row>
+      </thead>
+      <tbody>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>a</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  select all
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>p</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  select all before playhead
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>p</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  select all after playhead
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>u</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  select all within edit range
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Shift</keycap><keycap>i</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  invert selection
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>e</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  select all after edit cursor
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>e</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  select all before edit cursor
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>d</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  select all in punch range
+	  </entry>
+	</row>
+
+	<row>
+	  <entry>
+	    <keycombo><keycap>Ctrl</keycap><keycap>l</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  select all in loop range
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Alt</keycap><keycap>Up</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  select prev route
+	  </entry>
+	</row>
+	<row>
+	  <entry>
+	    <keycombo><keycap>Alt</keycap><keycap>Down</keycap></keycombo>
+	  </entry>
+
+	  <entry>
+	  select next route
+	  </entry>
+	</row>
+
+      </tbody>
+    </tgroup>
+  </table>
+<!--
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+		href="Some_Subsection.xml" />
+	-->
+</section>
diff --git a/manual/xml/editor_zoom_key_bindings.xml b/manual/xml/editor_zoom_key_bindings.xml
index b8afa14bfe..1cadd6ae94 100644
--- a/manual/xml/editor_zoom_key_bindings.xml
+++ b/manual/xml/editor_zoom_key_bindings.xml
@@ -5,7 +5,11 @@
 ]>
 
 <section id="sn-editor-zoom-key-bindings">
-  <title>Zoom Key Bindings</title>
+  <title>Zoom and Visual State Key Bindings</title>
+  <para>
+    By default, 12 function keys (F1-F12) are assigned to visual state
+    management. All of them are represented in the table as "Fn".
+  </para>
   <table id="tbl-editor-zoom-key-bindings">
     <title>Editor Zoom Key Bindings</title>
     <tgroup cols = "2">
@@ -45,13 +49,64 @@
 
         <row>
           <entry>
-            <keycombo><keycap>Z</keycap> </keycombo>
+            <keycombo><keycap>z</keycap> </keycombo>
           </entry>
 
           <entry>
             switch zoom focus to playhead
           </entry>
         </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>z</keycap> </keycombo>
+          </entry>
+
+          <entry>
+            Zoom to fit selected region(s) (time axis only)
+          </entry>
+        </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>Alt</keycap><keycap>z</keycap> </keycombo>
+          </entry>
+
+          <entry>
+            Zoom to fit selected region(s) (time axis &amp; vertical axis)
+          </entry>
+        </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>Shift</keycap><keycap>z</keycap> </keycombo>
+          </entry>
+
+          <entry>
+            Undo zoom change
+          </entry>
+        </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>Ctrl</keycap><keycap>Fn</keycap></keycombo>
+          </entry>
+
+          <entry>
+	    Save current visual state as VS #n (hold for 2 secs)
+          </entry>
+        </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>Ctrl</keycap><keycap>Fn</keycap></keycombo>
+          </entry>
+
+          <entry>
+	    Restore visual state #n (occurs on key release)
+          </entry>
+        </row>
+
       </tbody>
     </tgroup>
   </table>
diff --git a/manual/xml/general_key_bindings.xml b/manual/xml/general_key_bindings.xml
index edf77ad113..80f3809e70 100644
--- a/manual/xml/general_key_bindings.xml
+++ b/manual/xml/general_key_bindings.xml
@@ -35,46 +35,6 @@
 
         <row>
           <entry>
-            <keycombo><keycap>Alt</keycap><keycap>e</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            Raise the Editor Window
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Alt</keycap><keycap>m</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            Toggle display of the locations window
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Alt</keycap><keycap>c</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            Toggle display of the options editor
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>t</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            Add a track or bus
-          </entry>
-        </row>
-
-        <row>
-          <entry>
             <keycombo><keycap>Ctrl</keycap><keycap>s</keycap> </keycombo>
           </entry>
 
@@ -85,33 +45,24 @@
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>q</keycap> </keycombo>
+            <keycombo><keycap>Alt</keycap><keycap>i</keycap> </keycombo>
           </entry>
 
           <entry>
-            Quit
+            Import existing files into a session.
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>u</keycap> </keycombo>
+            <keycombo><keycap>Ctrl</keycap><keycap>q</keycap> </keycombo>
           </entry>
 
           <entry>
-            Starts a prefix entry sequence
+            Quit
           </entry>
         </row>
 
-        <row>
-          <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>m</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            Toggle sending MIDI feedback
-          </entry>
-        </row>
       </tbody>
     </tgroup>
   </table>
diff --git a/manual/xml/key_bindings.xml b/manual/xml/key_bindings.xml
index f3b50810a7..3aff10c6d4 100644
--- a/manual/xml/key_bindings.xml
+++ b/manual/xml/key_bindings.xml
@@ -10,15 +10,15 @@
     <title>Key Bindings</title>
     <para>
       Note that all keyboard bindings can be changed in either the system or
-      the user's Ardour configuration file
-      (<filename>$HOME/.ardour/ardour.rc</filename>).
+      the user's Ardour key bindings file
+      (<filename>$HOME/.ardour2/ardour.bindings</filename>).
     </para>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="general_key_bindings.xml" />
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
-		href="transport_key_bindings.xml" />
+		href="window_key_bindings.xml" />
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
-		href="mixer_window_key_bindings.xml" />
+		href="transport_key_bindings.xml" />
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="editor_window_key_bindings.xml" />
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
@@ -34,6 +34,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="editor_standard_editing_key_bindings.xml" />
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+		href="editor_selection_key_bindings.xml" />
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="editor_range_operations_key_bindings.xml" />
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="editor_nudging_key_bindings.xml" />
diff --git a/manual/xml/transport_key_bindings.xml b/manual/xml/transport_key_bindings.xml
index c2a3954b19..9fd799de89 100644
--- a/manual/xml/transport_key_bindings.xml
+++ b/manual/xml/transport_key_bindings.xml
@@ -35,43 +35,44 @@
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap><keycap>space</keycap></keycombo>
+            <keycombo><keycap>Ctrl</keycap><keycap>space</keycap></keycombo>
           </entry>
 
           <entry>
-            Raise the Editor Window
+            One-touch record (start transport &amp; recording)
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Shift</keycap><keycap>r</keycap></keycombo>
+            <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap><keycap>space</keycap></keycombo>
           </entry>
 
           <entry>
-            Toggle transport record-enable state
+	    Toggle transport motion, deleting any recorded material if recording
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Home</keycap></keycombo>
+            <keycombo><keycap>Shift</keycap><keycap>r</keycap></keycombo>
           </entry>
 
           <entry>
-            Move playhead to start
+            Toggle transport record-enable state
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>End</keycap></keycombo>
+            <keycombo><keycap>l</keycap> </keycombo>
           </entry>
 
           <entry>
-            Move playhead to end
+            toggle looping
           </entry>
         </row>
+
       </tbody>
     </tgroup>
   </table>
diff --git a/manual/xml/window_key_bindings.xml b/manual/xml/window_key_bindings.xml
new file mode 100644
index 0000000000..fad4791a47
--- /dev/null
+++ b/manual/xml/window_key_bindings.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+]>
+
+<section id="sn-window-key-bindings">
+  <title>Window Visibility Key Bindings</title>
+  <table id="tbl-window-key-bindings">
+    <title>Window Visibility Key Bindings</title>
+    <tgroup cols = "2">
+      <colspec colnum="1" colname="Key Binding" colwidth="1"/>
+      <colspec colnum="2" colname="Action" colwidth= "2"/>
+      <thead>
+        <row>
+          <entry>
+            Key Binding
+          </entry>
+
+          <entry>
+            Action
+          </entry>
+        </row>
+      </thead>
+      <tbody>
+
+        <row>
+          <entry>
+            <keycombo><keycap>Alt</keycap><keycap>e</keycap> </keycombo>
+          </entry>
+
+          <entry>
+            Raise editor window
+          </entry>
+        </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>Alt</keycap><keycap>m</keycap> </keycombo>
+          </entry>
+
+          <entry>
+            Raise mixer window
+          </entry>
+        </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>Alt</keycap><keycap>l</keycap> </keycombo>
+          </entry>
+
+          <entry>
+            Toggle locations window
+          </entry>
+        </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>Alt</keycap><keycap>b</keycap> </keycombo>
+          </entry>
+
+          <entry>
+            Toggle "big clock" window
+          </entry>
+        </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>Alt</keycap><keycap>k</keycap> </keycombo>
+          </entry>
+
+          <entry>
+            Toggle key bindings window
+          </entry>
+        </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>Alt</keycap><keycap>f</keycap> </keycombo>
+          </entry>
+
+          <entry>
+            Toggle Rhythm Ferret window
+          </entry>
+        </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>Alt</keycap><keycap>o</keycap> </keycombo>
+          </entry>
+
+          <entry>
+            Toggle preferences window
+          </entry>
+        </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>Alt</keycap><keycap>c</keycap> </keycombo>
+          </entry>
+
+          <entry>
+            Toggle color manager window
+          </entry>
+        </row>
+
+      </tbody>
+    </tgroup>
+  </table>
+<!--
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+		href="Some_Subsection.xml" />
+	-->
+</section>