merge from 2.0-ongoing @ 3581

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

1 files changed, 138 insertions, 11 deletions

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>