Merge branch 'chat' of git://git.musicpd.org/jn/ncmpc

[ncmpc.git] / doc / ncmpc.1

diff --git a/doc/ncmpc.1 b/doc/ncmpc.1
index f09defa4d1e58f699d1b4986f57ef4341abb6106..0aabe94ff0782fffb41d05a6a5009dec2e0a9ca0 100644 (file)
--- a/doc/ncmpc.1
+++ b/doc/ncmpc.1
@@ -28,7 +28,7 @@ Read more about MPD on http://www.musicpd.org
 Display help.
 .TP 
 .B \-V,  \-\-version
-Display version information.
+Display version information and build-time configuration.
 .TP 
 .B \-c,  \-\-colors
 Enable colors.
@@ -59,7 +59,7 @@ Read key bindings from FILE.
 .TP
 Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options.
 .SH "CONFIGURATION"
-When ncmpc starts it tries to read the user's configuration file, ~/.ncmpc/config. If no user configuration file is found then ncmpc tries to load the global settings from $SYSCONFDIR/ncmpc/config (the actual path is displayed on the help screen). An example configuration file (config.sample) should be provided with ncmpc.
+When ncmpc starts it tries to read the user's configuration file, ~/.ncmpc/config. If no user configuration file is found then ncmpc tries to load the global settings from $SYSCONFDIR/ncmpc/config (the actual path is displayed in the output of the --version option). An example configuration file (config.sample) should be provided with ncmpc.
 
 
 
@@ -78,14 +78,14 @@ Connect to mpd using the specified password.
 Attempt to reconnect to mpd if a response to a command is not received within
 TIMEOUT seconds. Specifying a value in the configuration file overrides the
 "MPD_TIMEOUT" environment variable. If no timeout is specified in the
-configuration file or in the environment, the default is 1.5 seconds.
+configuration file or in the environment, the default is 5 seconds.
 .SS Interface
 .TP
 .B enable\-mouse = yes|no
 Enable mouse support (if enabled at compile time).
 .TP
 .B screen\-list = SCREEN1 SCREEN2...
-A list of screens to cycle through when using the previous/next screen commands. Valid choices, if enabled at compile time, are playlist, browse, artist, help, search, song, keydef, lyrics, and outputs.
+A list of screens to cycle through when using the previous/next screen commands. Valid choices, if enabled at compile time, are playlist, browse, artist, help, search, song, keydef, lyrics, outputs, and chat.
 .TP
 .B search\-mode = MODE
 Default search mode for the search screen. MODE must be one of title, artist, album, filename, and artist+title, or an interger index (0 for title, 1 for artist etc.).
@@ -136,6 +136,9 @@ Show the name of the plugin used to receive lyrics on the lyrics screen.
 .B text\-editor = EDITOR
 The text editor used for editing lyrics.
 .TP
+.B text\-editor\-ask = yes|no
+Ask before starting an editor.
+.TP
 .B second-column = yes|no
 Display song length in a second column.
 .SS Display