add 2009 copyright

[platform/upstream/flac.git] / man / metaflac.sgml

diff --git a/man/metaflac.sgml b/man/metaflac.sgml
index 90697a9..bb9fc8a 100644 (file)
--- a/man/metaflac.sgml
+++ b/man/metaflac.sgml
@@ -20,7 +20,7 @@ manpage.1: manpage.sgml
   <!ENTITY manfirstname "<firstname>dann</firstname>">
   <!ENTITY mansurname   "<surname>frazier</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY mandate      "<date>2005-02-02</date>">
+  <!ENTITY mandate      "<date>2006-11-14</date>">
   <!-- SECTION should be 1-8, maybe with subsection. Other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY mansection   "<manvolnum>1</manvolnum>">
@@ -106,6 +106,15 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term><option>--no-utf8-convert</option></term>
+        <listitem>
+          <para>
+           Do not convert tags from UTF-8 to local charset, or vice versa. This is
+           useful for scripts, and setting tags in situations where the locale is wrong.
+         </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term><option>--dont-use-padding</option></term>
         <listitem>
           <para>
@@ -274,7 +283,7 @@ manpage.1: manpage.sgml
        <term><option>--export-tags-to=file</option></term>
         <listitem>
          <para>
-           Export tags to a file.  Use '-' for stdin.  Each
+           Export tags to a file.  Use '-' for stdout.  Each
            line will be of the form NAME=VALUE.  Specify
            --no-utf8-convert if necessary.
          </para>
@@ -302,10 +311,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-       <term><option>--import-picture-from</option>=<replaceable>SPECIFICATION</replaceable></term>
+       <term><option>--import-picture-from</option>={<replaceable>FILENAME</replaceable>|<replaceable>SPECIFICATION</replaceable>}</term>
        <listitem>
-         <para>Import a picture and store it in a PICTURE metadata block.  More than one --import-picture-from command can be specified.  The SPECIFICATION is a string whose parts are separated by | (pipe) characters.  Some parts may be left empty to invoke default values.  The format of SPECIFICATION is</para>
-         <para>[TYPE]|MIME-TYPE|[DESCRIPTION]|[WIDTHxHEIGHTxDEPTH[/COLORS]]|FILE</para>
+         <para>Import a picture and store it in a PICTURE metadata block.  More than one --import-picture-from command can be specified.  Either a filename for the picture file or a more complete specification form can be used.  The SPECIFICATION is a string whose parts are separated by | (pipe) characters.  Some parts may be left empty to invoke default values.  FILENAME is just shorthand for "||||FILENAME".  The format of SPECIFICATION is</para>
+         <para>[TYPE]|[MIME-TYPE]|[DESCRIPTION]|[WIDTHxHEIGHTxDEPTH[/COLORS]]|FILE</para>
          <para>TYPE is optional; it is a number from one of:</para>
          <para>0: Other</para>
          <para>1: 32x32 pixels 'file icon' (PNG only)</para>
@@ -330,7 +339,7 @@ manpage.1: manpage.sgml
          <para>20: Publisher/Studio logotype</para>
          <para>The default is 3 (front cover).  There may only be one picture each of type 1 and 2 in a file.</para>
 
-         <para>MIME-TYPE is mandatory; for best compatibility with players, use pictures with MIME type image/jpeg or image/png.  The MIME type can also be --&gt; to mean that FILE is actually a URL to an image, though this use is discouraged.</para>
+         <para>MIME-TYPE is optional; if left blank, it will be detected from the file.  For best compatibility with players, use pictures with MIME type image/jpeg or image/png.  The MIME type can also be --&gt; to mean that FILE is actually a URL to an image, though this use is discouraged.</para>
 
          <para>DESCRIPTION is optional; the default is an empty string.</para>
 
@@ -357,7 +366,7 @@ manpage.1: manpage.sgml
          <para>
            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