Fix for #1479 : manual contains two sections about adding tracks to a session

git-svn-id: svn://localhost/ardour2/trunk@1620 d708f5d6-7413-0410-9779-e7cbd77b26cf

3 files changed, 37 insertions, 54 deletions

diff --git a/manual/xml/adding_tracks.xml b/manual/xml/adding_tracks.xml
index 999c65959a..6c89e03628 100644
--- a/manual/xml/adding_tracks.xml
+++ b/manual/xml/adding_tracks.xml
@@ -13,33 +13,52 @@
   <itemizedlist>
     <listitem>
       <para>
-        <menuchoice> <guimenu>Session</guimenu> <guisubmenu>Add
+        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>
-  </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>
+
+    <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>
 
-  <para>
-    Choose the I/O configuration of the tracks/busses you are adding using
-    the clickbox.
-  </para>
+  <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" />
diff --git a/manual/xml/sessions.xml b/manual/xml/sessions.xml
index a9e31f5790..3b8f0432c1 100644
--- a/manual/xml/sessions.xml
+++ b/manual/xml/sessions.xml
@@ -15,8 +15,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="creating_a_new_session.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
-		href="adding_tracks.xml" />
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="opening_a_session.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="saving_a_session.xml" />
diff --git a/manual/xml/tracks_and_busses.xml b/manual/xml/tracks_and_busses.xml
index d008a64864..6b528b6f51 100644
--- a/manual/xml/tracks_and_busses.xml
+++ b/manual/xml/tracks_and_busses.xml
@@ -16,42 +16,8 @@
       <imagedata fileref="images/signal_flow.png"/>
     </imageobject>
   </mediaobject>
-  <section id="creating-tracks">
-    <title>Creating Tracks</title>
-    <para>
-      Tracks may be added to the session at any time.
-    </para>
-    <orderedlist><title>Creating a new Track</title>
-      <listitem>
-        <para>
-          Choose <menuchoice> <guimenu>Session</guimenu> <guisubmenu>Add
-          Track/Bus</guisubmenu> </menuchoice>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          add_track.ps Add Track Dialog
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          In the Add Tracks dialog, 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>
-      <listitem>
-        <para>
-          Choose the I/O configuration of the tracks/busses you are adding
-          using the clickbox.
-        </para>
-      </listitem>
-    </orderedlist>
-  </section>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+		href="adding_tracks.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="renaming_tracks.xml" />
   <section id="deleting-tracks">