* Fix infinite loop if cddb fails. Thanks to Dominic Hargreaves for the

[clinton/abcde.git] / abcde.1

diff --git a/abcde.1 b/abcde.1
index ddab709..446becc 100644 (file)
--- a/abcde.1
+++ b/abcde.1
@@ -123,6 +123,10 @@ Use the low-diskspace algorithm. See the LOWDISK configuration variable.
 .B \-L
 Use a local CDDB repository. See CDDBLOCALDIR variable.
 .TP
+.B \-m
+Create DOS-style playlists, modifying the resulting one by adding CRLF line
+endings. Some hardware players insist on having those to work.
+.TP
 .B \-n
 Do not query CDDB database. Create and use a template. Edit the template to
 provide song names, artist(s), ...
@@ -130,10 +134,6 @@ provide song names, artist(s), ...
 .B \-N
 Non interactive mode. Do not ask anything from the user. Just go ahead.
 .TP
-.B \-m
-Create DOS-style playlists, modifying the resulting one by adding CRLF line
-endings. Some hardware players insist on having those to work.
-.TP
 .B \-o [filetype][:filetypeoptions]
 Select output type. Can be "vorbis" (or "ogg"), "mp3", "flac", "spx", "mpc",
 "m4a" or "wav".  Specify a comma-delimited list of output types to obtain all
@@ -157,10 +157,6 @@ are used in the config file(s).
 Remote encode on this comma-delimited list of machines using \fBdistmp3\fR. See
 the REMOTEHOSTS configuration variable.
 .TP
-.B \-R
-When CDDBLOCALDIR and CDDBUSELOCAL are defined, search recursively under the
-defined directory for matches of the CDDB entry.
-.TP
 .B \-s [fields...]
 List, separated by commas, the fields to be shown in the CDDB parsed entries.
 Right now it only uses "year" and "genre".
@@ -185,8 +181,9 @@ information, and we tag and add comments with Latin1 encoding.
 Show the version and exit
 .TP
 .B \-V
-Be a bit more verbose. On slow networks the CDDB requests might give the
-sensation nothing is happening.
+Be more verbose. On slow networks the CDDB requests might give the
+sensation nothing is happening. Add this more than once to make things
+even more verbose.
 .TP
 .B \-x
 Eject the CD when all tracks have been read. See the EJECTCD configuration
@@ -360,7 +357,7 @@ with \fBdistmp3\fR (DISTMP3NICE).
 .B PATHNAMES
 The following configuration file options specify the pathnames of their
 respective utilities: LAME, TOOLAME, GOGO, BLADEENC, L3ENC, XINGMP3ENC, MP3ENC,
-VORBIZE, OGGENC, FLAC, SPEEXENC, MPPENC, AACEND, ID3, ID3V2, EYED3, METAFLAC,
+VORBIZE, OGGENC, FLAC, SPEEXENC, MPPENC, AACEND, ID3, EYED3, EYED3, METAFLAC,
 CDPARANOIA, CDDA2WAV, CDDAFS, CDDISCID, CDDBTOOL, EJECT, MD5SUM, DISTMP3,
 VORBISCOMMENT, NORMALIZE, CDSPEED, MP3GAIN, VORBISGAIN, MPPGAIN, MKCUE, MKTOC,
 CUE2DISCID (see option "\-X"), DIFF and HTTPGET.
@@ -369,7 +366,7 @@ CUE2DISCID (see option "\-X"), DIFF and HTTPGET.
 If you wish to specify command-line options to any of the programs \fBabcde\fR uses,
 set the following configuration file options: LAMEOPTS, TOOLAMEOPTS, GOGOOPTS,
 BLADEENCOPTS, L3ENCOPTS, XINGMP3ENCOPTS, MP3ENCOPTS, VORBIZEOPTS, OGGENCOPTS,
-FLACOPTS, SPEEXENCOPTS, MPPENCOPTS, AACENCOPTS, ID3OPTS, ID3V2OPTS, MP3GAINOPTS,
+FLACOPTS, SPEEXENCOPTS, MPPENCOPTS, AACENCOPTS, ID3OPTS, EYED3OPTS, MP3GAINOPTS,
 CDPARANOIAOPTS, CDDA2WAVOPTS, CDDAFSOPTS, CDDBTOOLOPTS, EJECTOPTS, DISTMP3OPTS,
 NORMALIZEOPTS, CDSPEEDOPTS, MKCUEOPTS, VORBISCOMMMENTOPTS, METAFLACOPTS,
 DIFFOPTS, FLACGAINOPTS, VORBISGAINOPTS and HTTPGETOPTS.
@@ -523,9 +520,10 @@ after all tracks have been read. It has no effect when CDROM is set to a flac
 file.
 .TP
 .B EXTRAVERBOSE
-If set to "y", some operations which are usually now shown to the end user
+If set to "1", some operations which are usually now shown to the end user
 are visible, such as CDDB queries. Useful for initial debug and if your
-network/CDDB server is slow.
+network/CDDB server is slow. Set to "2" or more for even more verbose
+output.
 .SH EXAMPLES
 Possible ways one can call \fBabcde\fR:
 .TP
@@ -568,7 +566,7 @@ Perl and some Musicbrainz libraries) can be used to retrieve CDDB
 information about the CD.
 .TP
 .B *
-(for MP3s) id3 or id3v2, id3 v1 and v2 tagging programs.
+(for MP3s) id3 or eyeD3, id3 v1 and v2 tagging programs.
 .TP
 .B *
 (optional) distmp3, a client/server for distributed mp3 encoding.
@@ -595,7 +593,7 @@ information about the CD.
 .BR mppenc (1),
 .BR faac (1),
 .BR id3 (1),
-.BR id3v2 (1),
+.BR eyeD3 (1),
 .BR wget (1),
 .BR fetch (1),
 .BR cd-discid (1),