Merge tag 'branchpoint-5.1' into release

[disorder] / disobedience / manual / window.html

diff --git a/disobedience/manual/window.html b/disobedience/manual/window.html
index cf4b9ad17aba678e1ce4d5d04a5626a24f23a68e..a4c1642e53db237a52fc974db785c068ef6f98a8 100644 (file)
--- a/disobedience/manual/window.html
+++ b/disobedience/manual/window.html
@@ -68,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>
@@ -81,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>
@@ -104,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>
 
@@ -129,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>
 
@@ -139,21 +137,20 @@ 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>
+   </ul>
 
    <p class=image><img src="menu-help.png"></p>