Sync to master.

[ardour-manual-diverged] / master-doc.txt

diff --git a/master-doc.txt b/master-doc.txt
index f2997aba1bf5e0069e3c3413d2b5b8a33c39f786..7d2c720254b06849fa95463742f92e998f0f6ba2 100644 (file)
--- a/master-doc.txt
+++ b/master-doc.txt
@@ -24,12 +24,6 @@ include: _manual/01_welcome-to-ardour.html
 part: subchapter
 ---
 
----
-title: About Ardour
-include: _manual/01_welcome-to-ardour/01_about-ardour.html
-part: subchapter
----
-
 ---
 title: Isn't This A Really Complicated Program?
 include: _manual/01_welcome-to-ardour/01_about-ardour/01_isnt-this-a-really-complicated-program.html
@@ -1779,38 +1773,38 @@ part: subchapter
 ---
 
 ---
-title: Devices using Mackie/Logic Control Protocol
-include: _manual/23_using-control-surfaces/02_devices-using-mackielogic-control-protocol.html
+title: Controlling Ardour with Mackie Control Devices
+include: _manual/23_using-control-surfaces/02_mackie-control-protocol.html
 exclude: yes
 part: chapter
 ---
 
 ---
-title: Behringer devices in Mackie/Logic Control Mode
-menu_title: Behringer devices
-include: _manual/23_using-control-surfaces/02_devices-using-mackielogic-control-protocol/01_behringer-devices-in-mackielogic-control-mode.html
+title: Devices Using Mackie/Logic Control Protocol
+include: _manual/23_using-control-surfaces/02_mackie-control-protocol/01_mackie-control-configure.html
 exclude: yes
 part: subchapter
 ---
 
 ---
 title: SSL Nucleus
-include: _manual/23_using-control-surfaces/02_devices-using-mackielogic-control-protocol/02_ssl-nucleus.html
+include: _manual/23_using-control-surfaces/02_mackie-control-protocol/02_ssl-nucleus.html
 exclude: yes
 part: subchapter
 ---
 
 ---
-title: Mackie Control Setup on Linux
-include: _manual/23_using-control-surfaces/02_devices-using-mackielogic-control-protocol/03_mackie-control-setup-on-linux.html
+title: Behringer Devices in Mackie/Logic Control Mode
+menu_title: Behringer Devices
+include: _manual/23_using-control-surfaces/02_mackie-control-protocol/03_behringer-devices-in-mackielogic-control-mode.html
 exclude: yes
 part: subchapter
 ---
 
 ---
 title: What to do if your Device is not Listed
-menu_title: Unlisted devices
-include: _manual/23_using-control-surfaces/02_devices-using-mackielogic-control-protocol/04_devices-not-listed.html
+menu_title: Unlisted Devices
+include: _manual/23_using-control-surfaces/02_mackie-control-protocol/04_devices-not-listed.html
 exclude: yes
 part: subchapter
 ---
@@ -1818,7 +1812,7 @@ part: subchapter
 ---
 title: Working With Extenders
 menu_title: Working With Extenders
-include: _manual/23_using-control-surfaces/02_devices-using-mackielogic-control-protocol/05_working-with-extenders.html
+include: _manual/23_using-control-surfaces/02_mackie-control-protocol/05_working-with-extenders.html
 exclude: yes
 part: subchapter
 ---