X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fnewopen-session-dialog.html;h=3e442e0ab6db36af6447e940fa5c4f8da22a22a2;hb=f09800ba11cbbae5bcfe1c3d15d190c7f9850b1e;hp=3e39ffae999267043021730ca602adeb4be3e7bd;hpb=dfec6899ef2a121ccf2ff1d47008e7ac4844cf70;p=ardour-manual

diff --git a/include/newopen-session-dialog.html b/include/newopen-session-dialog.html
index 3e39ffa..3e442e0 100644
--- a/include/newopen-session-dialog.html
+++ b/include/newopen-session-dialog.html
@@ -1,16 +1,16 @@
 
 <p>
   The initial <dfn>Session</dfn> dialog consists of several consecutive pages:
-</p>  
+</p>
 
 <h2>Open Session Page</h2>
 <p>
-  On this page, you can open an <dfn>existing session</dfn>.  You can also 
-  open any <a href="/working-with-sessions/snapshots/">snapshot</a> of a 
-  particular session by clicking on the arrow next to the session name to 
-  display all snapshots, and then selecting one.  If your session is 
+  On this page, you can open an <dfn>existing session</dfn>.  You can also
+  open any <a href="@@snapshots">snapshot</a> of a
+  particular session by clicking on the arrow next to the session name to
+  display all snapshots, and then selecting one.  If your session is
   not displayed in the Recent Sessions list, the <kbd class="menu">Other
-  Sessions</kbd> button will bring up a file selection dialog to navigate 
+  Sessions</kbd> button will bring up a file selection dialog to navigate
   your hard drive.<br>
   Alternatively, you can opt to create a <kbd class="menu">New
   Session</kbd>.
@@ -18,46 +18,49 @@
 
 <h2>New Session page</h2>
 <p>
-  Here you can type in the name of a session, select a folder to save in, and 
-  optionally use an existing <a href="/working-with-sessions/session-templates/">template</a>.
+  Here you can type in the name of a session, select a folder to save in, and
+  optionally use an existing <a href="@@session-templates">template</a>.
 </p>
 <p>
-  Under <dfn>Advanced Options</dfn>, you can select whether you wish to create 
+  Under <dfn>Advanced Options</dfn>, you can select whether you wish to create
   a Master Bus, or a Control Bus, and how many channels you wish either to have.
-  You can also decide whether you want Ardour to automatically connect all inputs 
-  to the physical ports of your hardware. Ardour will do so 
+  You can also decide whether you want Ardour to automatically connect all inputs
+  to the physical ports of your hardware. Ardour will do so
   sequentially and in round-robin fashion, connecting the first track's
   input to the first input of your hardware and so on. When Ardour has used
   all available hardware inputs, it will begin again with the first physical
-  input. 
+  input.
   You can limit the number of channels on your physical hardware that Ardour
-  uses. 
+  uses.
 </p>
 <p>
-  By default Ardour will connect all tracks and busses to the Master Bus if 
-  there is one. However you can also tell it to automatically connect each 
+  By default Ardour will connect all tracks and busses to the Master Bus if
+  there is one. However you can also tell it to automatically connect each
   output to the physical outputs of your interface or sound card, and limit
   the number of physical outputs used, as above.
 </p>
 
-<h3>Audio/MIDI Setup</h3>
+<h2>Audio/MIDI Setup</h2>
 
-<img class="right" src="/images/Audio-MIDI_Setup.png" alt="The Audio+MIDI
-Setup Dialog"/>
+<figure>
+  <img src="/images/Audio-MIDI_Setup.png" alt="The Audio+MIDI Setup Dialog"/>
+  <figcaption>
+    The Audio+MIDI Setup Dialog
+  </figcaption>
+</figure>
 
 <p>
-  This page is not displayed if <abbr title="JACK Audio Connection
-  Kit">JACK</abbr> is already running when you start
-  Ardour. It provides a simple interface to configure JACK, which
-  will then be started by Ardour. For more control and options regarding
-  JACK, it is recommended that you start JACK before using Ardour, via a
-  JACK control application such as QJackCtl (sometimes called "Jack
-  Control"), JackPilot, etc.
+  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>
+
 <dl>
   <dt>Audio System</dt>
-  <dd>Currently, the only option here is <kbd class="menu">JACK</kbd>. In the future, native
-  hardware access may be supported.</dd>
+  <dd>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.
+ </dd>
   <dt>Driver</dt>
   <dd>
     On Mac OS X this will typically be <kbd class="menu">CoreAudio</kbd>. On Linux usually
@@ -74,7 +77,7 @@ Setup Dialog"/>
   <p class="warning">
     If you are using an Intel Mac running OS X and the builtin audio
     interface, you must
-    first <a href="/setting-up-your-system/using_more_than_one_audio_device/">merge
+    first <a href="@@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.
    </p>
@@ -106,4 +109,3 @@ Setup Dialog"/>
     class="menu">CoreMIDI</kbd>. On Linux, you can change between two legacy
     ALSA drivers or the (preferred) new JACK+ALSA implementation.</dd>
 </dl>
-