whitespace change to test commit hook

[ardour-manual] / include / default-keyboard-bindings.html

diff --git a/include/default-keyboard-bindings.html b/include/default-keyboard-bindings.html
index 2babb4acaea0c132dd0f8dfe6a2ad08276886912..f2ce8cb2066e56808f0b35670c2daab30cc27aa2 100644 (file)
--- 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.
@@ -20,37 +20,31 @@
 
 <p>
   <kbd>S</kbd> for <kbd class="menu">Region &gt; Edit &gt; Split</kbd>
-</p>
-
-<p>
   or
-</p>
-
-<p>
   <kbd>P</kbd> for <kbd class="menu">Transport &gt; Playhead &gt; Playhead to
   Mouse</kbd>.
 </p>
 
 <p>
   Existing key bindings in menus are listed on the right side of the menu
-  items. To create a custom key binding for a menu item quickly, navigate to
-  the relevant menu or submenu, hover over the item with the mouse and press
-  the desired combination of modifiers and key.
+  items.
+</p>
+
+<p>
+  Almost every key binding in Ardour can be looked for and/or changed in
+  <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>
 
-<p>
-  Almost every key binding in Ardour can be looked for and/or changed in
-  <kbd class="menu">Window &gt; Key Bindings</kbd>.
-</p>
-
 <p>
   The conventions for using modifier keys (<kbd class="mod1n"></kbd>, <kbd
   class="mod2n"></kbd>, <kbd class="mod3n"></kbd>, etc.) differ among