Naming fixes.

git-svn-id: http://svn.xiph.org/trunk/ogg@3501 0101bb08-14d6-0310-b084-bc0e0c8e3800

2 files changed, 36 insertions, 34 deletions

diff --git a/doc/framing.html b/doc/framing.html
index 64e8953..50bba5e 100644
--- a/doc/framing.html
+++ b/doc/framing.html
@@ -360,27 +360,28 @@ stereo encodings.<p>
 </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 Lessr/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/oggstream.html b/doc/oggstream.html
index 46a221c..56a50d7 100644
--- a/doc/oggstream.html
+++ b/doc/oggstream.html
@@ -165,27 +165,28 @@ where decode requires more information).
 </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>