diff options
| author | Max Kellermann <max@duempel.org> | 2013-02-27 20:00:14 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-02-27 20:00:14 +0100 |
| commit | 8017301de5207b49e6353c26bb5d98eceaf5db01 (patch) | |
| tree | 07854a499d68b62c7ef700cba9b0e2ff8743c984 /doc | |
| parent | 496f70fc0d717719a6defb645918785381efa22b (diff) | |
| parent | 46528783ef07d1180d7059f3916d277a2f9a0c31 (diff) | |
| download | mpd-8017301de5207b49e6353c26bb5d98eceaf5db01.tar.gz mpd-8017301de5207b49e6353c26bb5d98eceaf5db01.tar.xz mpd-8017301de5207b49e6353c26bb5d98eceaf5db01.zip | |
Merge branch 'v0.17.x'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/mpd.1 | 12 | ||||
| -rw-r--r-- | doc/mpd.conf.5 | 12 |
2 files changed, 12 insertions, 12 deletions
@@ -18,23 +18,23 @@ uses CONF_FILE. Read more about MPD at <\fBhttp://www.musicpd.org/\fP>. .SH OPTIONS .TP -.BI --help +.BI \-\-help Output a brief help message. .TP -.BI --kill +.BI \-\-kill Kill the currently running mpd session. The pid_file parameter must be specified in the config file for this to work. .TP -.BI --no-daemon +.BI \-\-no\-daemon Don't detach from console. .TP -.BI --stderr +.BI \-\-stderr Print messages stderr. .TP -.BI --verbose +.BI \-\-verbose Verbose logging. .TP -.BI --version +.BI \-\-version Print version information. .SH FILES .TP diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5 index 33049bf3c..59d5e623a 100644 --- a/doc/mpd.conf.5 +++ b/doc/mpd.conf.5 @@ -175,7 +175,7 @@ only choice) if MPD was compiled without libsamplerate. .RE .IP For an up-to-date list of available converters, please see the libsamplerate -documentation (available online at <\fBhttp://www.mega-nerd.com/SRC/\fP>). +documentation (available online at <\fBhttp://www.mega\-nerd.com/SRC/\fP>). .TP .B replaygain <off or album or track or auto> If specified, mpd will adjust the volume of songs played using ReplayGain tags @@ -186,7 +186,7 @@ tags if random play is activated otherwise the album ReplayGain tags. Currently only FLAC, Ogg Vorbis, Musepack, and MP3 (through ID3v2 ReplayGain tags, not APEv2) are supported. .TP -.B replaygain_preamp <-15 to 15> +.B replaygain_preamp <\-15 to 15> This is the gain (in dB) applied to songs with ReplayGain tags. .TP .B volume_normalization <yes or no> @@ -227,12 +227,12 @@ is 8192. .TP .B filesystem_charset <charset> This specifies the character set used for the filesystem. A list of supported -character sets can be obtained by running "iconv -l". The default is +character sets can be obtained by running "iconv \-l". The default is determined from the locale when the db was originally created. .TP .B id3v1_encoding <charset> This specifies the character set which ID3v1 tags are encoded in. A list of -supported character sets can be obtained by running "iconv -l". The default is +supported character sets can be obtained by running "iconv \-l". The default is to let libid3tag convert them (from ISO-8859-1, as the standard specifies) and do no additional conversion. .TP @@ -260,7 +260,7 @@ be used alone to disable all metadata. The default is to use all known tag types except for comments and those starting with "musicbrainz". .TP .B auto_update <yes or no> -This specifies the wheter to support automatic update of music database when +This specifies the whether to support automatic update of music database when files are changed in music_directory. The default is to disable autoupdate of database. .TP @@ -282,7 +282,7 @@ better but requires more processing and higher bandwidth. Default is yes. .TP .B type <type> This specifies the audio output type. See the list of supported outputs in mpd ---version for possible values. +\-\-version for possible values. .TP .B name <name> This specifies a unique name for the audio output. |