merge from 2.0-ongoing @ 3581

git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf

16 files changed, 918 insertions, 202 deletions

diff --git a/manual/xml/editor_aligning_key_bindings.xml b/manual/xml/editor_aligning_key_bindings.xml
index 8a6c677272..3fbbd7acc4 100644
--- a/manual/xml/editor_aligning_key_bindings.xml
+++ b/manual/xml/editor_aligning_key_bindings.xml
@@ -25,43 +25,41 @@
       <tbody>
         <row>
           <entry>
-            <keycombo><keycap>a</keycap> </keycombo>
+            <keycombo><keycap>a</keycap></keycombo>
           </entry>
 
           <entry>
-            relative alignment of region sync points or starts
+            align regions using sync points and keeping relative positions
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Meta</keycap><keycap>a</keycap> </keycombo>
+            <keycombo><keycap>Alt</keycap><keycap>a</keycap></keycombo>
           </entry>
 
           <entry>
-            absolute alignment of region sync points or starts
+            align region ends
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap><keycap>a</keycap>
-            </keycombo>
+            <keycombo><keycap>Shift</keycap><keycap>a</keycap></keycombo>
           </entry>
 
           <entry>
-            relative alignment of region ends
+            align region sync points without keeping relative positions
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>Meta</keycap><keycap>a</keycap>
-            </keycombo>
+            <keycombo><keycap>Mod4</keycap><keycap>a</keycap></keycombo>
           </entry>
 
           <entry>
-            align region ends
+            align region starts and keeping relative positions
           </entry>
         </row>
       </tbody>
diff --git a/manual/xml/editor_canvas_key_bindings.xml b/manual/xml/editor_canvas_key_bindings.xml
index e9b3eb4d08..1a3bae8082 100644
--- a/manual/xml/editor_canvas_key_bindings.xml
+++ b/manual/xml/editor_canvas_key_bindings.xml
@@ -25,81 +25,61 @@
       <tbody>
         <row>
           <entry>
-            <keycombo><keycap>left arrow</keycap> </keycombo>
+            <keycombo><keycap>f</keycap></keycombo>
           </entry>
 
           <entry>
-            move editor timeline earlier
+            fit tracks
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>b</keycap> </keycombo>
+            <keycombo><keycap>Up</keycap></keycombo>
           </entry>
 
           <entry>
-            move editor timeline earlier
+            step tracks up
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>right arrow</keycap> </keycombo>
+            <keycombo><keycap>Down</keycap></keycombo>
           </entry>
 
           <entry>
-            move editor timeline later
+            step tracks down
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>f</keycap> </keycombo>
+            <keycombo><keycap>Page_Down</keycap></keycombo>
           </entry>
 
           <entry>
-            move editor timeline later
+            scroll tracks down
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Page_Up</keycap> </keycombo>
+            <keycombo><keycap>Page_Up</keycap></keycombo>
           </entry>
 
           <entry>
-            scroll track display up
+            scroll tracks up
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Page_Down</keycap> </keycombo>
+            <keycombo><keycap>Shift</keycap><keycap>e</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
+            show editor mixer
           </entry>
         </row>
       </tbody>
diff --git a/manual/xml/editor_edit_cursor_position_key_bindings.xml b/manual/xml/editor_edit_cursor_position_key_bindings.xml
index 1190e3efa7..25fc749c53 100644
--- a/manual/xml/editor_edit_cursor_position_key_bindings.xml
+++ b/manual/xml/editor_edit_cursor_position_key_bindings.xml
@@ -25,11 +25,111 @@
       <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 +140,7 @@
           </entry>
 
           <entry>
-            move edit cursor to playhead
+            move selected marker to playhead
           </entry>
         </row>
 
@@ -50,7 +150,7 @@
           </entry>
 
           <entry>
-            move edit cursor to earlier region start
+            move selected marker to earlier region start
           </entry>
         </row>
 
@@ -60,7 +160,7 @@
           </entry>
 
           <entry>
-            move edit cursor to earlier region end
+            move selected marker to earlier region end
           </entry>
         </row>
 
@@ -70,7 +170,7 @@
           </entry>
 
           <entry>
-            move edit cursor to next region start
+            move selected marker to next region start
           </entry>
         </row>
 
@@ -80,17 +180,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 +200,7 @@
           </entry>
 
           <entry>
-            moved edit cursor to previous region sync
+            moved selected marker to previous region sync
           </entry>
         </row>
 
@@ -110,7 +210,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 +220,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..62cabda4bd 100644
--- a/manual/xml/editor_locations_marks_key_bindings.xml
+++ b/manual/xml/editor_locations_marks_key_bindings.xml
@@ -35,21 +35,131 @@
 
         <row>
           <entry>
