update to match sgml

2 files changed, 14 insertions, 8 deletions

diff --git a/man/flac.1 b/man/flac.1
index 5dbe8ae6..fef4dedd 100644
--- a/man/flac.1
+++ b/man/flac.1
@@ -3,16 +3,16 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "FLAC" "1" "12 February 2007" "" ""
+.TH "FLAC" "1" "14 September 2007" "" ""
 
 .SH NAME
 flac \- Free Lossless Audio Codec
 .SH SYNOPSIS
 
-\fBflac\fR [ \fB\fIOPTIONS\fB\fR ] [ \fB\fIinfile.wav\fB\fR | \fB\fIinfile.aiff\fB\fR | \fB\fIinfile.raw\fB\fR | \fB\fIinfile.flac\fB\fR | \fB\fIinfile.ogg\fB\fR | \fB-\fR\fI ...\fR ]
+\fBflac\fR [ \fB\fIOPTIONS\fB\fR ] [ \fB\fIinfile.wav\fB\fR | \fB\fIinfile.aiff\fB\fR | \fB\fIinfile.raw\fB\fR | \fB\fIinfile.flac\fB\fR | \fB\fIinfile.oga\fB\fR | \fB\fIinfile.ogg\fB\fR | \fB-\fR\fI ...\fR ]
 
 
-\fBflac\fR [ \fB-d\fR | \fB--decode\fR | \fB-t\fR | \fB--test\fR | \fB-a\fR | \fB--analyze\fR ] [ \fB\fIOPTIONS\fB\fR ] [ \fB\fIinfile.flac\fB\fR | \fB\fIinfile.ogg\fB\fR | \fB-\fR\fI ...\fR ]
+\fBflac\fR [ \fB-d\fR | \fB--decode\fR | \fB-t\fR | \fB--test\fR | \fB-a\fR | \fB--analyze\fR ] [ \fB\fIOPTIONS\fB\fR ] [ \fB\fIinfile.flac\fB\fR | \fB\fIinfile.oga\fB\fR | \fB\fIinfile.ogg\fB\fR | \fB-\fR\fI ...\fR ]
 
 .SH "DESCRIPTION"
 .PP
@@ -50,6 +50,9 @@ Silent mode (do not write runtime encode/decode statistics to stderr)
 \fB--totally-silent \fR
 Do not print anything of any kind, including warnings or errors.  The exit code will be the only way to determine successful completion.
 .TP
+\fB--no-utf8-convert \fR
+Do not convert tags from local charset to UTF-8.  This is useful for scripts, and setting tags in situations where the locale is wrong.  This option must appear before any tag options!
+.TP
 \fB-w, --warnings-as-errors \fR
 Treat all warnings as errors (which cause flac to terminate with a non-zero exit code).
 .TP
@@ -65,6 +68,9 @@ Prefix each output file name with the given string.  This can be useful for enco
 \fB--delete-input-file \fR
 Automatically delete the input file after a successful encode or decode.  If there was an error (including a verify error) the input file is left intact.
 .TP
+\fB--keep-foreign-metadata \fR
+If encoding, save WAVE or AIFF non-audio chunks in FLAC metadata.  If decoding, restore any saved non-audio chunks from FLAC metadata when writing the decoded file.  Foreign metadata cannot be transcoded, e.g. WAVE chunks saved in a FLAC file cannot be restored when decoding to AIFF.  Input and output must be regular files (not stdin or stdout).
+.TP
 \fB--skip={\fI#\fB|\fImm:ss.ss\fB}\fR
 Skip over the first number of samples of the input.  This works for both encoding and decoding, but not testing.  The alternative form mm:ss.ss can be used to specify minutes, seconds, and fractions of a second.
 .TP
@@ -72,9 +78,9 @@ Skip over the first number of samples of the input.  This works for both encodin
 Stop at the given sample number for each input file.  This works for both encoding and decoding, but not testing.  The given sample number is not included in the decoded output.  The alternative form mm:ss.ss can be used to specify minutes, seconds, and fractions of a second.  If a `+' (plus) sign is at the beginning, the --until point is relative to the --skip point.  If a `-' (minus) sign is at the beginning, the --until point is relative to end of the audio.
 .TP
 \fB--ogg\fR
-When encoding, generate Ogg FLAC output instead of native FLAC.  Ogg FLAC streams are FLAC streams wrapped in an Ogg transport layer.  The resulting file should have an '.ogg' extension and will still be decodable by flac.
+When encoding, generate Ogg FLAC output instead of native FLAC.  Ogg FLAC streams are FLAC streams wrapped in an Ogg transport layer.  The resulting file should have an '.oga' extension and will still be decodable by flac.
 
-When decoding, force the input to be treated as Ogg FLAC.  This is useful when piping input from stdin or when the filename does not end in '.ogg'.
+When decoding, force the input to be treated as Ogg FLAC.  This is useful when piping input from stdin or when the filename does not end in '.oga' or '.ogg'.
 .TP
 \fB--serial-number=\fI#\fB\fR
 When used with --ogg, specifies the serial number to use for the first Ogg FLAC stream, which is then incremented for each additional stream.  When encoding and no serial number is given, flac uses a random number for the first stream, then increments it for each additional stream.  When decoding and no number is given, flac uses the serial number of the first page.
diff --git a/man/metaflac.1 b/man/metaflac.1
index d4b4616a..9cc593d1 100644
--- a/man/metaflac.1
+++ b/man/metaflac.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "METAFLAC" "1" "12 February 2007" "" ""
+.TH "METAFLAC" "1" "14 September 2007" "" ""
 
 .SH NAME
 metaflac \- program to list, add, remove, or edit metadata in one or more FLAC files.
@@ -31,7 +31,7 @@ if only one FLAC file is specified).
 .TP
 \fB--no-utf8-convert\fR
 Do not convert tags from UTF-8 to local charset, or vice versa. This is
-useful for scripts.
+useful for scripts, and setting tags in situations where the locale is wrong.
 .TP
 \fB--dont-use-padding\fR
 By default metaflac tries to use padding where possible to avoid
@@ -188,7 +188,7 @@ Export PICTURE block to a file.  Use '-' for stdout.  Only one FLAC file may be
 \fB--add-replay-gain\fR
 Calculates the title and album gains/peaks of the given FLAC
 files as if all the files were part of one album, then stores
-them in the VORBIS_COMMENT block.  The tags are the same as
+them as FLAC tags.  The tags are the same as
 those used by vorbisgain.  Existing ReplayGain tags will be
 replaced.  If only one FLAC file is given, the album and title
 gains will be the same.  Since this operation requires two