Skip to content

Commit f01f734

Browse files
committed
Doc: all: clarify licensing and copyrights
This clarifies that documentation is under CC-BY-SA v4.0+, and assigns the proper original copyright year to each generated document (rather than mark them all as 2009). The Pacemaker Development FAQ has been updated accordingly. This also moves the text of actual licenses to a new licenses subdirectory, and the COPYING file now says which license applies to which files. The spec file has been updated accordingly.
1 parent a9e6196 commit f01f734

File tree

12 files changed

+854
-366
lines changed

12 files changed

+854
-366
lines changed

COPYING

+14-345
Large diffs are not rendered by default.

Makefile.am

+4-1
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure DRF/config-h.in \
2626
CORE = $(LIBLTDL_DIR) replace include lib mcp attrd pengine cib crmd fencing lrmd tools xml
2727
SUBDIRS = $(CORE) cts extra doc
2828

29-
doc_DATA = AUTHORS COPYING COPYING.LIB
29+
doc_DATA = AUTHORS COPYING
3030
noinst_PROGRAMS = scratch
3131

3232
ACLOCAL_AMFLAGS = -I m4
3333

34+
licensedir = $(docdir)/licenses/
35+
license_DATA = $(wildcard licenses/*)
36+
3437
testdir = $(datadir)/$(PACKAGE)/tests/
3538
test_SCRIPTS = coverage.sh BasicSanity.sh
3639
test_DATA = valgrind-pcmk.suppressions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!ENTITY PRODUCT "Pacemaker">
22
<!ENTITY BOOKID "Clusters_from_Scratch">
3-
<!ENTITY YEAR "2015">
3+
<!ENTITY YEAR "2009-2016">
44
<!ENTITY HOLDER "Andrew Beekhof">
55
<!ENTITY DISTRO "CentOS">
66
<!ENTITY DISTRO_VERSION "7.1">

doc/Pacemaker_Development/en-US/Ch-FAQ.txt

+13-7
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,19 @@ How can I test my changes?::
7272

7373
What is Pacemaker's license?::
7474
indexterm:[licensing]
75-
Pacemaker programs are licensed under version 2 or later of the GNU General
76-
Public License (GPLv2+), its headers and libraries are under version 2.1 or
77-
later of the less restrictive GNU Lesser General Public License (LGPLv2.1+),
78-
its documentation is under version 1.2 or later of the GNU Free Documentation
79-
License (GFDLv1.2+), and its init scripts are under the Revised BSD license.
80-
If you find any deviations from this policy, or wish to inquire about
81-
alternate licensing arrangements, please e-mail [email protected].
75+
Except where noted otherwise in the file itself, the source code for all
76+
Pacemaker programs is licensed under version 2 or later of the GNU General
77+
Public License (https://www.gnu.org/licenses/gpl-2.0.html[GPLv2+]), its
78+
headers and libraries under version 2.1 or later of the less restrictive
79+
GNU Lesser General Public License
80+
(https://www.gnu.org/licenses/lgpl-2.1.html[LGPLv2.1+]),
81+
its documentation under version 4.0 or later of the
82+
Creative Commons Attribution-ShareAlike International Public License
83+
(https://creativecommons.org/licenses/by-sa/4.0/legalcode[CC-BY-SA]),
84+
and its init scripts under the
85+
https://opensource.org/licenses/BSD-3-Clause[Revised BSD] license. If you find
86+
any deviations from this policy, or wish to inquire about alternate licensing
87+
arrangements, please e-mail [email protected].
8288
Licensing issues are also discussed on the
8389
http://clusterlabs.org/wiki/License[ClusterLabs wiki].
8490

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<!ENTITY PRODUCT "Pacemaker">
22
<!ENTITY BOOKID "Pacemaker_Explained">
3-
<!ENTITY YEAR "2015">
3+
<!ENTITY YEAR "2009-2016">
44
<!ENTITY HOLDER "Andrew Beekhof">
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!ENTITY PRODUCT "Pacemaker Remote">
22
<!ENTITY BOOKID "Pacemaker_Remote">
3-
<!ENTITY YEAR "2015">
3+
<!ENTITY YEAR "2013-2016">
44
<!ENTITY HOLDER "David Vossel">
55
<!ENTITY DISTRO "CentOS">
66
<!ENTITY DISTRO_VERSION "7.1">

doc/publican-clusterlabs/en-US/Legal_Notice.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
]>
44
<legalnotice>
55
<para>
6-
Copyright <trademark class="copyright"></trademark> 2009-&YEAR; &HOLDER;.
6+
Copyright <trademark class="copyright"></trademark> &YEAR; &HOLDER;.
77
</para>
88
<para>
9-
The text of and illustrations in this document are licensed under a Creative Commons Attribution–Share Alike 3.0 Unported license ("CC-BY-SA")<footnote><para>An explanation of CC-BY-SA is available at <ulink url="http://creativecommons.org/licenses/by-sa/3.0/" /></para></footnote>.
9+
The text of and illustrations in this document are licensed under version
10+
4.0 or later of the Creative Commons Attribution-ShareAlike International
11+
Public License ("CC-BY-SA")<footnote><para>An explanation of CC-BY-SA is
12+
available at <ulink url="https://creativecommons.org/licenses/by-sa/4.0/" />
13+
</para></footnote>.
1014
</para>
1115
<para>
1216
In accordance with CC-BY-SA, if you distribute this document or an adaptation of it, you must provide the URL for the original version.

0 commit comments

Comments
 (0)