-            <keycombo><keycap>Keypad &gt;</keycap> </keycombo>
+            <keycombo><keycap>]</keycap></keycombo>
           </entry>
 
           <entry>
-            move playhead to next marker
+            set loop range from edit range
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Keypad &lt;</keycap> </keycombo>
+            <keycombo><keycap>Alt</keycap><keycap>]</keycap></keycombo>
           </entry>
 
           <entry>
-            move playhead to previous marker
+            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>
       </tbody>
diff --git a/manual/xml/editor_marker_bindings.xml b/manual/xml/editor_marker_bindings.xml
new file mode 100644
index 0000000000..b7ecc11033
--- /dev/null
+++ b/manual/xml/editor_marker_bindings.xml
@@ -0,0 +1,32 @@
+<?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..343869357b 100644
--- a/manual/xml/editor_miscellaneous_key_bindings.xml
+++ b/manual/xml/editor_miscellaneous_key_bindings.xml
@@ -25,23 +25,83 @@
       <tbody>
         <row>
           <entry>
-            <keycombo><keycap>l</keycap> </keycombo>
+            <keycombo><keycap>1</keycap></keycombo>
           </entry>
 
           <entry>
-            toggle auto loop
+            toggle edit mode
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>f</keycap> </keycombo>
+            <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>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..0d9ce0ff32 100644
--- a/manual/xml/editor_nudging_key_bindings.xml
+++ b/manual/xml/editor_nudging_key_bindings.xml
@@ -6,6 +6,11 @@
 
 <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">
@@ -25,7 +30,7 @@
       <tbody>
         <row>
           <entry>
-            <keycombo><keycap>+</keycap> </keycombo> (keypad)
+            <keycombo><keycap>Keypad +</keycap></keycombo>
           </entry>
 
           <entry>
@@ -35,34 +40,13 @@
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>+</keycap> </keycombo>
-            (keypad)
-          </entry>
-
-          <entry>
-            nudge next forward
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>-</keycap> </keycombo> (keypad)
+            <keycombo><keycap>Keypad -</keycap></keycombo>
           </entry>
 
           <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..5edb25911d 100644
--- a/manual/xml/editor_play_position_key_bindings.xml
+++ b/manual/xml/editor_play_position_key_bindings.xml
@@ -25,6 +25,26 @@
       <tbody>
         <row>
           <entry>
+            <keycombo><keycap>Home</keycap></keycombo>
+          </entry>
+
+          <entry>
+            Move playhead to session start
+          </entry>
+        </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>End</keycap></keycombo>
+          </entry>
+
+          <entry>
+            Move playhead to session end
+          </entry>
+        </row>
+
+        <row>
+          <entry>
             <keycombo><keycap>p</keycap> </keycombo>
           </entry>
 
@@ -39,77 +59,140 @@
           </entry>
 
           <entry>
-            move playhead to edit cursor
+            move playhead to selected marker (if any)
+          </entry>
+        </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>Alt</keycap><keycap>Return</keycap>
+            </keycombo>
+          </entry>
+
+          <entry>
+            move selected marker (if any) to playhead
+          </entry>
+        </row>
+
+        <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>Tab</keycap> </keycombo>
+            <keycombo><keycap>Ctrl</keycap><keycap>Left</keycap></keycombo>
           </entry>
 
           <entry>
-            move playhead to later region start
+            tab to transient backwards
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>Tab</keycap> </keycombo>
+            <keycombo><keycap>Left</keycap></keycombo>
           </entry>
 
           <entry>
-            move playhead to later region end
+            playhead to previous region boundary
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>`</keycap> </keycombo>
+            <keycombo><keycap>Alt</keycap><keycap>Left</keycap></keycombo>
           </entry>
 
           <entry>
-            move playhead to earlier region start
+            nudge playhead backward
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>`</keycap> </keycombo>
+            <keycombo><keycap>Right</keycap></keycombo>
           </entry>
 
           <entry>
-            move playhead to next mark
+            playhead to next region boundary
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>|</keycap> </keycombo> (keypad)
+            <keycombo><keycap>Alt</keycap><keycap>Right</keycap></keycombo>
           </entry>
 
           <entry>
-            move playhead to previous mark
+            nudge playhead forward
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>l</keycap> </keycombo>
+            <keycombo><keycap>Ctrl</keycap><keycap>Keypad
+            Right</keycap></keycombo>
           </entry>
 
           <entry>
