X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/f00ed3e77f5eebf1b3e0ddd275fb8daf51d27516..f945c7ee376e04292ac90a84bf7cd2e9eec08d41:/abcde.conf

diff --git a/abcde.conf b/abcde.conf
index f4708db..8a7fcda 100644
--- a/abcde.conf
+++ b/abcde.conf
@@ -23,6 +23,7 @@
 # are cached locally in $CDDBLOCALDIR
 #CDDBCOPYLOCAL="n"
 #CDDBLOCALDIR="$HOME/.cddb"
+#CDDBLOCALRECURSIVE="n"
 
 # If NOSUBMIT is set to y, then abcde will never prompt asking if you
 # wish to submit your edited cddb file.
@@ -40,12 +41,12 @@
 # so they can be reused when ripping CDs.
 #CDDBUSELOCAL="n"
 
-# List, separated with a coma, the fields we want the parsing function to
+# List, separated with a comma, the fields we want the parsing function to
 # output. Defaults to YEAR and GENRE, for a complete list of fields provided by
 # CDDB.
 # The fields are not case sensitive. Actually, "y,g" will work as fine as "Y,G"
 # or "YEAR, GENRE"
-#SHOWPARSEDFIELDS=year,genre
+#SHOWCDDBFIELDS=year,genre
 
 # Specify the style of encoder to use here - 
 # oggenc, vorbize - for OGGENCODERSYNTAX
@@ -68,7 +69,7 @@
 #NORMALIZERSYNTAX=default
 
 # CD reader program to use - currently recognized options are 'cdparanoia',
-# 'cdda2wav', 'dagrab' and 'cddafs' (Mac OS X only).
+# 'cdda2wav', 'dagrab', 'cddafs' (Mac OS X only) and 'flac'.
 #CDROMREADERSYNTAX=cdparanoia
 
 # CUE reader program to use.
@@ -101,6 +102,7 @@
 
 # Paths of programs to use
 #LAME=lame
+#TOOLAME=toolame
 #GOGO=gogo
 #BLADEENC=bladeenc
 #L3ENC=l3enc
@@ -144,6 +146,7 @@
 
 # MP3:
 #LAMEOPTS=
+#TOOLAMEOPTS=
 #GOGOOPTS=
 #BLADEENCOPTS=
 #L3ENCOPTS=
@@ -182,6 +185,7 @@
 #DIFFOPTS=""
 #VORBISCOMMENTOPTS="-R"
 #METAFLACOPTS="--no-utf8-convert"
+#DIFFOPTS=""
 
 # Actions to take
 # Comma-separated list of one or more of the following:
@@ -195,6 +199,8 @@
 #ACTIONS=cddb,read,encode,tag,move,clean
 
 # CD device you want to read from
+# It can be defined as a singletrack flac file, but since it might change from
+# file to file it makes little sense to define it here.
 #CDROM=/dev/cdrom
 # If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d"
 # If we are using the ide-scsi emulation layer, we need to define a "g"
@@ -237,9 +243,11 @@
 #LOWDISK=n
 
 # If set to y, enables batch mode normalization, which preserves relative
-# volume differences between tracks of an album. Also enables nogap encoding
-# when using the 'lame' encoder.
-#BATCH=n
+# volume differences between tracks of an album. 
+#BATCHNORM=n
+
+# Enables nogap encoding when using the 'lame' encoder.
+#NOGAP
 
 # Set the playlist file location format. Uses the same variables and format
 # as OUTPUTFORMAT. If the playlist is specified to be in a subdirectory, it
@@ -266,7 +274,7 @@
 # * Translate spaces and forward slashes to underscores
 # * Translate stars into pluses.
 # To change that, redefine the mungefilename function.
-# mungefilename recieves the CDDB data (artist, track, title, whatever)
+# mungefilename receives the CDDB data (artist, track, title, whatever)
 # as $1 and outputs it on stdout.
 #mungefilename ()
 #{
@@ -275,7 +283,7 @@
 
 # Custom genre munging:
 # By default we just transform uppercase to lowercase. Not much of a fancy
-# function, with not much use, but one can disable it ot just turn the first
+# function, with not much use, but one can disable it or just turn the first
 # Uppercase.
 #mungegenre ()
 #{
@@ -285,7 +293,7 @@
 
 # Custom pre-read function
 # By default it does nothing.
-# You can set some things to get abcde funtion in better ways:
+# You can set some things to get abcde function in better ways:
 # * Close the CD tray using eject -t (if available in eject and supported by 
 #   your CD device.
 # * Set the CD speed. You can also use the built-in options, but you can also 
@@ -300,7 +308,7 @@
 
 # Custom post-read function
 # By default it does nothing.
-# You can set some things to get abcde funtion in better ways:
+# You can set some things to get abcde function in better ways:
 # * Store a copy of the CD TOC.
 # KEEP IN MIND that executables included in post_read must be in your $PATH or
 # you have to define them with full /path/to/binary
@@ -320,5 +328,5 @@
 #REMOTEHOSTS=foo,bar,baz,quux,qiix
 
 # Set to obtain some information about actions happening in the background
-# Usefull if you have a slow network or CDDB servers seem irresponsive.
+# Useful if you have a slow network or CDDB servers seem unresponsive.
 #EXTRAVERBOSE=n