From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 8 Jun 2015 21:28:19 +0000 (-0400)
Subject: Merge branch 'hotguac-master'
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e94a4484d1165b0646cfec3f42e6dd0393026c3a;hp=acaac6f358ba757f29d63cc618b2c86cbfe86738;p=ardour-manual-diverged

Merge branch 'hotguac-master'
---

diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/04_audio.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/04_audio.html
index 2ff3615..91d897b 100644
--- a/_manual/21_preferences-and-session-properties/01_preferences-dialog/04_audio.html
+++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/04_audio.html
@@ -125,7 +125,7 @@ audio tab"/>
       <li>
 	<p>
 	  <strong>Make new plugins active</strong> when enabled, will activate
-	  a plugin when it is added to a track or buss
+	  a plugin when it is added to a track or bus
 	  <a href="/working-with-plugins/processor-box/">Processor Box</a>.
 	</p>
       </li>
diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/05_solomute.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/05_solomute.html
index b6c0592..a41e842 100644
--- a/_manual/21_preferences-and-session-properties/01_preferences-dialog/05_solomute.html
+++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/05_solomute.html
@@ -5,7 +5,9 @@ menu_title: Solo/Mute Tab
 ---
 
 <p>
-  This tab contains settings that affect the use of solo, muting, and panning.
+  This tab contains settings that affect the use of
+  <a href="/mixing/muting-and-soloing/">solo, muting</a>, and
+  <a href="/mixing/panning/">panning</a>.
 </p>
 
 <img src="/files/a4/a4_preferences_solomute.png" alt="preferences
@@ -19,42 +21,59 @@ solo/mute tab"/>
     <ul>
       <li>
 	<p>
-	  <strong>Solo-in-place mute cut</strong>
+	  <strong>Solo-in-place mute cut</strong> sets the attenuation of the
+	  the other tracks when another track is soloed in place. This setting
+	  is also available from the <strong>Mixer</strong> monitor section.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Solo controls are Listen controls</strong>
+	  <strong>Solo controls are Listen controls</strong> when enabled the
+	  soloed track is soloed only on the monitor bus, the master fader mix
+	  is not affected by the solo. This option can also be set by enabling
+	  pre-fader listen or after-fader listen in the <strong>Mixer</strong>
+	  monitor section.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Listen Position:</strong>
+	  <strong>Listen Position:</strong> determines what is listened to when
+	  the solo controls are used as listen controls. The options are
+	  after-fader or pre-fader.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>PFL signals come from:</strong>
+	  <strong>PFL signals come from:</strong> determines whether the
+	  pre-fader listen position is before or after the pre-fader processors.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>AFL signals come from:</strong>
+	  <strong>AFL signals come from:</strong> determines whether the
+	  after-fader listen position is before or after the after-fader
+	  processors.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Exclusive solo</strong>
+	  <strong>Exclusive solo</strong> when enabled will only solo that last
+	  track selected for solo. Previously soloed tracks will be un-soloed.
+	  This setting is also available from the <strong>Mixer</strong> monitor
+	  section.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Show solo muting</strong>
+	  <strong>Show solo muting</strong> when enabled outlines the mute
+	  button on tracks and busses when another track is soloed.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Soloing overrides muting</strong>
+	  <strong>Soloing overrides muting</strong> when enabled allows a track
+	  to be heard when it is soloed while muted. This setting is also
+	  available from the <strong>Mixer</strong> monitor section.
 	</p>
       </li>
     </ul>
@@ -62,27 +81,33 @@ solo/mute tab"/>
 
   <li>
     <p>
-      <strong>Default track/bus muting options</strong>
+      <strong>Default track/bus muting options</strong> sets the muting options
+      for a newly created tracks or bus. The mute options for an existing track
+      or bus are changed by the right-click context menu on a mute button.
     </p>
     <ul>
       <li>
 	<p>
