From: Josh Coalson <jcoalson@users.sourceforce.net>
Date: Fri, 10 Sep 2004 00:23:04 +0000 (+0000)
Subject: change "Ogg-FLAC" to "Ogg FLAC" for consistency
X-Git-Tag: 1.2.0~744
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a69f512231c492bdeb6fa10fcc35150356b5915;p=platform%2Fupstream%2Fflac.git

change "Ogg-FLAC" to "Ogg FLAC" for consistency
---

diff --git a/man/flac.1 b/man/flac.1
index 01bd6ff..21931c0 100644
--- a/man/flac.1
+++ b/man/flac.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 "FLAC" "1" "29 July 2004" "" ""
+.TH "FLAC" "1" "09 September 2004" "" ""
 .SH NAME
 flac \- Free Lossless Audio Codec
 .SH SYNOPSIS
@@ -103,14 +103,14 @@ 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
+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 decoding, force the input to be treated as
-Ogg-FLAC.  This is useful when piping input from
+Ogg FLAC.  This is useful when piping input from
 stdin or when the filename does not end in '.ogg'.
 .TP
 \fB--serial-number=\fI#\fB\fR
diff --git a/man/flac.sgml b/man/flac.sgml
index 055f8d5..489f10f 100644
--- a/man/flac.sgml
+++ b/man/flac.sgml
@@ -236,13 +236,13 @@
 		<term><option>--ogg</option></term>
 
 		<listitem>
-		  <para>When encoding, generate Ogg-FLAC output instead
-		    of native-FLAC.  Ogg-FLAC streams are FLAC streams
+		  <para>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.</para>
 		  <para>When decoding, force the input to be treated as
-		    Ogg-FLAC.  This is useful when piping input from
+		    Ogg FLAC.  This is useful when piping input from
 		    stdin or when the filename does not end in '.ogg'.</para>
 		</listitem>
 	      </varlistentry>
diff --git a/src/flac/main.c b/src/flac/main.c
index 4380506..0fa01fc 100644
--- a/src/flac/main.c
+++ b/src/flac/main.c
@@ -1289,13 +1289,13 @@ void show_explain()
 	printf("                               at the beginning, the --until point is relative\n");
 	printf("                               to end of the audio.\n");
 #ifdef FLAC__HAS_OGG
-	printf("      --ogg                    When encoding, generate Ogg-FLAC output instead\n");
-	printf("                               of native-FLAC.  Ogg-FLAC streams are FLAC\n");
+	printf("      --ogg                    When encoding, generate Ogg FLAC output instead\n");
+	printf("                               of native FLAC.  Ogg FLAC streams are FLAC\n");
 	printf("                               streams wrapped in an Ogg transport layer.  The\n");
 	printf("                               resulting file should have an '.ogg' extension\n");
 	printf("                               and will still be decodable by flac.  When\n");
 	printf("                               decoding, force the input to be treated as\n");
-	printf("                               Ogg-FLAC.  This is useful when piping input\n");
+	printf("                               Ogg FLAC.  This is useful when piping input\n");
 	printf("                               from stdin or when the filename does not end in\n");
 	printf("                               '.ogg'.\n");
 	printf("      --serial-number          Serial number to use for the FLAC stream.  When\n");