minor patch for manual section on using multiple devices (from Thomas Vecchione)

[ardour-manual] / _manual / 07_working-with-sessions / 01_the-new-session-dialog / 01_audio-setup.html

diff --git a/_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html b/_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html
index c3f0a0417c3032412d6b214402b1d7d99c4b0cf8..bd0ba992db1f3699bdda2099d49866acb2702e5b 100644 (file)
--- a/_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html
+++ b/_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html
@@ -32,13 +32,22 @@ title: Audio Setup
 
   <dt>Interface</dt>
   <dd>
-    The selector should show all availiable interfaces that driver
-    provides that are duplex capable for Ardour to
-    use. <strong>Important</strong> if you are using an Intel Mac running
-    OS X and the builtin audio interface, you must
+<<<<<<< HEAD:_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html
+    The selector should show all the supported interfaces that the are duplex capable (i.e. support input and output to and from Ardour). <strong>Important</strong> if you are using an Intel Mac running
+    OS X and the built-in audio interface, you must
     first <a href="/setting-up-your-system/using_more_than_one_audio_device">merge
       its separate input and output devices into a single "aggregate
       device"</a> before Ardour will be able to use it.
+=======
+  <dd>The selector should show all availiable interfaces that driver
+      provides that are duplex capable for Ardour to
+      use. <strong>Important</strong> if you are using an Intel Mac
+      running OS X and the builtin audio interface, you must
+      first <a href="setting-up-your-system/us
+      ing_more_than_one_audio_device/">merge its separate input and
+      output devices into a single "aggregate device"</a> before
+      Ardour will be able to use it.<br>
+>>>>>>> minor patch for manual section on using multiple devices (from Thomas Vecchione):_manual/07_working-with-sessions/06_the-new-session-dialog/01_audio-setup.html
   </dd>
 
   <dt>Sample Rate</dt>
@@ -71,12 +80,11 @@ title: Audio Setup
 
 <h3>Advanced Tab</h3>
 <p> 
-  The Advanced tab will allow you to set some advanced settings that
+  The Advanced tab lets you to set some advanced settings that
   are rarely needed.  By default the input and output channels will
   automatically try to give you the amount of inputs and outputs as
   requested by the software, however some software doesn't always
-  request as many as you need, this can provide more to software that
-  can handle it.
+  request as many as you need. This option provides more channels to software that can handle it.
 </p>