-	  <strong>Mute affects pre-fader sends</strong>
+	  <strong>Mute affects pre-fader sends</strong> when enabled pre-fader
+	  sends will be muted by default.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Mute affects post-fader sends</strong>
+	  <strong>Mute affects post-fader sends</strong> when enabled post-fader
+	  sends will be muted by default.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Mute affects control outputs</strong>
+	  <strong>Mute affects control outputs</strong> when enabled control
+	  outputs are muted by default.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Mute affects main outputs</strong>
+	  <strong>Mute affects main outputs</strong> when enabled main outputs
+	  are muted by default.
 	</p>
       </li>
     </ul>
@@ -90,12 +115,19 @@ solo/mute tab"/>
 
   <li>
     <p>
-      <strong>Send Routing</strong>
+      <strong>Send Routing</strong> affects
+      <a href="/signal-routing/aux-sends/">aux and external sends</a>.
     </p>
     <ul>
       <li>
 	<p>
-	  <strong>Link panners of Aux and External Sends with main panner by default</strong>
+	  <strong>Link panners of Aux and External Sends with main panner by
+	    default</strong> When enabled, sends follow the channel panner.
+	</p>
+	<p>
+	  When disabled, sends can panned independently of the channel panner
+	  and fader. Double clicking the send in the processor box toggles
+	  the main panner and fader between the aux send and the channel.
 	</p>
       </li>
     </ul>
diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/06_midi.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/06_midi.html
index 97ecbab..652b3ca 100644
--- a/_manual/21_preferences-and-session-properties/01_preferences-dialog/06_midi.html
+++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/06_midi.html
@@ -20,31 +20,39 @@ MIDI tab"/>
 
   <li>
     <p>
-      <strong>Send MIDI Clock</strong>
+      <strong>Send MIDI Clock</strong> when enabled Ardour will generate MIDI
+      clock on the <code>ardour:MIDI clock out</code> JACK port.
     </p>
   </li>
 
   <li>
     <p>
-      <strong>Send MIDI Time Code</strong>
+      <strong>Send MIDI Time Code</strong> when enabled Ardour will generate MIDI
+      time code on the <code>ardour:MTC out</code> JACK port.
     </p>
   </li>
 
   <li>
     <p>
-      <strong>Percentage either side of normal transport speed to transmit MTC:</strong>
+      <strong>Percentage either side of normal transport speed to transmit MTC:</strong> MIDI time code generation will be disabled when the transport speed is
+      greater than normal sped plus this percentage or less than normal minus
+      this percentage.
     </p>
   </li>
 
   <li>
     <p>
-      <strong>Obey MIDI Machine Control commands</strong>
+      <strong>Obey MIDI Machine Control commands</strong> when enabled Ardour
+      will respond to MIDI Machine Control commands received on the
+      <code>ardour:MMC in</code> JACK port.
     </p>
   </li>
 
   <li>
     <p>
-      <strong>Send MIDI Machine Control commands</strong>
+      <strong>Send MIDI Machine Control commands</strong> when enabled Ardour
+      will send MIDI Machine Control commands on the <code>ardour:MMC out</code>
+      JACK port.
     </p>
   </li>
 
@@ -56,19 +64,25 @@ MIDI tab"/>
 
   <li>
     <p>
-      <strong>Inbound MMC device ID:</strong>
+      <strong>Inbound MMC device ID:</strong> is the only device ID Ardour will
+      respond to when an MMC command is received on the
+      <code>ardour:MMC in</code> JACK port.
     </p>
   </li>
 
   <li>
     <p>
-      <strong>Outbound MMC device ID:</strong>
+      <strong>Outbound MMC device ID:</strong> is the MIDI device ID Ardour will
+      use when it sends MMC commands.
     </p>
   </li>
 
   <li>
     <p>
-      <strong>Initial program change:</strong>
+      <strong>Initial program change:</strong> Ardour will send a MIDI program
+      change message on the <code>ardour:MMC out</code> JACK port when a session
+      is loaded and whenever this field is changed. A value of -1 is for don't
+      send any program change message.
     </p>
   </li>
 
diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/07_interaction.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/07_interaction.html
index 95d5c99..b7b9388 100644
--- a/_manual/21_preferences-and-session-properties/01_preferences-dialog/07_interaction.html
+++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/07_interaction.html
@@ -25,7 +25,8 @@ user interaction tab"/>
     <ul>
       <li>
 	<p>
-	  <strong>Edit using:</strong>
+	  <strong>Edit using:</strong> Use this keyboard and mouse combination
+	  to edit a region's name, and for audio, the region gain.
 	</p>
       </li>
       <li>
@@ -35,12 +36,17 @@ user interaction tab"/>
       </li>
       <li>
 	<p>
-	  <strong>Insert note using</strong>
+	  <strong>Insert note using</strong> Using this mouse and keyboard
+	  combination allows MIDI note drawing while the <strong>Editor</strong>
+	  is in edit mode.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Ignore snap using:</strong>
+	  <strong>Ignore snap using:</strong> This mouse and keyboard combination
+	  temporarily changes the
+	  <a href="/editing-and-arranging/snap-to-the-grid/">snap mode</a> to
+	  <strong>No Grid</strong>.
 	</p>
       </li>
       <li>
diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/10_plugins.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/10_plugins.html
index 522b773..29d1761 100644
--- a/_manual/21_preferences-and-session-properties/01_preferences-dialog/10_plugins.html
+++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/10_plugins.html
@@ -5,7 +5,8 @@ menu_title: Plugins Tab
 ---
 
 <p>
-  This tab contains settings that do not belong on the other tabs.
+  This tab contains settings that control the discovery and availability of
+  plugins.
 </p>
 
 <img src="/files/a4/a4_preferences_plugins.png" alt="preferences
@@ -19,17 +20,22 @@ plugins tab"/>
     <ul>
       <li>
 	<p>
-	  <strong>Scan for Plugins</strong>
+	  <strong>Scan for Plugins</strong> will initiate an immediate scan of
+	  the system for available plugins.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Allow Display Plugin Scan Progress</strong>
+	  <strong>Always Display Plugin Scan Progress</strong> When enabled a
+	  popup window showing plugin scan progress is displayed for indexing
+	  (cache load) and discovery (detect new plugins).
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Scan Time Out</strong>
+	  <strong>Scan Time Out</strong> Specify the default timeout for plugin
+	  instantiation in 1/10 seconds. Plugins that require more time to load
+	  will be blacklisted. A value of 0 disables the timeout.
 	</p>
       </li>
     </ul>
@@ -42,22 +48,28 @@ plugins tab"/>
     <ul>
       <li>
 	<p>
-	  <strong>Clear VST Cache</strong>
+	  <strong>Clear VST Cache</strong> Remove all VST plugins from the list
+	  of plugins available to be inserted into the processor box.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Clear VST Blacklist</strong>
+	  <strong>Clear VST Blacklist</strong> Make blacklisted VST plugins
+	  available to be added to the processor box.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Scan for [new] VST Plugins on Application Start</strong>
+	  <strong>Scan for [new] VST Plugins on Application Start</strong> When
+	  enabled new VST plugins are searched, tested and added to the cache
+	  index on application start. When disabled new plugins will only be
+	  available after triggering a 'Scan' manually.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Linux VST Path:</strong>
+	  <strong>Linux VST Path:</strong> Launch a dialog to manage the
+	  directories that will be searched for Linux VST plugins.
 	</p>
       </li>
     </ul>
diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/11_gui.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/11_gui.html
index b0714db..25c47a1 100644
--- a/_manual/21_preferences-and-session-properties/01_preferences-dialog/11_gui.html
+++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/11_gui.html
@@ -20,64 +20,47 @@ gui tab"/>
   </li>
   <li>
     <p>
-      <strong>Use name highlight bars in region display</strong>
+      <strong>Use name highlight bars in region display</strong> When enabled the
+      region name is displayed, in the editor,  in it's own bar at the bottom of
+      the region. When disabled, the region name is display at the top of the
+      region, possibly over audio waveforms or MIDI notes.
     </p>
   </li>
   <li>
     <p>
