From 1e2e220ea340d32b9ad6a7b193aa8b26b13e37f8 Mon Sep 17 00:00:00 2001 From: Mark Komarinski Date: Thu, 28 Jan 2016 21:36:54 -0500 Subject: [PATCH] Update DFSG license link, update CC licenses --- LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml b/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml index acbfb9f6..3e78b1ac 100644 --- a/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml +++ b/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml @@ -100,14 +100,14 @@ url="http://www.gnu.org/copyleft/fdl.html">GNU Free Documentation License (GFDL), one of the Creative Commons - Licenses (Share-Alike, or Attribution-Share-Alike), 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. + Licenses (such as Attribution-Share-Alike), 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. Debian-compatible licenses - The Debian package maintainer for LDP documents has divided the LDP documents into those with a free license and those with a non-free license. For a summary of this list, please read Debian License Summaries. Currently the Artistic License, BSD License and the GNU General Public License are listed as free. These licenses will also be accepted by the LDP. The definition of non-free 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 may be put into the non-free package instead of the free package. We are working with Debian to clarify how these decisions are made. + The Debian package maintainer for LDP documents has divided the LDP documents into those with a free license and those with a non-free license. For a summary of this list, please read Debian License Summaries. Currently the Artistic License, BSD License and the GNU General Public License are listed as free. These licenses will also be accepted by the LDP. The definition of non-free 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 may be put into the non-free package instead of the free package. We are working with Debian to clarify how these decisions are made. - You can get DocBook markups of both the GNU GPL and the GNU FDL from the GNOME Documentation Project. You can then merely include the license in its entirety in your document. A DocBook-formatted copy of the license is available in . + A DocBook-formatted copy of the license is available in .