diff --git a/manual/images/mixer_strip_name_button_popup.png b/manual/images/mixer_strip_name_button_popup.png
new file mode 100644
index 0000000000..6092cece90
Binary files /dev/null and b/manual/images/mixer_strip_name_button_popup.png differ
diff --git a/manual/images/track_name_field.png b/manual/images/track_name_field.png
new file mode 100644
index 0000000000..8cf02b9941
Binary files /dev/null and b/manual/images/track_name_field.png differ
diff --git a/manual/templates/chapter_template.xml b/manual/templates/chapter_template.xml
index fa044b04bc..7a82e33853 100644
--- a/manual/templates/chapter_template.xml
+++ b/manual/templates/chapter_template.xml
@@ -1,5 +1,5 @@
-
diff --git a/manual/templates/section_template.xml b/manual/templates/section_template.xml
index 7c21873bf0..a32339e520 100644
--- a/manual/templates/section_template.xml
+++ b/manual/templates/section_template.xml
@@ -1,5 +1,5 @@
-
diff --git a/manual/xml/default_track_names.xml b/manual/xml/default_track_names.xml
new file mode 100644
index 0000000000..cad4345ca9
--- /dev/null
+++ b/manual/xml/default_track_names.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+ Default Track Names
+
+ When a track is added to the session it is given a default name based on the
+ Track type. For example, the first audio track that is added to the session
+ will be given the name Audio 1 and the first bus will be
+ called Bus 1 and any subsequently added tracks will be
+ consecutively numbered.
+
+
+
+ Track names determine the names of the files created when recording to a
+ track so it is suggested that meaningful names are given to tracks, see
+
+
+
diff --git a/manual/xml/renaming_tracks.xml b/manual/xml/renaming_tracks.xml
index 8004e19193..fc524eb0ed 100644
--- a/manual/xml/renaming_tracks.xml
+++ b/manual/xml/renaming_tracks.xml
@@ -1,19 +1,56 @@
+
-
-
+Renaming Tracks
-
- In the editor or mixer, the track name. - In the New Track Name dialog, type a new track name.
+ Tracks can be renamed from within the Editor
+ Window or the Mixer Window.
-
+
+ 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.
+
+
+
+
+
+
+
+ If you decide not to rename a track after already changing the content of
+ the track name field but before confirming the change pressing the
+ ESC key will restore the original track name.
+
+
+
+ Several tracks can be renamed quickly in sequence by using the
+ Tab key to move the focus between the track name fields.
+
+
+
+ To change the name of a track in Mixer Window click on the track name button
+ and choose Rename from the pop-up menu.
+
+
+
+
+
+
+
+ A dialog will then appear allowing you to rename the track, input the new
+ name and press Enter or click
+ Rename to confirm the name change.
+
+
+
+ Changes to track names cannot be undone.
+
+
diff --git a/manual/xml/sessions.xml b/manual/xml/sessions.xml
index 2205a284f9..e7c153ee1c 100644
--- a/manual/xml/sessions.xml
+++ b/manual/xml/sessions.xml
@@ -21,9 +21,6 @@
-
-
diff --git a/manual/xml/tracks_and_busses.xml b/manual/xml/tracks_and_busses.xml
index 0485f9c44f..cbe1d7c662 100644
--- a/manual/xml/tracks_and_busses.xml
+++ b/manual/xml/tracks_and_busses.xml
@@ -53,27 +53,11 @@
-
- After the track is created, it is recommended that you change its name from
- the generic name it will have been provided with. To rename a track:
-
-
- Renaming a Track
-
-
- In the editor or mixer, the track name, and select Rename from the
- dialog that appears. This will cause the "New Track Name" dialog to appear.
-
-
-
-
- In the New Track Name dialog, type a new track name, and then click the
- OK button in that dialog.
-
-
-
+
+
Deleting Tracks
@@ -325,6 +309,15 @@
+
+
+ Track Controls
+
+
+
+
+