-      <strong>Font scaling</strong>
+      <strong>Font scaling</strong> allows the display size of some text in the
+      user interface to be scaled up or down. May require a restart to take
+      affect.
     </p>
   </li>
   <li>
     <p>
-      <strong>Update transport clock display at FPS</strong>
+      <strong>Update transport clock display at FPS</strong> when enabled the transport clock
+      will update at the synchronization framerate instead of the default 100&nbsp;ms rate.
     </p>
   </li>
   <li>
     <p>
-      <strong>Lock timeout</strong>
+      <strong>Lock timeout</strong> Lock GUI after this many idle seconds (zero to never
+      lock). GUI may also be locked with <kbd class="menu">Session &gt; Lock</kbd>. When
+      locked a dialog will display a &quot;Click to unlock&quot; button.
     </p>
   </li>
   <li>
     <p>
-      <strong>Mixer Strip</strong>
+      <strong>Mixer Strip</strong> Enable (checked) or disable (unchecked) display of
+      controls in the mixer strip. Controls whose display can be toggled are
+      <strong>Input</strong>, <strong>Phase&nbsp;Invert</strong>,
+      <strong>Record&nbsp;&amp;&nbsp;Monitor</strong>, <strong>Solo&nbsp;Iso/Lock</strong>,
+      <strong>Output</strong>, and <strong>Comments</strong>.
+    </p>
+  </li>
+  <li>
+    <p>
+      <strong>Use narrow strips in the mixer by default</strong> When enabled, new mixer
+      strips are created in narrow format. When disabled, they are created in wide format.
+      Existing mixer strips width can be toggled with the width control at the top left of
+      the mixer stip.
     </p>
-    <ul>
-      <li>
-	<p>
-	  <strong>Input</strong>
-	</p>
-      </li>
-      <li>
-	<p>
-	  <strong>Phase Invert</strong>
-	</p>
-      </li>
-      <li>
-	<p>
-	  <strong>Record &amp; Monitor</strong>
-	</p>
-      </li>
-      <li>
-	<p>
-	  <strong>Solo Iso/Lock</strong>
-	</p>
-      </li>
-      <li>
-	<p>
-	  <strong>Output</strong>
-	</p>
-      </li>
-      <li>
-	<p>
-	  <strong>Comments</strong>
-	</p>
-      </li>
-      <li>
-	<p>
-	  <strong>Use narrow strips in the mixer by default</strong>
-	</p>
-      </li>
-    </ul>
   </li>
 </ul>
diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/12_metering.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/12_metering.html
index 18c8114..6ce721f 100644
--- a/_manual/21_preferences-and-session-properties/01_preferences-dialog/12_metering.html
+++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/12_metering.html
@@ -5,7 +5,8 @@ menu_title: Metering Tab
 ---
 
 <p>
-  This tab contains settings that affect the display and behavior of meters.
+  This tab contains settings that affect <a href="/ardours-interface/meters/">
+    Metering</a> in Ardour.
 </p>
 
 <img src="/files/a4/a4_preferences_metering.png" alt="preferences
@@ -14,7 +15,9 @@ metering tab"/>
 <ul>
   <li>
     <p>
-      <strong>Peak hold time:</strong>
+      <strong>Peak hold time:</strong> Some meter types that have a peak
+      indicator that has a user controlled hold time. The options are off, short,
+      medium, or long.
     </p>
   </li>
   <li>
diff --git a/_manual/21_preferences-and-session-properties/01_preferences-dialog/13_theme.html b/_manual/21_preferences-and-session-properties/01_preferences-dialog/13_theme.html
index 3599ba3..9fd5498 100644
--- a/_manual/21_preferences-and-session-properties/01_preferences-dialog/13_theme.html
+++ b/_manual/21_preferences-and-session-properties/01_preferences-dialog/13_theme.html
@@ -14,72 +14,108 @@ theme tab"/>
 <ul>
   <li>
     <p>
-      <strong>Restore Defaults</strong>
+      <strong>Restore Defaults</strong> When clicked will change all settings
+      on the Theme tab back to Ardour's default values.
     </p>
   </li>
   <li>
     <p>
