More menial janitorial work on the documentation.

I'll be asking for a raise soon.  :)

svn path=/trunk/vorbis/; revision=3500

diff --git a/AUTHORS b/AUTHORS
index 171072e..0da1036 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,3 @@
 Monty <monty@xiph.org>
 
-and the rest of the Xiphophorus Company.
+and the rest of the Xiph.org Foundation.

diff --git a/COPYING b/COPYING
index 69bbac0..928afad 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2001, Xiphophorus
+Copyright (c) 2002, Xiph.org Foundation
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -11,9 +11,9 @@ notice, this list of conditions and the following disclaimer.
 notice, this list of conditions and the following disclaimer in the
 documentation and/or other materials provided with the distribution.
 
-- Neither the name of the Xiphophorus nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

diff --git a/README b/README
index 0cb8268..469ce8b 100644 (file)
--- a/README
+++ b/README
@@ -5,8 +5,8 @@
 * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
 * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
 *                                                                  *
-* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
-* by the XIPHOPHORUS Company http://www.xiph.org/                  *
+* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002             *
+* by the Xiph.org Foundation, http://www.xiph.org/                 *
 *                                                                  *
 ********************************************************************
 
@@ -139,4 +139,4 @@ VorbisLib at least) and #include "ogg/ogg.h" and "vorbis/codec.h"
 wherever you need to access Ogg and Vorbis functionality.
 
 
-$Id: README,v 1.11 2001/03/22 01:33:20 segher Exp $
+$Id: README,v 1.12 2002/07/03 00:37:55 volsung Exp $

diff --git a/debian/copyright b/debian/copyright
index 5df704e..8f46e97 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Upstream Author(s): Monty <monty@xiph.org>
 
 Copyright:
 
-Copyright (c) 2001, Xiphophorus
+Copyright (c) 2002, Xiph.org Foundation
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -20,9 +20,9 @@ notice, this list of conditions and the following disclaimer.
 notice, this list of conditions and the following disclaimer in the
 documentation and/or other materials provided with the distribution.
 
-- Neither the name of the Xiphophorus nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

diff --git a/doc/programming.html b/doc/programming.html
index d03eafd..ce7fb4b 100644 (file)
--- a/doc/programming.html
+++ b/doc/programming.html
@@ -4,18 +4,18 @@
 
 
 <h1><font color=#000070>
-Programming with Xiphophorus <tt>libvorbis</tt>
+Programming with Xiph.org <tt>libvorbis</tt>
 </font></h1>
 
 <em>Last update to this document: July 22, 1999</em><br> 
 
 <h2>Description</h2> 
 
-Libvorbis is Xiphophorus's portable Ogg Vorbis CODEC implemented as a
-programmatic library.  Libvorbis provides primitives to handle framing
-and manipulation of Ogg bitstreams (used by the Vorbis for
-streaming), a full analysis (encoding) interface as well as packet
-decoding and synthesis for playback. <p>
+Libvorbis is the Xiph.org Foundation's portable Ogg Vorbis CODEC
+implemented as a programmatic library.  Libvorbis provides primitives
+to handle framing and manipulation of Ogg bitstreams (used by the
+Vorbis for streaming), a full analysis (encoding) interface as well as
+packet decoding and synthesis for playback. <p>
 
 The libvorbis library does not provide any system interface; a
 full-featured demonstration player included with the library
@@ -476,32 +476,27 @@ when the number of bytes written were larger than the buffer.<p>
 </a>
 <font size=-2 color=#505050>
 
-Ogg is a <a href="http://www.xiph.org">Xiphophorus</a> effort to
+Ogg is a <a href="http://www.xiph.org"></a> effort to
 protect essential tenets of Internet multimedia from corporate
 hostage-taking; Open Source is the net's greatest tool to keep
 everyone honest. See <a href="http://www.xiph.org/about.html">About
-Xiphophorus</a> for details.
+</a> for details.
 <p>
 
-Ogg Vorbis is the first Ogg audio CODEC.  Anyone may
-freely use and distribute the Ogg and Vorbis specification,
-whether in a private, public or corporate capacity.  However,
-Xiphophorus and the Ogg project (xiph.org) reserve the right to set
-the Ogg/Vorbis specification and certify specification compliance.<p>
+Ogg Vorbis is the first Ogg audio CODEC.  Anyone may freely use and
+distribute the Ogg and Vorbis specification, whether in a private,
+public or corporate capacity.  However, the Xiph.org Foundation and
+the Ogg project (xiph.org) reserve the right to set the Ogg Vorbis
+specification and certify specification compliance.<p>
 
-Xiphophorus's Vorbis software CODEC implementation is distributed
-under the Lesser/Library GNU Public License.  This does not restrict
-third parties from distributing independent implementations of Vorbis
-software under other licenses.<p>
+Xiph.org's Vorbis software CODEC implementation is distributed under a
+BSD-like license.  This does not restrict third parties from
+distributing independent implementations of Vorbis software under
+other licenses.<p>
 
