Changeset 96288 in vbox for trunk/doc/manual/en_US

Timestamp:

Aug 18, 2022 8:18:14 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

153102

Message:

Recording: Vorbis license updates, removed Opus license. bugref:10275

File:

• trunk/doc/manual/en_US/user_ThirdParty.xml (modified) (4 diffs)

trunk/doc/manual/en_US/user_ThirdParty.xml

@@ -368 +368 @@
         </para>
       </listitem>
+
+            <listitem>
+        <para>
+          &product-name; may contain code from libvorbis ("Vorbis") which is
+          governed by the license in
+          <xref linkend="licVorbis" xrefstyle="template: %n" /> and
+        </para>
+        <para>
+          Monty &lt;[email protected]&gt;
+
+          and the rest of the Xiph.org Foundation.
+            </para>
+          </listitem>
 
       <listitem>
@@ -4855 +4868 @@
     </sect2>
 
-    <sect2 id="licOpus">
-
-      <title>Opus License</title>
-
-      <para>
-        Copyright 2001-2011 Xiph.Org, Skype Limited, Octasic, Jean-Marc
-        Valin, Timothy B. Terriberry, CSIRO, Gregory Maxwell, Mark
-        Borgerding, Erik de Castro Lopo
-      </para>
-
-      <para>
-        Redistribution and use in source and binary forms, with or
-        without modification, are permitted provided that the following
-        conditions are met:
+    <sect2 id="licVorbis">
+
+      <title>Vorbis License</title>
+
+      <para>
+        Copyright (c) 2002-2020 Xiph.org Foundation
+      </para>
+
+      <para>
+        Redistribution and use in source and binary forms, with or without
+        modification, are permitted provided that the following conditions
+        are met:
       </para>
 
@@ -4892 +4903 @@
         <listitem>
           <para>
-            Neither the name of Internet Society, IETF or IETF Trust,
-            nor the names of specific 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.
           </para>
         </listitem>
@@ -4902 +4912 @@
 
       <para>
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-        CONTRIBUTORS ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-        MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-        CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+        ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+        LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+        A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
+        OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
         SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-        LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-        USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-        AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-        LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-        IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-        THE POSSIBILITY OF SUCH DAMAGE. Opus is subject to the
-        royalty-free patent licenses which are specified at: Xiph.Org
-        Foundation: https://datatracker.ietf.org/ipr/1524/ Microsoft
-        Corporation: https://datatracker.ietf.org/ipr/1914/ Broadcom
-        Corporation: https://datatracker.ietf.org/ipr/1526/
+        LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+        DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+        THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+        (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+        OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </para>