-      <strong>All floating windows are dialogs</strong>
+      <strong>All floating windows are dialogs</strong> When enabled Ardour will
+      use type &quot;Dialog&quot; for all floating windows instead of using type
+      &quot;Utility&quot; for some of them. This may help usability with some
+      window managers. This setting requires a restart of Ardour to take effect.
     </p>
   </li>
   <li>
     <p>
-      <strong>Transient windows follow front window</strong>
+      <strong>Transient windows follow front window</strong> When enabled
+      transient windows will follow the front window when toggling between the
+      editor and mixer. This setting requires a restart of Ardour to take effect.
     </p>
   </li>
   <li>
     <p>
-      <strong>Draw &quot;flat&quot; buttons</strong>
+      <strong>Draw &quot;flat&quot; buttons</strong> When enabled button controls
+      in the user interface will be drawn with a flat look. When disabled button
+      controls will have a slight 3D appearence.
     </p>
   </li>
   <li>
     <p>
-      <strong>Blink Rec-Arm buttons</strong>
+      <strong>Blink Rec-Arm buttons</strong> When enabled the record-armed
+      buttons on tracks will blink when they are armed but not currently
+      recording. When disabled the record-armed buttons on tracks will be
+      outlined in red instead of blinking.
     </p>
   </li>
   <li>
     <p>
-      <strong>Color regions using their track's color</strong>
+      <strong>Color regions using their track's color</strong> When enabled
+      the background color of regions in the editor will be displayed using the
+      the color assigned to the track. When disabled the default region
+      background color will be used.
     </p>
   </li>
   <li>
     <p>
-      <strong>Show waveform clipping</strong>
+      <strong>Show waveform clipping</strong> When enalbled the waveform
+      displayed will show peaks marked in red if they exceed the clip level. The
+      Waveform Clip Level is set with a slider on the Preferences
+      <a href="/preferences-and-session-properties/preferences-dialog/editor/">
+	Editor tab</a>
     </p>
   </li>
   <li>
     <p>
-      <strong>Icon Set</strong>
+      <strong>Icon Set</strong> Changes the mouse cursor icons used to indicate
+      different tool modes in the editor. An example would be the icons used to
+      indicate whether the cursor will select a region or change the length of a
+      region.
     </p>
   </li>
   <li>
     <p>
-      <strong>Waveforms color gradient depth</strong>
+      <strong>Waveforms color gradient depth</strong> Determines how much
+      gradient effect is applied to audio waveforms displayed in the editor.
+      Values range from 0.00, no graident effect, to 0.95, maximum effect.
     </p>
   </li>
   <li>
     <p>
-      <strong>Timeline item gradient depth</strong>
+      <strong>Timeline item gradient depth</strong> Determines how much
+      gradient effect is applied to the backgrounds of regions displayed in the
+      editor. Values range from 0.00, no graident effect, to 0.95, maximum
+      effect.
     </p>
   </li>
   <li>
     <p>
-      <strong>Colors</strong>
+      <strong>Colors</strong> The color of an item in the user interface is
+      determined by which named color is assigned to it, the color displayed for
+      each named color in the palette, and in some cases, the transparency of
+      stacked items.
     </p>
     <ul>
       <li>
 	<p>
-	  <strong>Items</strong>
+	  <strong>Items</strong> Each display item has a named color assigned to
+	  it from the palette. Example color names are
+	  &quot;meter&nbsp;color9&quot; and &quot;color&nbsp;4&quot;.
+	</p>
+	<p>
+	  Click on an item's color example to change the named color choice.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Palette</strong>
+	  <strong>Palette</strong> Hover over a color to display it's name. Click
+	  on a color to open a color chooser dialog.
 	</p>
       </li>
       <li>
 	<p>
-	  <strong>Transparency</strong>
+	  <strong>Transparency</strong> Some items have a transparency value.
+	  Transparency can be changed from opaque to totally transparent.
 	</p>
       </li>
     </ul>