diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2020-01-08 16:42:03 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2020-01-08 16:42:03 +0000 |
| commit | 543074e59bfcce4d21acf9a958f79cecb9ed8d22 (patch) | |
| tree | fc1b9065327cd913c51deb29651de2539afd7d44 /en_US.ISO8859-1/htdocs | |
| parent | 36190f14cfe25f4ec498217c2b25d63e8c6cb7bc (diff) | |
| download | doc-543074e59bfcce4d21acf9a958f79cecb9ed8d22.tar.gz doc-543074e59bfcce4d21acf9a958f79cecb9ed8d22.zip | |
Add CDDL to the list of special licenses.
It is only permitted for DTrace and ZFS in the base system.
While here, add a couple of dummy paragraphs to fix the formatting
of other special license exceptions.
Reviewed by: imp, bcr
Differential Revision: https://reviews.freebsd.org/D23069
Notes
Notes:
svn path=/head/; revision=53767
Diffstat (limited to 'en_US.ISO8859-1/htdocs')
| -rw-r--r-- | en_US.ISO8859-1/htdocs/internal/software-license.xml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/en_US.ISO8859-1/htdocs/internal/software-license.xml b/en_US.ISO8859-1/htdocs/internal/software-license.xml index 1ec8c23954..b1d8813e08 100644 --- a/en_US.ISO8859-1/htdocs/internal/software-license.xml +++ b/en_US.ISO8859-1/htdocs/internal/software-license.xml @@ -85,6 +85,7 @@ components.</li> <li>Subversion and its dependencies</li> </ul> + <p></p> </li> <li> @@ -97,6 +98,22 @@ <ul> <li>EDK2 derived code related to UEFI functionality</li> </ul> + <p></p> + </li> + + <li> + <p>The Common Development and Distribution License (CDDL) is + acceptable for use in some cases. The Core Team must approve + the import of new CDDL licensed components or the change of + license of existing components to the CDDL.</p> + + <p>This license is approved for the following components:</p> + <ul> + <li>DTrace</li> + <li>ZFS filesystem including kernel support and userland + utilities</li> + </ul> + <p></p> </li> <li> |