X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fnewopen-session-dialog.html;h=59ebf794a2dfb60fde34bba7619b8fc91035e4ff;hb=a61fbacdfcb7a76fe425fada61f49fc85751e47a;hp=15cbeb42cc3f3e68fa926b9113bc76c5c08804e2;hpb=081e7af0b6f6dec0ca685d3a538eacf20394c2cc;p=ardour-manual

diff --git a/include/newopen-session-dialog.html b/include/newopen-session-dialog.html
index 15cbeb4..59ebf79 100644
--- a/include/newopen-session-dialog.html
+++ b/include/newopen-session-dialog.html
@@ -59,7 +59,7 @@
 <p>
   Templates can be huge time savers when working on similar projects, or on
   usual projects, as they allow to preset and tweak a lot of the <a
-  href="@@session-properties-dialog">session properties</a>, (like the
+  href="@@session-properties">session properties</a>, (like the
   availability of a <a href="@@monitor-section">monitoring section</a>,
   connection to a Master Bus, etc.), and handle the creation of <a
   href="@@adding-tracks-busses-and-vcas">tracks</a> of any kind.
@@ -80,88 +80,21 @@
   <tr><th><kbd class="menu">Advanced Session</kbd></th>
       <td>Like the Empty Template, but adds the ability to easily manage the Master bus (channels, hardware connection, and track autoconnection), and the creation of a monitoring section.</td></tr>
   <tr><th><kbd class="menu">Recording Session</kbd></th>
-      <td>Like the Empty Template, but allows the fast creation of a number of tracks, optionnaly ready to record.</td></tr>
+      <td>Like the Empty Template, but allows the fast creation of a number of tracks, optionally ready to record.</td></tr>
   <tr><th><kbd class="menu">Live Band</kbd></th>
-      <td>Fast tracks the creation of usual tracks for a band setup (vocals, guitars, piano, ...), and optionnaly adds usual effects on these tracks.</td></tr>
+      <td>Fast tracks the creation of usual tracks for a band setup (vocals, guitars, piano, ...), and optionally adds usual effects on these tracks.</td></tr>
 </table>
 
 <p>
-  Selecting a template will display its description in the right-side pannel, while
+  Selecting a template will display its description in the right-side panel, while
   hovering over a template name will show a tooltip indicating if it is a factory
   template, or, if it is a user-created one, which version of Ardour was used to
   create it.
 </p>
 <p>
   Whether or not a template is used, and before the "Template Setup" dialog, the
-  Audio/MIDI Setup will be shown.
+  <a href="@@audio-midi-setup">Audio/MIDI Setup</a> will be shown.
 </p>
 
-<h2 class="clear">Audio/MIDI Setup</h2>
 
-<figure class="left">
-  <img class="mini" src="/images/Audio-MIDI_Setup.png" alt="The Audio/MIDI Setup Dialog"/>
-  <figcaption>
-    The Audio/MIDI Setup Dialog
-  </figcaption>
-</figure>
-
-<p>
-  This window exposes the different audio options to be used by Ardour for the
-  current work session, for hardware and software and is made of:
-</p>
-
-<table class="dl">
-  <tr><th>Audio System</th>
-  <td>Depending on the operating system, Ardour can possibly use different audio
-    systems, e.g. on Linux, both <abbr title="Advanced Linux Sound Architecture">
-    ALSA</abbr> and <abbr title="JACK Audio Connection Kit">JACK</abbr> are
-    available.
- </td></tr>
-  <tr><th>Driver</th>
-  <td>
-    On Mac OS X this will typically be <kbd class="menu">CoreAudio</kbd>. On Linux usually
-    this will be either <kbd class="menu"><abbr title="Free Firewire Audio Driver fOr
-    linux">FFADO</abbr></kbd>
-    or <kbd class="menu"><abbr title="Advanced Linux Sound
-    Architecture">ALSA</abbr></kbd>, depending on whether or not a firewire device
-    is used. Advanced users on all platforms may also
-    use <kbd class="menu">NetJack</kbd> which provides network audio I/O.
-  </td></tr>
-  <tr><th>Device</th>
-  <td>The selector should show all availiable interfaces provided by the
-  driver above and which are capable of duplex operation.
-  <p class="warning">
-    When using an Intel Mac running OS X and the builtin audio
-    interface, its separate input and output devices must be <a href="@@using-more-than-one-audio-device">
-    merged</a> first into a single "aggregate device" before Ardour will be able
-    to use it.
-   </p>
-  </td></tr>
-  <tr><th>Sample Rate</th>
-  <td>
-    The selector will allow to select from any sample rate supported by the device
-    selected above it.
-  </td></tr>
-  <tr><th>Buffer Size</th>
-  <td>
-    The size of the buffer used by the audio interface can be adjusted
-    to allow for either lower latency, or lower CPU usage and higher
-    latency.
-  </td></tr>
-  <tr><th>Input/Output Channels</th>
-  <td>
-    Specifies the number of hardware channels to use. The
-    default is <kbd class="menu">all available channels</kbd>.</td></tr>
-  <tr><th>Hardware Input/Output Latency</th>
-  <td>Specify the hardware delay in samples for precise latency compensation.</td></tr>
-  <tr><th>Calibrate</th>
-  <td>
-    This button runs a semi-automated guided process to obtain
-    precise hardware latency measurements for the above option.</td></tr>
-  <tr><th>MIDI System</th>
-  <td>
-    Selects the MIDI driver to use. On Mac OS X, this will be <kbd
-    class="menu">CoreMIDI</kbd>. On Linux, it can be changed between two legacy
-    ALSA drivers or the (preferred) new JACK+ALSA implementation.</td></tr>
-</table>