From a5eec8c785a95597286f3375dc572c6a353d9c16 Mon Sep 17 00:00:00 2001 From: Stan Seibert Date: Wed, 3 Jul 2002 03:10:07 +0000 Subject: Naming fixes. svn path=/trunk/ogg/; revision=3501 --- doc/oggstream.html | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'doc/oggstream.html') 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). -Ogg is a Xiphophorus effort to -protect essential tenets of Internet multimedia from corporate +Ogg is a Xiph.org Foundation 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 About -Xiphophorus for details. +the Xiph.org Foundation for details.

-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.

- -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.

- -OggSquish, Vorbis, Xiphophorus and their logos are trademarks (tm) of -Xiphophorus. These pages are -copyright (C) 1994-2000 Xiphophorus. All rights reserved.

+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.

+ +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.

+ +Ogg, Vorbis, Xiph.org Foundation and their logos are trademarks (tm) +of the Xiph.org Foundation. These +pages are copyright (C) 1994-2002 Xiph.org Foundation. All rights +reserved.

-- cgit v1.2.1