From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Tue, 20 Aug 2019 20:03:23 +0000 (-0400)
Subject: Also update HTML version of license.
X-Git-Tag: v2.3.0~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05690fddfa8729fefaffff41ed0ea6abf432ccd0;p=thirdparty%2Fcups.git

Also update HTML version of license.
---

diff --git a/doc/help/license.html b/doc/help/license.html
index 9c98b279a3..8086c6eac1 100644
--- a/doc/help/license.html
+++ b/doc/help/license.html
@@ -187,5 +187,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 </pre>
 
+<h2>CUPS Exceptions to the Apache 2.0 License</h2>
+
+<p>As an exception, if, as a result of your compiling your source code, portions
+of this Software are embedded into an Object form of such source code, you
+may redistribute such embedded portions in such Object form without complying
+with the conditions of Sections 4(a), 4(b) and 4(d) of the License.</p>
+
+<p>In addition, if you combine or link compiled forms of this Software with
+software that is licensed under the GPLv2 ("Combined Software") and if a
+court of competent jurisdiction determines that the patent provision (Section
+3), the indemnity provision (Section 9) or other Section of the License
+conflicts with the conditions of the GPLv2, you may retroactively and
+prospectively choose to deem waived or otherwise exclude such Section(s) of
+the License, but only in their entirety and only with respect to the Combined
+Software.</p>
+
 </BODY>
 </HTML>