merge missing file fix

[disorder] / doc / disobedience.1.in

diff --git a/doc/disobedience.1.in b/doc/disobedience.1.in
index 07d6fb34f7ff31cee7139b5e4d2d9972b80dc596..ef1f48269aee0357b8c7e095ba1b20db4a054766 100644 (file)
--- a/doc/disobedience.1.in
+++ b/doc/disobedience.1.in
@@ -73,6 +73,8 @@ name, author and version number of the software.
 .TP
 .B "Pause button"
 The pause button can be used to pause and resume tracks.
+This button shows either a pause symbol (two vertical bars) or a resume symbol
+(a right-pointing arrow).
 .TP
 .B "Scratch button"
 The scratch button, a red cross, can be used to interrupt the currently playing
@@ -81,16 +83,22 @@ track.
 .B "Random play button"
 The random play button can be used to enable and disable random play.
 It does not take effect until the currently playing track finishes.
+When the button is green, random play is enabled.
+When it is grey, random play is disabled.
 .TP
 .B "Play button"
 The play button controls whether tracks will be played at all.
 As above it does not take effect until the currently playing track finishes.
+When the button is green, play is enabled.
+When it is grey, play is disabled.
 .TP
 .B "Network play button"
 The network play buttons enables or disables network play.
 See
 .B "NETWORK PLAY"
 below.
+When the button is green, network play is enabled.
+When it is grey, network play is disabled.
 .TP
 .B "Volume slider"
 The volume slider indicates the current volume level and can be used to adjust
@@ -103,8 +111,9 @@ The balance slider indicates the current balance and can be used to adjust it.
 means the only the right speaker.
 .SS "Queue Tab"
 This displays the currently playing track and the queue.
-The currently playing track is at the top and has a green background.
-Queued tracks appear below it and have alternating red and white backgrounds.
+The currently playing track is at the top, and can be distinguished by
+the constantly updating timer.
+Queued tracks appear below it.
 .PP
 The left button can be use to select and deselect tracks.
 On its own it just selects the pointed track and deselects everything else.
@@ -115,6 +124,9 @@ and deselects everything else.
 With both CTRL and SHIFT it selects everything from the last click to the
 current position without deselecting anything.
 .PP
+Tracks can be moved within the queue by dragging them to a new position with
+the left button.
+.PP
 The right button pops up a menu.
 This has the following options:
 .TP
@@ -137,7 +149,8 @@ Remove the selected tracks from the queue.
 .SS "Recent Tab"
 This displays recently played tracks, the most recent at the top.
 .PP
-The left button functions as above.
+The left button functions as above, except that drag-and-drop rearrangement
+is not possible.
 The right button pops up a menu with the following options:
 .TP
 .B Properties
@@ -161,7 +174,7 @@ If they are playing or in the queue then a notes icon appears next to them.
 Left clicking on a file will select it.
 As with the queue tab you can use SHIFT and CTRL to select multiple files.
 .PP
-The text box at the top is a search form.
+The text box at the bottom is a search form.
 If you enter search terms here then tracks containing all those words will be
 highlighted.
 You can also limit the results to tracks with particular tags, by including
@@ -221,7 +234,14 @@ Select all tracks.
 .SS "Login Details Window"
 The login details window allows you to edit the connection details and
 authorization information used by Disobedience.
-It has four text entry fields:
+.PP
+At the top is a 'remote' switch.
+If this is enabled then you can use the \fBHostname\fR and \fBService\fR
+fields to connect to a remote server.
+If it is disabled then then Disobedience will connect to a local server
+instead.
+.PP
+Below this are four text entry fields:
 .TP
 .B Hostname
 The host to connect to.
@@ -237,16 +257,14 @@ The password to use when logging in.
 Note that this is NOT your login password but is your password to the
 DisOrder server.
 .PP
-It has three buttons:
+It has two buttons:
 .TP
 .B Login
 This button attempts to (re-)connect to the server with the currently displayed
 settings.
-The settings are not saved.
-.TP
-.B Save
-This button saves the current settings in 
+The settings are saved in
 .IR $HOME/.disorder/passwd .
+on success.
 .TP
 .B Close
 This button closes the window, discarding any unsaved changes.
@@ -362,10 +380,6 @@ setting up with Disobedience, tools such as
 .BR disorder (1)
 should work as well.
 .SH BUGS
-Disobedience is newly introduced with DisOrder 2.0.
-There are bound to be bugs.
-Please send feedback.
-.PP
 There is no particular provision for multiple users of the same computer
 sharing a single \fBdisorder\-playrtp\fR process.
 This shouldn't be too much of a problem in practice but something could
@@ -373,6 +387,11 @@ perhaps be done given demand.
 .PP
 Try to do remote user management when the server is configured to refuse this
 produces rather horrible error behavior.
+.PP
+Only one track can be dragged at a time.
+.PP
+Resizing columns doesn't work very well.
+This is a GTK+ bug.
 .SH FILES
 .TP
 .I ~/.disorder/HOSTNAME\-rtp