X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fdefault-keyboard-bindings.html;h=f2ce8cb2066e56808f0b35670c2daab30cc27aa2;hb=935badcb9b12a81f840d447a01999755c4ff9916;hp=c576039d18ef140eeab0deb6f193f18dda60e021;hpb=fc55149168a9d75cf6760d96558d63cbdbbbc5df;p=ardour-manual

diff --git a/include/default-keyboard-bindings.html b/include/default-keyboard-bindings.html
index c576039..f2ce8cb 100644
--- a/include/default-keyboard-bindings.html
+++ b/include/default-keyboard-bindings.html
@@ -2,7 +2,7 @@
 <p>
   Almost every available function in Ardour can be bound to a keyboard
   shortcut (and those few that cannot will usually respond to an <a
-  href="/using-control-surfaces/controlling-ardour-with-osc/"><abbr
+  href="@@controlling-ardour-with-osc"><abbr
   title="Open Sound Control">OSC</abbr> command</a>). Ardour comes with a
   rich set of default <dfn>key bindings</dfn> for the most commonly used
   functions.
@@ -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>