merged with 1697 revision of trunk (which is post-rc1 but pre-rc2

git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1698 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 55 insertions, 42 deletions

diff --git a/manual/xml/adding_tracks.xml b/manual/xml/adding_tracks.xml
index 8375f392de..6c89e03628 100644
--- a/manual/xml/adding_tracks.xml
+++ b/manual/xml/adding_tracks.xml
@@ -1,53 +1,66 @@
 <?xml version="1.0" standalone="no"?>
+
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
 ]>
 
 <section id="sn-adding-tracks">
+  <title>Adding Tracks</title>
+  <para>
+    To add a new Track or Bus activate the New Track Dialog
+  </para>
+
+  <itemizedlist>
+    <listitem>
+      <para>
+        Choose <menuchoice> <guimenu>Session</guimenu> <guisubmenu>Add
+        Track/Bus</guisubmenu> </menuchoice>
+      </para>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/add_track_bus.png"/>
+        </imageobject>
+      </mediaobject>
+    </listitem>
+
+    <listitem>
+      <para>
+        Choose whether you wish to add a new Track or a new Bus.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        Enter the number of new tracks/busses you want to add.
+      </para>
+    </listitem>
 
-	<title>Adding Tracks</title>
-
-	<para>
-		To add a new Track or Bus activate the New Track Dialog
-	</para>
-
-	<itemizedlist>
-		<listitem>
-			<para>
-				<menuchoice>
-					<guimenu>Session</guimenu>
-					<guisubmenu>Add Track/Bus</guisubmenu>
-				</menuchoice> 
-			</para>
-		</listitem>
-	</itemizedlist>
-	
-	<mediaobject>
-		<imageobject>
-			<imagedata fileref="images/add_track_bus.png"/>
-		</imageobject>
-	</mediaobject>
-
-	<para>
-		In the Add Tracks dialog, choose whether you wish to add a new Track or a new Bus.
-	</para>
-
-	<itemizedlist>
-		<listitem>
-			<para>
-				Enter the number of new tracks/busses you want to add. 
-			</para>
-		</listitem>
-	</itemizedlist>
-	
-	<para>
-		Choose the I/O configuration of the tracks/busses you are adding using
-		the clickbox.
-	</para>
-
-	<!--
+    <listitem>
+      <para>
+        Choose the channel configuration for the Tracks or Busses you are
+        adding.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        If you are creating a Track choose whether to create a normal track
+        or a Tape Track.
+      </para>
+    </listitem>
+  </itemizedlist>
+
+  <note>
+    <para>
+      If you choose <literal>Manual Setup</literal> for the channel
+      configuration then the tracks will be created with no inputs and you
+      will have to configure the I/O configuration of the track using the
+      <link linkend="input-output-connections-editor">I/O Connections
+      Editor</link>
+    </para>
+  </note>
+<!--
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="Some_Subsection.xml" />
 	-->
-
 </section>