Fix gcc version check for private macros

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

diff --git a/man/metaflac.sgml b/man/metaflac.sgml
index cb686f3..d2277ca 100644 (file)
--- a/man/metaflac.sgml
+++ b/man/metaflac.sgml
@@ -110,7 +110,7 @@ manpage.1: manpage.sgml
         <listitem>
           <para>
            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.
          </para>
         </listitem>
       </varlistentry>
@@ -311,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>
@@ -339,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>
 
@@ -366,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
@@ -374,7 +374,8 @@ manpage.1: manpage.sgml
            have been completed and written to disk.  All FLAC files
            specified must have the same resolution, sample rate, and
            number of channels.  The sample rate must be one of 8, 11.025,
-           12, 16, 22.05, 24, 32, 44.1, or 48 kHz.
+           12, 16, 18.9, 22.05, 24, 28, 32, 37.8, 44.1, 48, 56, 64, 88.2,
+           96, 112, 128, 144, 176.4, or 192kHz.
          </para>
         </listitem>
       </varlistentry>
@@ -451,8 +452,8 @@ manpage.1: manpage.sgml
                  An optional comma-separated list of block types to be included
                  or ignored with this option.  Use only one of --block-type or
                  --except-block-type.  The valid block types are: STREAMINFO,
-                 PADDING, APPLICATION, SEEKTABLE, VORBIS_COMMENT.  You may
-                 narrow down the types of APPLICATION blocks displayed as
+                 PADDING, APPLICATION, SEEKTABLE, VORBIS_COMMENT, PICTURE.  You
+                 may narrow down the types of APPLICATION blocks displayed as
                  follows:
                </para>
                <para>