-OggSquish, Vorbis, Xiphophorus and their logos are trademarks (tm) of
-<a href="http://www.xiph.org/">Xiphophorus</a>.  These pages are
-copyright (C) 1994-2000 Xiphophorus. All rights reserved.<p>
+Ogg, Vorbis, Xiph.org Foundation and their logos are trademarks (tm)
+of the <a href="http://www.xiph.org/">Xiph.org Foundation</a>.  These
+pages are copyright (C) 1994-2002 Xiph.org Foundation. All rights
+reserved.<p>
 
 </body>
-
-
-
-
-
-

diff --git a/doc/stereo.html b/doc/stereo.html
index 7ba2900..f5a7a2d 100644 (file)
--- a/doc/stereo.html
+++ b/doc/stereo.html
@@ -437,28 +437,28 @@ will likely be readded to the stereo model in the future.
 </a>
 <font size=-2 color=#505050>
 
-Ogg is a <a href="http://www.xiph.org">Xiphophorus</a> effort to
-protect essential tenets of Internet multimedia from corporate
+Ogg is a <a href="http://www.xiph.org">Xiph.org Foundation</a> effort
+to protect essential tenets of Internet multimedia from corporate
 hostage-taking; Open Source is the net's greatest tool to keep
 everyone honest. See <a href="http://www.xiph.org/about.html">About
-Xiphophorus</a> for details.
+the Xiph.org Foundation</a> for details.
 <p>
 
-Ogg Vorbis is the first Ogg audio CODEC.  Anyone may
-freely use and distribute the Ogg and Vorbis specification,
-whether in a private, public or corporate capacity.  However,
-Xiphophorus and the Ogg project (xiph.org) reserve the right to set
-the Ogg/Vorbis specification and certify specification compliance.<p>
+Ogg Vorbis is the first Ogg audio CODEC.  Anyone may freely use and
+distribute the Ogg and Vorbis specification, whether in a private,
+public or corporate capacity.  However, the Xiph.org Foundation and
+the Ogg project (xiph.org) reserve the right to set the Ogg Vorbis
+specification and certify specification compliance.<p>
 
-Xiphophorus's Vorbis software CODEC implementation is distributed
-under a BSD-like License.  This does not restrict third parties from
+Xiph.org's Vorbis software CODEC implementation is distributed under a
+BSD-like license.  This does not restrict third parties from
 distributing independent implementations of Vorbis software under
 other licenses.<p>
 
-OggSquish, Vorbis, Xiphophorus and their logos are trademarks (tm) of
-<a href="http://www.xiph.org/">Xiphophorus</a>.  These pages are
-copyright (C) 1994-2001 Xiphophorus. All rights reserved.<p>
-
+Ogg, Vorbis, Xiph.org Foundation and their logos are trademarks (tm)
+of the <a href="http://www.xiph.org/">Xiph.org Foundation</a>.  These
+pages are copyright (C) 1994-2002 Xiph.org Foundation. All rights
+reserved.<p>
 </body>
 
 

diff --git a/doc/v-comment.html b/doc/v-comment.html
index f45bf67..f37f15c 100644 (file)
--- a/doc/v-comment.html
+++ b/doc/v-comment.html
@@ -182,27 +182,28 @@ This is actually somewhat easier to describe in code; implementation of the abov
 </a>
 <font size=-2 color=#505050>
 
-Ogg is a <a href="http://www.xiph.org">Xiphophorus</a> effort to
-protect essential tenets of Internet multimedia from corporate
+Ogg is a <a href="http://www.xiph.org">Xiph.org Foundation</a> effort
+to protect essential tenets of Internet multimedia from corporate
 hostage-taking; Open Source is the net's greatest tool to keep
 everyone honest. See <a href="http://www.xiph.org/about.html">About
-Xiphophorus</a> for details.
+the Xiph.org Foundation</a> for details.
 <p>
 
-Ogg Vorbis is the first Ogg audio CODEC.  Anyone may
-freely use and distribute the Ogg and Vorbis specification,
-whether in a private, public or corporate capacity.  However,
-Xiphophorus and the Ogg project (xiph.org) reserve the right to set
-the Ogg/Vorbis specification and certify specification compliance.<p>
-
-Xiphophorus's Vorbis software CODEC implementation is distributed
-under the Lesser/Library GNU Public License.  This does not restrict
-third parties from distributing independent implementations of Vorbis
-software under other licenses.<p>
-
-OggSquish, Vorbis, Xiphophorus and their logos are trademarks (tm) of
-<a href="http://www.xiph.org/">Xiphophorus</a>.  These pages are
-copyright (C) 1994-2001 Xiphophorus. All rights reserved.<p>
+Ogg Vorbis is the first Ogg audio CODEC.  Anyone may freely use and
+distribute the Ogg and Vorbis specification, whether in a private,
+public or corporate capacity.  However, the Xiph.org Foundation and
+the Ogg project (xiph.org) reserve the right to set the Ogg Vorbis
+specification and certify specification compliance.<p>
+
+Xiph.org's Vorbis software CODEC implementation is distributed under a
+BSD-like license.  This does not restrict third parties from
+distributing independent implementations of Vorbis software under
+other licenses.<p>
+
+Ogg, Vorbis, Xiph.org Foundation and their logos are trademarks (tm)
+of the <a href="http://www.xiph.org/">Xiph.org Foundation</a>.  These
+pages are copyright (C) 1994-2002 Xiph.org Foundation. All rights
+reserved.<p>
 
 </body>
 

