Disobedience: mention global prefs in manual.

No screenshots yet.

diff --git a/disobedience/manual/properties.html b/disobedience/manual/properties.html
index 34d215fc06df150f798f3868b304a3b0e8dce00c..bce107dcea3a8c61a9bb422d408ad59cd3e534b9 100644 (file)
--- a/disobedience/manual/properties.html
+++ b/disobedience/manual/properties.html
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    <p class=image><img src="track-properties.png"></p>
 
    <p>This window can be invoked from any of the four tabs by
    <p class=image><img src="track-properties.png"></p>
 
    <p>This window can be invoked from any of the four tabs by

-   selecting one or more tracks and then either selected <b>Edit >
+   selecting one or more tracks and then either selecting <b>Edit >

    Track Properties</b> or via the right-click pop-up menu.</p>
 
    <h2><a name=names>4.1 Track Name Parts</a></h2>
    Track Properties</b> or via the right-click pop-up menu.</p>
 
    <h2><a name=names>4.1 Track Name Parts</a></h2>


@@ -66,13 +66,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    <p>Each track has an associated collection of tags.  These can used
    when searching for tracks in the <b>Choose</b> tab or to control
 
    <p>Each track has an associated collection of tags.  These can used
    when searching for tracks in the <b>Choose</b> tab or to control

-   which tracks are picked at random (although this functionality is
-   not readily available in current versions of Disobedience).</p>
+   which tracks are picked at random.</p>

 
    <p>To add tags to a track enter the tags you want to apply to it in
    the <b>Tags</b> field, separated by commas.  Tags cannot contain
    commas and are compared without regard to whitespace.</p>
 
 
    <p>To add tags to a track enter the tags you want to apply to it in
    the <b>Tags</b> field, separated by commas.  Tags cannot contain
    commas and are compared without regard to whitespace.</p>
 

+   <p>To search by tag, prefix it with <tt>tag:</tt> in the search box.</p>
+
+   <p>To control how tracks are picked at random, select <b>Control >
+   Global Preferences</b>.  If <b>Required Tags</b> contains a
+   comma-separated list of tags then only tracks with at least one of
+   the listed tags will be picked at random.  Similarly
+   if <b>Prohibited Tags</b> contains a comma-separated list of tags
+   then no track with any of the listed tags will be picked at
+   random.</p>
+

    <h2><a name=weight>4.3 Track Weight</a></h2>
 
    <p>Every track has an associated weight.  A higher weight makes the
    <h2><a name=weight>4.3 Track Weight</a></h2>
 
    <p>Every track has an associated weight.  A higher weight makes the

diff --git a/disobedience/manual/window.html b/disobedience/manual/window.html
index 72fe5f77ffb2ef3669aefcba061807a511f527a3..a4c1642e53db237a52fc974db785c068ef6f98a8 100644 (file)
--- a/disobedience/manual/window.html
+++ b/disobedience/manual/window.html
@@ -144,10 +144,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    <p class=image><img src="menu-control.png"></p>
 
    <p>The <b>Control</b> menu options are mostly equivalent to the
    <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 exceptions is <b>Activate
-   Playlist</b> which allows you to play
-   a <A href="playlists.html">playlist</a>, and <b>Compact Mode</b>
-   which switches Disobedience's window to a smaller format.</p>
+   buttons described above.  The exceptions are:</p>
+
+   <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>
 
 
    <p class=image><img src="menu-help.png"></p>