Update DFSG license link, update CC licenses

This commit is contained in:
Mark Komarinski 2016-01-28 21:36:54 -05:00
parent 6f4bf9c851
commit 1e2e220ea3
1 changed files with 3 additions and 3 deletions

View File

@ -100,14 +100,14 @@
url="http://www.gnu.org/copyleft/fdl.html">GNU Free Documentation
License (GFDL)</ulink>, one of the <ulink
url="http://www.creativecommons.org/license">Creative Commons
Licenses</ulink> (<ulink url="http://creativecommons.org/licenses/sa/1.0/">Share-Alike</ulink>, or <ulink url="http://creativecommons.org/licenses/by-sa/2.0/">Attribution-Share-Alike</ulink>), or the LDP license (currently under review). The full text of the license must be included in your document, including the title and version of the license you are using. The LDP will not accept new documents that do not meet licensing requirements.</para>
Licenses</ulink> (such as <ulink url="http://creativecommons.org/licenses/by-sa/4.0/">Attribution-Share-Alike</ulink>), or the LDP license (currently under review). The full text of the license must be included in your document, including the title and version of the license you are using. The LDP will not accept new documents that do not meet licensing requirements.</para>
<warning>
<title>Debian-compatible licenses</title>
<para>The Debian package maintainer for LDP documents has divided the LDP documents into those with a <quote>free</quote> license and those with a <quote>non-free</quote> license. For a summary of this list, please read <ulink url="http://www.debian.org/legal/licenses/byname">Debian License Summaries</ulink>. Currently the Artistic License, BSD License and the GNU General Public License are listed as <quote>free</quote>. These licenses will also be accepted by the LDP. The definition of <quote>non-free</quote> has not been made transparent. By choosing another license that has any kind of restriction on redistribution or whether or not the document may be modified, your document <emphasis>may</emphasis> be put into the <quote>non-free</quote> package instead of the <quote>free</quote> package. We are working with Debian to clarify how these decisions are made.</para>
<para>The Debian package maintainer for LDP documents has divided the LDP documents into those with a <quote>free</quote> license and those with a <quote>non-free</quote> license. For a summary of this list, please read <ulink url="https://wiki.debian.org/DFSGLicenses">Debian License Summaries</ulink>. Currently the Artistic License, BSD License and the GNU General Public License are listed as <quote>free</quote>. These licenses will also be accepted by the LDP. The definition of <quote>non-free</quote> has not been made transparent. By choosing another license that has any kind of restriction on redistribution or whether or not the document may be modified, your document <emphasis>may</emphasis> be put into the <quote>non-free</quote> package instead of the <quote>free</quote> package. We are working with Debian to clarify how these decisions are made.</para>
</warning>
<para>You can get DocBook markups of both the GNU GPL and the GNU FDL from <ulink url="http://developer.gnome.org/projects/gdp/licenses.html"> the GNOME Documentation Project</ulink>. You can then merely include the license in its entirety in your document. A DocBook-formatted copy of the license is available in <xref linkend="templates"/>.
<para>A DocBook-formatted copy of the license is available in <xref linkend="templates"/>.
</para>
<para>