diff --git a/manual/images/track_list.png b/manual/images/track_list.png
new file mode 100644
index 0000000000..6f3442395a
Binary files /dev/null and b/manual/images/track_list.png differ
diff --git a/manual/images/track_list_reorder.png b/manual/images/track_list_reorder.png
new file mode 100644
index 0000000000..954f9ca86b
Binary files /dev/null and b/manual/images/track_list_reorder.png differ
diff --git a/manual/xml/editor_window.xml b/manual/xml/editor_window.xml
index 006882d5a5..f87d9e93fc 100644
--- a/manual/xml/editor_window.xml
+++ b/manual/xml/editor_window.xml
@@ -38,7 +38,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="editor_window_controls.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
-		href="editor_window_track_list.xml" />
+		href="track_list.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="editor_window_group_list.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
diff --git a/manual/xml/editor_window_track_list.xml b/manual/xml/editor_window_track_list.xml
deleted file mode 100644
index 9ede6fa82e..0000000000
--- a/manual/xml/editor_window_track_list.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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="editor-window-track-list">
-  <title>Track List</title>
-  <para>
-    To the left of the track area is the track list, which lists all tracks
-    and busses in the session. Tracks/Busses that are visible have their
-    names displayed in cyan, while hidden ones have their names displayed in
-    orange.
-  </para>
-
-  <para>
-    Click on the name of a track/bus to toggle its visibility in the editor.
-    Click and drag the name to reorder the track display area.
-  </para>
-
-  <para>
-    You can click on the title bar of the track list to display a menu that
-    allows you to:
-  </para>
-
-  <itemizedlist>
-    <listitem>
-      <para>
-        Hide all
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Show all
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Hide all tracks
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Show all tracks
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Hide all busses
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Show all busses
-      </para>
-    </listitem>
-  </itemizedlist>
-<!--
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
-		href="Some_Subsection.xml" />
-	-->
-</section>
diff --git a/manual/xml/track_list.xml b/manual/xml/track_list.xml
new file mode 100644
index 0000000000..ad369a05b3
--- /dev/null
+++ b/manual/xml/track_list.xml
@@ -0,0 +1,87 @@
+<?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" [
+
+<!ENTITY % BOOK_ENTITIES SYSTEM "./entities.ent">
+%BOOK_ENTITIES;
+
+]>
+
+<section id="sn-track-list">
+  <title>The Track List</title>
+  <indexterm>
+    <primary>Track List</primary>
+  </indexterm>
+  <para>
+    The Track List displays a list of all the tracks in a session and
+    provides the ability to show or hide tracks aswell as reorder them in
+    the &TRACK_DISPLAY;.
+  </para>
+
+  <section id="sn-track-list-visibility">
+    <title>Track Visibility</title>
+    <indexterm>
+      <primary>Tracks</primary>
+      <secondary>Visibility</secondary>
+    </indexterm>
+    <para>
+      The visibility of a track can be modified by clicking on the checkbox
+      next its name in the track list. If a track is visible then the box
+      will be checked, if it is unchecked then the track will be hidden and
+      clicking on the checkbox will make it visible in the &TRACK_DISPLAY;
+    </para>
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="images/track_list.png"/>
+      </imageobject>
+    </mediaobject>
+    <para>
+      To show or hide all tracks or only tracks of a specific type
+      right-click within the track list to bring up a pop-up menu.
+    </para>
+
+    <note>
+      <para>
+        The visibility of a track in the &EDIT_WIN; has no effect on the
+        visibility of the &MIXER_STRIP; for that track in the &MIX_WIN;
+        which can be modified from the &MIXER_STRIP_LIST;, also hiding a
+        track does not affect its playback which can be controlled by either
+        <link linkend="sn-muting-tracks">muting</link> or
+        <link linkend="sn-deactivating-tracks">deactivating</link> it.
+      </para>
+    </note>
+  </section>
+
+  <section id="sn-track-list-reordering">
+    <title>Track Order</title>
+    <indexterm>
+      <primary>Tracks</primary>
+      <secondary>Reordering</secondary>
+    </indexterm>
+    <para>
+      Tracks may be reordered in the &TRACK_DISPLAY; by rearranging them in
+      the Track List. To rearrange the list click on a track name and drag
+      it up or down to a new position.
+    </para>
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="images/track_list_reorder.png"/>
+      </imageobject>
+    </mediaobject>
+    <para>
+      Pressing the <keycap>ESC</keycap> key while rearranging the Track List
+      will cancel the move.
+    </para>
+
+    <note>
+      <para>
+        The order of tracks in the &EDIT_WIN; is independent of their order
+        in the &MIX_WIN;.
+      </para>
+    </note>
+  </section>
+<!--
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+		href="Some_Subsection.xml" />
+	-->
+</section>