diff options
author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-08-20 16:03:23 -0400 |
---|---|---|
committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-08-20 16:03:23 -0400 |
commit | 05690fddfa8729fefaffff41ed0ea6abf432ccd0 (patch) | |
tree | e67c23dfe2966fc113778e47964ca76166846cb2 /doc | |
parent | 7b6d49eec95fef100d017df6f1f577c72ca60577 (diff) | |
download | cups-05690fddfa8729fefaffff41ed0ea6abf432ccd0.tar.gz |
Also update HTML version of license.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/help/license.html | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/help/license.html b/doc/help/license.html index 9c98b279a..8086c6eac 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> |