X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=master-doc.txt;h=28aa8c49aabbc3bda28c0f580d98b934701ed754;hb=84dd34b2f5af2820a2af003ed7d87cf6a3c790ea;hp=80e35c4472ee3d661d0353594e6784bd35fd865b;hpb=e957674fe9b4239dfb346e569724a4b14a704259;p=ardour-manual

diff --git a/master-doc.txt b/master-doc.txt
index 80e35c4..28aa8c4 100644
--- a/master-doc.txt
+++ b/master-doc.txt
@@ -229,6 +229,14 @@ uri: setting-up-your-system/using_more_than_one_audio_device
 part: subchapter
 ---
 
+---
+title: Monitor Setup in Ardour
+menu_title: Monitor Setup in Ardour
+include: monitor-setup-in-ardour.html
+link: monitor-setup-in-ardour
+uri: recording/monitoring/monitor-setup-in-ardour
+part: subchapter
+---
 
 ---
 title: Synchronization
@@ -273,131 +281,14 @@ part: subchapter
 ---
 
 ---
-title: Global Preferences
-menu_title: Global Preferences
-include: global-preferences-dialog.html
-link: global-preferences-dialog
+title: Preferences
+menu_title: Preferences
+include: preferences.html
+link: preferences
 uri: preferences-and-session-properties/preferences-dialog
 part: chapter
 ---
 
----
-title: Global Misc Tab
-menu_title: Misc Tab
-include: global-misc-tab.html
-link: global-misc-tab
-uri: preferences-and-session-properties/preferences-dialog/misc
-part: subchapter
----
-
----
-title: Transport Tab
-menu_title: Transport Tab
-include: transport-tab.html
-link: transport-tab
-uri: preferences-and-session-properties/preferences-dialog/transport
-part: subchapter
----
-
----
-title: Editor Tab
-menu_title: Editor Tab
-include: editor-tab.html
-link: editor-tab
-uri: preferences-and-session-properties/preferences-dialog/editor
-part: subchapter
----
-
----
-title: Audio Tab
-menu_title: Audio Tab
-include: audio-tab.html
-link: audio-tab
-uri: preferences-and-session-properties/preferences-dialog/audio
-part: subchapter
----
-
----
-title: Solo/Mute Tab
-menu_title: Solo/Mute Tab
-include: solomute-tab.html
-link: solomute-tab
-uri: preferences-and-session-properties/preferences-dialog/solomute
-part: subchapter
----
-
----
-title: MIDI Tab
-menu_title: MIDI Tab
-include: midi-tab.html
-link: midi-tab
-uri: preferences-and-session-properties/preferences-dialog/midi
-part: subchapter
----
-
----
-title: User Interaction Tab
-menu_title: User Interaction Tab
-include: user-interaction-tab.html
-link: user-interaction-tab
-uri: preferences-and-session-properties/preferences-dialog/interaction
-part: subchapter
----
-
----
-title: Control Surfaces Tab
-menu_title: Control Surfaces Tab
-include: control-surfaces-tab.html
-link: control-surfaces-tab
-uri: preferences-and-session-properties/preferences-dialog/control_surfaces
-part: subchapter
----
-
----
-title: Video Tab
-menu_title: Video Tab
-include: video-tab.html
-link: video-tab
-uri: preferences-and-session-properties/preferences-dialog/video
-part: subchapter
----
-
----
-title: Plugins Tab
-menu_title: Plugins Tab
-include: plugins-tab.html
-link: plugins-tab
-uri: preferences-and-session-properties/preferences-dialog/plugins
-part: subchapter
----
-
----
-title: GUI Tab
-menu_title: GUI Tab
-include: gui-tab.html
-link: gui-tab
-uri: preferences-and-session-properties/preferences-dialog/gui
-part: subchapter
----
-
----
-title: Metering Tab
-menu_title: Metering Tab
-include: metering-tab.html
-link: metering-tab
-uri: preferences-and-session-properties/preferences-dialog/metering
-part: subchapter
----
-
----
-title: Theme Tab
-menu_title: Theme Tab
-include: theme-tab.html
-link: theme-tab
-uri: preferences-and-session-properties/preferences-dialog/theme
-part: subchapter
----
-
 ---
 title: Session Properties
 menu_title: Session Properties
@@ -1164,15 +1055,6 @@ uri: recording/monitoring/monitor-signal-flow
 part: subchapter
 ---
 
----
-title: Monitor Setup in Ardour
-menu_title: Setup in Ardour
-include: monitor-setup-in-ardour.html
-link: monitor-setup-in-ardour
-uri: recording/monitoring/monitor-setup-in-ardour
-part: subchapter
----
-
 ---
 title: Punch Recording Modes
 include: punch-recording-modes.html
@@ -2194,7 +2076,6 @@ uri: using-control-surfaces/Presonus_FaderPort
 part: chapter
 ---
 
-
 ---
 title: Using the PreSonus FaderPort 8
 menu_title: PreSonus FaderPort 8