X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/d365231ae39a2802200aa040de120ee7bb7946a4..a2364abbe6ed9e8e4dd71b9410f985acbf20b18f:/disobedience/manual/window.html

diff --git a/disobedience/manual/window.html b/disobedience/manual/window.html
index 0282f6a..26a656d 100644
--- a/disobedience/manual/window.html
+++ b/disobedience/manual/window.html
@@ -56,8 +56,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    <p class=image><img src="queue2.png"></p>
 
-   <p>The first track is 4 minutes and 10 seconds long and so far, the
-   first 21 seconds of it has played.</p>
+   <p>The playing track is highlighted with a green backgroud.  It's 4
+   minutes and 10 seconds long and so far, the first 21 seconds of it
+   has played.</p>
 
    <h2><a name=buttons>2.2 Buttons</a></h2>
 
@@ -67,8 +68,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
      <tr>
        <td><img src="button-pause.png"></td>
        <td>The pause button.  This only effective when a track is
-       playing.  When it is pressed the playing track is paused and
-       the button turns into a &ldquo;play&rdquo; icon instead.</td>
+       playing.  When it is pressed the playing track is paused.</td>
      </tr>
 
      <tr>
@@ -80,19 +80,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      <tr>
 	 <td><img src="button-random.png"></td>
-	 <td>The random play button.  Random play means that if
+
+	 <td>The random play button.  Random play, which is enabled
+	 when the button is depressed, means that if
 	 nothing is playing the server will automatically pick a track
 	 at random and play that.  Furthermore it will ensure that the
 	 queue always has a minimum number of tracks, so you can see
-	 ahead of time what will play next.<br>
-	 As shown, random play is disabled.  The button goes green
-	 when it is enabled.</td>
+	 ahead of time what will play next.</td>
      </tr>
 
      <tr>
 	 <td><img src="button-playing.png"></td>
 	 <td>The playing button.  Normally this would always be left
-	 enabled (green).  If it is disabled then nothing will be
+	 enabled, i.e. with the button depressed.
+         If it is disabled then nothing will be
 	 played at all, regardless of whether it was randomly chosen
 	 or picked by a human.</td>
      </tr>
@@ -103,9 +104,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	 server is playing over the network (as opposed to using a
 	 local sound card).  When network play is enabled,
 	 Disobedience runs a client program on your computer to play
-	 sound received over the network using your sound card.<br>
-	 As shown, network play is disabled.  The button goes green
-	 when it is enabled.</td>
+	 sound received over the network using your sound card.</td>
      </tr>
    </table>
 
@@ -128,7 +127,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    first time it is run, <b>Manage Users</b> which allows
    adminstrators to do user management, and <b>Quit</b>.</p>
 
-   <!-- TODO link to use management -->
+   <!-- TODO link to user management -->
 
    <p class=image><img src="menu-edit.png"></p>
 
@@ -138,21 +137,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    mouse.</p>
 
    <p>The <b>Track Properties</b> option will create a window with
-   editable properties of each selected track and the <b>Edit
-   Playlists</b> option will create a window allowing editing of
-   playlists.</p>
-
-   <!-- TODO link to properties -->
-
-   <!-- TODO link to playlists -->
+   editable <a href="properties.html">properties</a> of each selected
+   track and the <b>Edit Playlists</b> option will create a window
+   allowing editing of <a href="playlists.html">playlists</a>.</p>
 
    <p class=image><img src="menu-control.png"></p>
 
    <p>The <b>Control</b> menu options are mostly equivalent to the
-   buttons described above.  The one exception is <b>Activate
-   Playlist</b> which allows you to play a playlist.</p>
+   buttons described above.  The exceptions are:</p>
 
-   <!-- TODO link to playlists -->
+   <ul>
+     <li><b>Compact Mode</b> which switches Disobedience's window to a smaller format.</li>
+     <li><b>Global Preferences</b> which allows global server settings to be modified.</li>
+     <li><b>Activate Playlist</b> which allows you to play a <A href="playlists.html">playlist</a>.</li>
+     <li><b>Network Playback API</b> which allows you to select the audio playback API used when playing over the network.</li>
+   </ul>
 
    <p class=image><img src="menu-help.png"></p>
 
@@ -161,5 +160,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    version information for the server and for Disobedience (which
    might not be the same).</p>
 
+   <hr>
+
+   <a href="index.html">Back to contents</a>
+
  </body>
 </html>