Keyboard Shortcuts: initial revision of the documentation (rebase conflict fix)

[ardour-manual] / master-doc.txt

diff --git a/master-doc.txt b/master-doc.txt
index bd7af127afeeba0fc2f54864f71523cdf5e2981e..5d9678a5477421ef8f1a5c93a56c7ad78b5dc5dc 100644 (file)
--- a/master-doc.txt
+++ b/master-doc.txt
@@ -266,6 +266,15 @@ uri: synchronization/overview-of-timecode-related-settings
 part: subchapter
 ---
 
+---
+title: Transport Masters
+menu_title: Transport Masters
+include: transport-masters.html
+link: transport-masters
+uri: synchronization/transport-masters.html
+part: subchapter
+---
+
 ---
 title: Preferences
 menu_title: Preferences
@@ -292,6 +301,30 @@ uri: setting-up-your-system/setting-up-midi
 part: chapter
 ---
 
+---
+title: MIDI on Linux
+include: midi-on-linux.html
+link: midi-on-linux
+uri: setting-up-your-system/setting-up-midi/midi-on-linux
+part: subchapter
+---
+
+---
+title: MIDI on OS X
+include: midi-on-os-x.html
+link: midi-on-os-x
+uri: setting-up-your-system/setting-up-midi/midi-on-os-x
+part: subchapter
+---
+
+---
+title: Keyboard Shortcuts
+include: keyboard-shortcuts.html
+link: keyboard-shortcuts
+uri: setting-up-your-system/keyboard-shortcuts
+part: chapter
+---
+
 ---
 title: Ardour's Interface
 uri: ardours-interface
@@ -1454,7 +1487,7 @@ part: chapter
 
 ---
 title: Clips
-uri: clips
+link: clips
 part: part
 ---