diff --git a/manual/xml/editor_window.xml b/manual/xml/editor_window.xml
index 8f56afaa2e..006882d5a5 100644
--- a/manual/xml/editor_window.xml
+++ b/manual/xml/editor_window.xml
@@ -51,15 +51,8 @@
sections.
-
-
- Track Display
-
- This is the main area within the editor. Each track or bus is
- represented by a horizontal "stripe", with a set of controls on the
- left side, with the timeline above them all.
-
-
+
diff --git a/manual/xml/entities.ent b/manual/xml/entities.ent
index f21530b9f4..95cd0ef2a5 100644
--- a/manual/xml/entities.ent
+++ b/manual/xml/entities.ent
@@ -9,3 +9,12 @@
ardour-&ARDOUR_VERSION;">
&ARDOUR_NAME;">
+
+Mixer Window'>
+Editor Window'>
+
+Mixer Strip'>
+Mixer Strip List'>
+
+Track Display'>
+Track Controls'>
diff --git a/manual/xml/mixer_strip_list.xml b/manual/xml/mixer_strip_list.xml
index ca72916e85..4f1d4c1d9f 100644
--- a/manual/xml/mixer_strip_list.xml
+++ b/manual/xml/mixer_strip_list.xml
@@ -4,7 +4,7 @@
]>
-
+ Strip List
The Strip List provides a simple interface to the layout of the mixer
diff --git a/manual/xml/mixer_strips.xml b/manual/xml/mixer_strips.xml
index e6d4617774..502dbd64d3 100644
--- a/manual/xml/mixer_strips.xml
+++ b/manual/xml/mixer_strips.xml
@@ -6,7 +6,7 @@
-
+Mixer Strips
Each track and bus is represented in the mixer window by a
diff --git a/manual/xml/removing_tracks.xml b/manual/xml/removing_tracks.xml
index 67d3fc69fb..5297ae05ae 100644
--- a/manual/xml/removing_tracks.xml
+++ b/manual/xml/removing_tracks.xml
@@ -14,11 +14,9 @@
Removing
- A track can be removed from within the
- Editor Window by right-clicking
- in the empty space in the Track
- Controls to bring up the track context menu and choosing
- Remove.
+ A track can be removed from within the &MIX_WIN; by right-clicking in
+ the empty space in the &TRACK_CONTROLS; to bring up the track context
+ menu and choosing Remove.
@@ -26,9 +24,9 @@
- Alternatively a track can also be removed from within the
- Mixer Window by clicking on the
- track name button and choosing Remove.
+ Alternatively a track can also be removed from within the &MIX_WIN; by
+ clicking on the track name button and choosing
+ Remove.
diff --git a/manual/xml/renaming_tracks.xml b/manual/xml/renaming_tracks.xml
index 22aa34e72b..6d1bfb9701 100644
--- a/manual/xml/renaming_tracks.xml
+++ b/manual/xml/renaming_tracks.xml
@@ -2,21 +2,21 @@
+%BOOK_ENTITIES;
+
]>
Renaming Tracks
- Tracks can be renamed from within the
- Editor Window or the
- Mixer Window.
+ Tracks can be renamed from within the &EDIT_WIN; or the &MIX_WIN;.
To change the name of a track in the Editor Window click within the
- track name field in the Track
- Controls, enter the new track name and press the
- Enter key to confirm the change.
+ track name field in the &TRACK_CONTROLS;, enter the new track name and
+ press the Enter key to confirm the change.
diff --git a/manual/xml/track_controls.xml b/manual/xml/track_controls.xml
new file mode 100644
index 0000000000..77a5447c32
--- /dev/null
+++ b/manual/xml/track_controls.xml
@@ -0,0 +1,13 @@
+
+
+
+%BOOK_ENTITIES;
+
+]>
+
+
+ Track Controls
+
+
diff --git a/manual/xml/track_display.xml b/manual/xml/track_display.xml
new file mode 100644
index 0000000000..603bc919c0
--- /dev/null
+++ b/manual/xml/track_display.xml
@@ -0,0 +1,17 @@
+
+
+
+%BOOK_ENTITIES;
+
+]>
+
+
+ Track Display
+
+ This is the main area within the editor. Each track or bus is
+ represented by a horizontal "stripe", with a set of controls on the left
+ side, with the timeline above them all.
+
+
diff --git a/manual/xml/tracks_and_busses.xml b/manual/xml/tracks_and_busses.xml
index 37e1fce313..4e1ac6adb5 100644
--- a/manual/xml/tracks_and_busses.xml
+++ b/manual/xml/tracks_and_busses.xml
@@ -255,10 +255,8 @@
-
- Track Controls
-
-
+