X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fdefault-keyboard-bindings.html;h=f2ce8cb2066e56808f0b35670c2daab30cc27aa2;hb=8842cf2c02a0ff38f83798d10388c3c81b2d20d4;hp=52d35f433f1f5b45a156f1d5b3c49815c2bc07fb;hpb=a123dfec51122f0be59c06e9e836d5fceedc7650;p=ardour-manual

diff --git a/include/default-keyboard-bindings.html b/include/default-keyboard-bindings.html
index 52d35f4..f2ce8cb 100644
--- a/include/default-keyboard-bindings.html
+++ b/include/default-keyboard-bindings.html
@@ -32,14 +32,15 @@
 
 <p>
   Almost every key binding in Ardour can be looked for and/or changed in
-  <kbd class="menu">Window &gt; Key Bindings</kbd> (which is bound to <kbd
+  <kbd class="menu">Window &gt; Keyboard Shortcuts</kbd> (which is bound to <kbd
   class="mod2">K</kbd>).
 </p>
 
 <p class="warning">
-  Ardour will silently reassign the binding of a key combination that is
-  already in use, possibly removing a standard keyboard shortcut without any
-  warning. This might lead to confusion when asking for help&mdash;when the
+  Ardour will warn you with a "Colliding Keybindings" message, if you try to
+  reassign the binding of a key combination that is already in use.
+  Nevertheless if you do so, consider, that
+  this might lead to confusion when asking for help&mdash;when the
   explanation is given in terms of a standard key binding&mdash;which will have
   a completely different effect on the system with the modified key bindings.
 </p>
@@ -49,3 +50,4 @@
   class="mod2n"></kbd>, <kbd class="mod3n"></kbd>, etc.) differ among
   platforms, so different default bindings for each are provided.
 </p>
+