diff --git a/doc/vorbis.html b/doc/vorbis.html
index 27e3a5b..05c140b 100644 (file)
--- a/doc/vorbis.html
+++ b/doc/vorbis.html
@@ -7,8 +7,8 @@
 Ogg Vorbis encoding format documentation
 </font></h1>
 
-<em>Last update to this document: July 15, 1999</em><br> 
-<em>Last update to Vorbis documentation: July 21, 1999</em><p> 
+<em>Last update to this document: July 2, 2002</em><br> 
+<em>Last update to Vorbis documentation: July 2, 2002</em><p> 
 
 <table><tr><td>
 <img src=wait.png>
@@ -47,7 +47,7 @@ places Vorbis in the same class as audio representations including
 MPEG-1 audio layer 3, MPEG-4 audio (AAC and TwinVQ), and PAC.<p>
 
 Vorbis is the first of a planned family of Ogg multimedia coding
-formats being developed as part of Xiphophorus's Ogg multimedia
+formats being developed as part of the Xiph.org Foundation's Ogg multimedia
 project.  See <a href="http://www.xiph.org/">http://www.xiph.org/</a>
 for more information.
 
@@ -75,7 +75,7 @@ audio signal from the decoded representation (<em>synthesis</em>).<p>
 
 The <a href="programming.html">Programming with libvorbis</a>
 documents discuss use of the reference Vorbis codec library
-(libvorbis) produced by Xiphophorus.<p>
+(libvorbis) produced by the Xiph.org Foundation.<p>
 
 The data representations and algorithms necessary at each step to
 encode and decode Ogg Vorbis bitstreams are described by the below
@@ -165,27 +165,28 @@ Ogg physical bitstream.
 </a>
 <font size=-2 color=#505050>
 
-Ogg is a <a href="http://www.xiph.org">Xiphophorus</a> effort to
-protect essential tenets of Internet multimedia from corporate
+Ogg is a <a href="http://www.xiph.org">Xiph.org Foundation</a> effort
+to protect essential tenets of Internet multimedia from corporate
 hostage-taking; Open Source is the net's greatest tool to keep
 everyone honest. See <a href="http://www.xiph.org/about.html">About
-Xiphophorus</a> for details.
+the Xiph.org Foundation</a> for details.
 <p>
 
-Ogg Vorbis is the first Ogg audio CODEC.  Anyone may
-freely use and distribute the Ogg and Vorbis specification,
-whether in a private, public or corporate capacity.  However,
-Xiphophorus and the Ogg project (xiph.org) reserve the right to set
-the Ogg/Vorbis specification and certify specification compliance.<p>
-
-Xiphophorus's Vorbis software CODEC implementation is distributed
-under the Lesser/Library GNU Public License.  This does not restrict
-third parties from distributing independent implementations of Vorbis
-software under other licenses.<p>
-
-OggSquish, Vorbis, Xiphophorus and their logos are trademarks (tm) of
-<a href="http://www.xiph.org/">Xiphophorus</a>.  These pages are
-copyright (C) 1994-2000 Xiphophorus. All rights reserved.<p>
+Ogg Vorbis is the first Ogg audio CODEC.  Anyone may freely use and
+distribute the Ogg and Vorbis specification, whether in a private,
+public or corporate capacity.  However, the Xiph.org Foundation and
+the Ogg project (xiph.org) reserve the right to set the Ogg Vorbis
+specification and certify specification compliance.<p>
+
+Xiph.org's Vorbis software CODEC implementation is distributed under a
+BSD-like license.  This does not restrict third parties from
+distributing independent implementations of Vorbis software under
+other licenses.<p>
+
+Ogg, Vorbis, Xiph.org Foundation and their logos are trademarks (tm)
+of the <a href="http://www.xiph.org/">Xiph.org Foundation</a>.  These
+pages are copyright (C) 1994-2002 Xiph.org Foundation. All rights
+reserved.<p>
 
 </body>
 

diff --git a/libvorbis.spec b/libvorbis.spec
index a83df35..acbbf25 100644 (file)
--- a/libvorbis.spec
+++ b/libvorbis.spec
@@ -9,7 +9,7 @@ Release:        %{release}
 Group:         Libraries/Multimedia
 Copyright:     BSD
 URL:           http://www.xiph.org/
-Vendor:                Xiphophorus <team@xiph.org>
+Vendor:                Xiph.org Foundation <team@xiph.org>
 Source:                ftp://ftp.xiph.org/pub/ogg/vorbis/%{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-root
 Requires:      libogg >= 1.0rc3