-            center screen around playhead
+            jump forward to mark
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>g</keycap> </keycombo>
+            <keycombo><keycap>Ctrl</keycap><keycap>Keypad
+            Left</keycap></keycombo>
           </entry>
 
           <entry>
-            goto
+            jump backward to mark
           </entry>
         </row>
       </tbody>
diff --git a/manual/xml/editor_range_operations_key_bindings.xml b/manual/xml/editor_range_operations_key_bindings.xml
index 111de889de..b6d20e8504 100644
--- a/manual/xml/editor_range_operations_key_bindings.xml
+++ b/manual/xml/editor_range_operations_key_bindings.xml
@@ -25,27 +25,17 @@
       <tbody>
         <row>
           <entry>
-            <keycombo><keycap>Keypad Down arrow</keycap> </keycombo>
+            <keycombo><keycap>F6</keycap></keycombo>
           </entry>
 
           <entry>
-            begin range definition while transport rolls
+            select range using edit range
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Keypad Up arrow</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            end range definition while transport rolls
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Shift</keycap><keycap>Tab</keycap> </keycombo>
+            <keycombo><keycap>&gt;</keycap></keycombo>
           </entry>
 
           <entry>
@@ -55,24 +45,13 @@
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap><keycap>Tab</keycap>
-            </keycombo>
+            <keycombo><keycap>&lt;</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..8896588c65 100644
--- a/manual/xml/editor_region_operations_key_bindings.xml
+++ b/manual/xml/editor_region_operations_key_bindings.xml
@@ -6,6 +6,13 @@
 
 <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,57 +36,177 @@
           </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>
+            <keycombo><keycap>i</keycap></keycombo>
           </entry>
 
           <entry>
-            split region(s) at edit cursor
+            insert region (from region list)
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Insert</keycap> </keycombo>
+            <keycombo><keycap>d</keycap></keycombo>
           </entry>
 
           <entry>
-            insert selected region (from region list)
+            duplicate region
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Meta</keycap><keycap>d</keycap> </keycombo>
+            <keycombo><keycap>n</keycap></keycombo>
           </entry>
 
           <entry>
-            duplicate region
+            normalize region
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Alt</keycap><keycap>r</keycap> </keycombo>
+            <keycombo><keycap>m</keycap></keycombo>
           </entry>
 
           <entry>
-            reverse region
+            mute/unmute region
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Alt</keycap><keycap>n</keycap> </keycombo>
+            <keycombo><keycap>~</keycap></keycombo>
           </entry>
 
           <entry>
-            normalize region
+            boost region gain
+          </entry>
+        </row>
+
+        <row>
+          <entry>
+            <keycombo><keycap>&amp;</keycap></keycombo>
+          </entry>
+
+          <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>
diff --git a/manual/xml/editor_selection_key_bindings.xml b/manual/xml/editor_selection_key_bindings.xml
new file mode 100644
index 0000000000..d8f2e627d4
--- /dev/null
+++ b/manual/xml/editor_selection_key_bindings.xml
@@ -0,0 +1,142 @@
+<?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-selection-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..1b30a217ca 100644
--- a/manual/xml/editor_zoom_key_bindings.xml
+++ b/manual/xml/editor_zoom_key_bindings.xml
@@ -5,7 +5,12 @@
 ]>
 
 <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 +50,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..79b8693798 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,31 +45,21 @@
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>q</keycap> </keycombo>
-          </entry>
-
-          <entry>
-            Quit
-          </entry>
-        </row>
-
-        <row>
-          <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>u</keycap> </keycombo>
+            <keycombo><keycap>Alt</keycap><keycap>i</keycap> </keycombo>
           </entry>
 
           <entry>
-            Starts a prefix entry sequence
+            Import existing files into a session.
           </entry>
         </row>
 
         <row>
           <entry>
-            <keycombo><keycap>Ctrl</keycap><keycap>m</keycap> </keycombo>
+            <keycombo><keycap>Ctrl</keycap><keycap>q</keycap> </keycombo>
           </entry>
 
           <entry>
-            Toggle sending MIDI feedback
+            Quit
           </entry>
         </row>
       </tbody>
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..4026cb64cb 100644
--- a/manual/xml/transport_key_bindings.xml
+++ b/manual/xml/transport_key_bindings.xml
@@ -35,41 +35,42 @@
 
         <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>
diff --git a/manual/xml/window_key_bindings.xml b/manual/xml/window_key_bindings.xml
new file mode 100644
index 0000000000..e75bf5a3ae
--- /dev/null
+++ b/manual/xml/window_key_bindings.xml
@@ -0,0 +1,112 @@
+<?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>