[kdoctools] src/customization/en/entities: Fix duplicate lgpl-notice/gpl-notice/fdl-notice
Burkhard Lück
null at kde.org
Thu Mar 29 16:38:17 UTC 2018
Git commit e932059b349be1af23e5268cfffb05030776f323 by Burkhard Lück.
Committed on 29/03/2018 at 16:37.
Pushed by lueck into branch 'master'.
Fix duplicate lgpl-notice/gpl-notice/fdl-notice
revert wrong commit R760462
for src/customization/en/entities/lgpl-notice
and src/customization/en/entities/gpl-notice
Differential Revision: https://phabricator.kde.org/D11784
M +13 -34 src/customization/en/entities/gpl-notice.docbook
M +14 -34 src/customization/en/entities/lgpl-notice.docbook
https://commits.kde.org/kdoctools/e932059b349be1af23e5268cfffb05030776f323
diff --git a/src/customization/en/entities/gpl-notice.docbook b/src/customization/en/entities/gpl-notice.docbook
index aab2b23..3a2bed7 100644
--- a/src/customization/en/entities/gpl-notice.docbook
+++ b/src/customization/en/entities/gpl-notice.docbook
@@ -1,53 +1,32 @@
<!-- This file can be used to include the notice in documentation
- <!DOCTYPE book ... [
- <!ENTITY % FDLIS "INCLUDE">
- <!ENTITY FDLISTitles "title 1, title 2, title 3">
- <!ENTITY % FDLFCT "INCLUDE">
- <!ENTITY FDLFCTTitles "title 4, title 5, title 6">
- <!ENTITY % FDLBCT "INCLUDE">
- <!ENTITY FDLBCTTitles "title 7, title 7b">
- <!ENTITY % ents "-//KDE//ENTITIES Application-Variable Entities V1.0//EN">
- %ents;
- ...
- ]>
+ <!DOCTYPE book ... >
...
<bookinfo>
<legalnotice>
<para>Copyright (C) 20yy [name of author]</para>
- &FDLnotice;
+ &GPLnotice;
</legalnotice>
</bookinfo>
...
Alternatively, you can include the text literally.
-
- Include a copy of the license in the documentation distribution.
-->
-<para>Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License,
-Version 1.2 or any later version published by the Free Software
-Foundation; with &FDLInvariantSections;, with &FDLFrontCoverText;, and
-with &FDLBackCoverText;. A copy of the license is included in <xref linkend="gnu-fdl"/>.</para>
+<para>This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.</para>
-<!-- If you have no Invariant Sections, don't add any FDLIS entities.
- If you have no Front-Cover Texts, don't add any FDLFCT; likewise
- for Back-Cover Texts (the SGML setup takes care of complying with
- the GNU requirements). Adding the entities: if you use any, then
- add FDL* with value "INCLUDE" and FDL*Titles with a list of
- titles. You will get the default GNU template text if you don't
- specify the FDL*Titles entity after specifying the FDL* entity.
- This will only have effect when you specify %FDLSlots; _after_
- the entity definitions.
+<para>This program is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.</para>
- If your document contains nontrivial examples of program code, we
- recommend releasing these examples in parallel under your choice
- of free software license, such as the GNU General Public License,
- to permit their use in free software.
- -->
+<para>You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</para>
<!--
Local variables:
mode: sgml
sgml-general-insert-case: lower
-sgml-parent-document: ("index.docbook" "book" "bookinfo" "legalnotice" "para")
End:
-->
diff --git a/src/customization/en/entities/lgpl-notice.docbook b/src/customization/en/entities/lgpl-notice.docbook
index aab2b23..1edf3f6 100644
--- a/src/customization/en/entities/lgpl-notice.docbook
+++ b/src/customization/en/entities/lgpl-notice.docbook
@@ -1,53 +1,33 @@
<!-- This file can be used to include the notice in documentation
- <!DOCTYPE book ... [
- <!ENTITY % FDLIS "INCLUDE">
- <!ENTITY FDLISTitles "title 1, title 2, title 3">
- <!ENTITY % FDLFCT "INCLUDE">
- <!ENTITY FDLFCTTitles "title 4, title 5, title 6">
- <!ENTITY % FDLBCT "INCLUDE">
- <!ENTITY FDLBCTTitles "title 7, title 7b">
- <!ENTITY % ents "-//KDE//ENTITIES Application-Variable Entities V1.0//EN">
- %ents;
- ...
- ]>
+ <!DOCTYPE book ... >
...
<bookinfo>
<legalnotice>
<para>Copyright (C) 20yy [name of author]</para>
- &FDLnotice;
+ &LGPLnotice;
</legalnotice>
</bookinfo>
...
Alternatively, you can include the text literally.
-
- Include a copy of the license in the documentation distribution.
-->
-<para>Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License,
-Version 1.2 or any later version published by the Free Software
-Foundation; with &FDLInvariantSections;, with &FDLFrontCoverText;, and
-with &FDLBackCoverText;. A copy of the license is included in <xref linkend="gnu-fdl"/>.</para>
+<para>This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public License
+as published by the Free Software Foundation; either version 2 of
+the License, or (at your option) any later version.</para>
-<!-- If you have no Invariant Sections, don't add any FDLIS entities.
- If you have no Front-Cover Texts, don't add any FDLFCT; likewise
- for Back-Cover Texts (the SGML setup takes care of complying with
- the GNU requirements). Adding the entities: if you use any, then
- add FDL* with value "INCLUDE" and FDL*Titles with a list of
- titles. You will get the default GNU template text if you don't
- specify the FDL*Titles entity after specifying the FDL* entity.
- This will only have effect when you specify %FDLSlots; _after_
- the entity definitions.
+<para>This library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.</para>
- If your document contains nontrivial examples of program code, we
- recommend releasing these examples in parallel under your choice
- of free software license, such as the GNU General Public License,
- to permit their use in free software.
- -->
+<para>You should have received a copy of the GNU Lesser General
+Public License along with this library; if not, write to the Free
+Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA</para>
<!--
Local variables:
mode: sgml
sgml-general-insert-case: lower
-sgml-parent-document: ("index.docbook" "book" "bookinfo" "legalnotice" "para")
End:
-->
More information about the kde-doc-english
mailing list