Mention playlists in Disobedience manual and CHANGES.

diff --git a/CHANGES.html b/CHANGES.html
index 90101b0cc384ae4b8b019444117c147fe111db79..dbe660e8c5d92ac3460598a706b7fe3af556c373 100644 (file)
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -85,6 +85,9 @@ span.command {
       <a href="http://sox.sourceforge.net/">SoX</a>.  SoX support will be
       removed in a future version.</p>
 
+      <p>Playlists are now supported.  These allow a collection of tracks to be
+      prepared offline and played as a unit.</p>
+
     </div>
       
     <h3>Disobedience</h3>
@@ -96,6 +99,8 @@ span.command {
       &ldquo;Recent&rdquo;, &ldquo;Added&rdquo; and &ldquo;Choose&rdquo; tabs
       to the queue.</p>
 
+      <p>Disobedience now supports playlist editing.</p>
+
     </div>
 
     <h3>Web Interface</h3>

diff --git a/doc/disobedience.1.in b/doc/disobedience.1.in
index f7fb5c2386f9ac38993623500ad1d6827f6dc551..f6ce9069702083e08b8385b0ccbc909ff504d2ec 100644 (file)
--- a/doc/disobedience.1.in
+++ b/doc/disobedience.1.in
@@ -49,6 +49,12 @@ Edit the details of the selected tracks.
 See
 .B "Properties Window"
 below.
+.TP
+.B "Edit Playlists"
+Edit playlists.
+See
+.B "Playlists Window"
+below.
 .SS "Control Menu"
 This has the following options:
 .TP
@@ -67,6 +73,10 @@ Enables or disables network play.
 See
 .B "NETWORK PLAY"
 below.
+.TP
+.B "Activate Playlist"
+This submenu has the selection of playlists which you are able to play.
+Picking one will add its contents to the queue.
 .SS "Help Menu"
 This has only one option, "About DisOrder", which pops up a box giving the
 name, author and version number of the software.
@@ -331,6 +341,39 @@ configuration (but this may be changed in the future).  As above, click on
 .PP
 The "Delete" button deletes the selected user.  This operation cannot be
 undone.
+.SS "Playlists Window"
+A playlist is a collection of tracks that can be prepared in advance and then
+played as a unit.
+Playlists come in three kinds:
+.TP
+.B shared
+A playlist that anyone can edit.
+These are not owned by any user.
+.TP
+.B public
+A playlist that only one user (its owner) can edit,
+but that anyone can see the contents of.
+.TP
+.B private
+A playlist that is entirely private to one user.
+.PP
+Public and private playlists start with the owner's username.
+.PP
+The left side of the playlist window is a list of all playlists that you can
+see: all shared and public playlists plus your private playlists.
+Selecting one will bring it up in the right hand side of the window,
+allowing it to be reviewed or edited.
+You can drag tracks from the choose tab in the main window into it and
+rearrange tracks already in the playlist by selecting and dragging them.
+.PP
+The add button creates a new playlist.
+You must selected whether it will be a shared, public or private playlist.
+.PP
+At the bottom of the window are radio buttons showing which kind of playlist it
+is.
+If you own the playlist you can use these to switch it between public and
+private, but if it is shared or owned by someone else these buttons will be
+greyed out.
 .SH "KEYBOARD SHORTCUTS"
 .TP
 .B CTRL+A