Date: Wed, 8 Jan 2020 16:42:03 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r53767 - head/en_US.ISO8859-1/htdocs/internal Message-ID: <202001081642.008Gg31w049144@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Wed Jan 8 16:42:03 2020 New Revision: 53767 URL: https://svnweb.freebsd.org/changeset/doc/53767 Log: 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 Modified: head/en_US.ISO8859-1/htdocs/internal/software-license.xml Modified: head/en_US.ISO8859-1/htdocs/internal/software-license.xml ============================================================================== --- head/en_US.ISO8859-1/htdocs/internal/software-license.xml Wed Jan 8 09:23:10 2020 (r53766) +++ head/en_US.ISO8859-1/htdocs/internal/software-license.xml Wed Jan 8 16:42:03 2020 (r53767) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001081642.008Gg31w049144>