Skip to content

Commit

Permalink
updated COPYING patch: all 5
Browse files Browse the repository at this point in the history
From d742f12d1358202e16da39cab3bf0773a31e444e Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Mon, 28 Nov 2011 19:05:22 +0100
Subject: [PATCH] doc: identify the license whose terms are in COPYING

There was no mention in COPYING that this is the text of the
Apache License, Version 2.0.
* COPYING: Identify the license in this file.
Use simple ASCII double quotes, not UTF-8 ones.
* audrey_puppet/COPYING: Likewise.
* audrey_start/COPYING: Likewise.
* configserver/COPYING: Likewise.
* tooling_examples/COPYING: Likewise.
---
 COPYING                  |   39 +++++++++++++++++++++------------------
 audrey_puppet/COPYING    |   39 +++++++++++++++++++++------------------
 audrey_start/COPYING     |   39 +++++++++++++++++++++------------------
 configserver/COPYING     |   39 +++++++++++++++++++++------------------
 tooling_examples/COPYING |   39 +++++++++++++++++++++------------------
 5 files changed, 105 insertions(+), 90 deletions(-)
  • Loading branch information
meyering authored and jvlcek committed Nov 28, 2011
1 parent eb22cc7 commit 13f072e
Show file tree
Hide file tree
Showing 5 changed files with 105 additions and 90 deletions.
39 changes: 21 additions & 18 deletions COPYING
@@ -1,59 +1,65 @@
Apache License

Version 2.0, January 2004

http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

License shall mean the terms and conditions for use, reproduction,
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

Licensor shall mean the copyright owner or entity authorized by the
"Licensor" shall mean the copyright owner or entity authorized by the
copyright owner that is granting the License.

Legal Entity shall mean the union of the acting entity and all other
"Legal Entity" shall mean the union of the acting entity and all other
entities that control, are controlled by, or are under common control with
that entity. For the purposes of this definition, control means (i) the
that entity. For the purposes of this definition, "control" means (i) the
power, direct or indirect, to cause the direction or management of such
entity, whether by contract or otherwise, or (ii) ownership of fifty percent
(50%) or more of the outstanding shares, or (iii) beneficial ownership
of such entity.

You (or Your) shall mean an individual or Legal Entity exercising permissions
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions
granted by this License.

Source form shall mean the preferred form for making modifications, including
"Source" form shall mean the preferred form for making modifications, including
but not limited to software source code, documentation source, and configuration
files.

Object form shall mean any form resulting from mechanical transformation
"Object" form shall mean any form resulting from mechanical transformation
or translation of a Source form, including but not limited to compiled
object code, generated documentation, and conversions to other media types.

Work shall mean the work of authorship, whether in Source or Object form,
"Work" shall mean the work of authorship, whether in Source or Object form,
made available under the License, as indicated by a copyright notice that
is included in or attached to the work (an example is provided in the Appendix
below).

Derivative Works shall mean any work, whether in Source or Object form,
"Derivative Works" shall mean any work, whether in Source or Object form,
that is based on (or derived from) the Work and for which the editorial
revisions, annotations, elaborations, or other modifications represent,
as a whole, an original work of authorship. For the purposes of this License,
Derivative Works shall not include works that remain separable from, or
merely link (or bind by name) to the interfaces of, the Work and Derivative
Works thereof.

Contribution shall mean any work of authorship, including the original
"Contribution" shall mean any work of authorship, including the original
version of the Work and any modifications or additions to that Work or
Derivative Works thereof, that is intentionally submitted to Licensor for
inclusion in the Work by the copyright owner or by an individual or Legal
Entity authorized to submit on behalf of the copyright owner. For the purposes
of this definition, submitted means any form of electronic, verbal, or
of this definition, "submitted" means any form of electronic, verbal, or
written communication sent to the Licensor or its representatives, including
but not limited to communication on electronic mailing lists, source code
control systems, and issue tracking systems that are managed by, or on
behalf of, the Licensor for the purpose of discussing and improving the
Work, but excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as Not a Contribution.
designated in writing by the copyright owner as "Not a Contribution."

Contributor shall mean Licensor and any individual or Legal Entity on
"Contributor" shall mean Licensor and any individual or Legal Entity on
behalf of whom a Contribution has been received by Licensor and subsequently
incorporated within the Work.

Expand Down Expand Up @@ -90,7 +96,7 @@ that You changed the files; and
You distribute, all copyright, patent, trademark, and attribution notices
from the Source form of the Work, excluding those notices that do not pertain
to any part of the Derivative Works; and
4. If the Work includes a NOTICE text file as part of its distribution,
4. If the Work includes a "NOTICE" text file as part of its distribution,
then any Derivative Works that You distribute must include a readable copy
of the attribution notices contained within such NOTICE file, excluding
those notices that do not pertain to any part of the Derivative Works,
Expand Down Expand Up @@ -123,7 +129,7 @@ the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable
law or agreed to in writing, Licensor provides the Work (and each Contributor
provides its Contributions) on an AS IS BASIS, WITHOUT WARRANTIES OR
provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied, including, without limitation,
any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY,
or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining
Expand All @@ -150,6 +156,3 @@ responsibility, not on behalf of any other Contributor, and only if You
agree to indemnify, defend, and hold each Contributor harmless for any
liability incurred by, or claims asserted against, such Contributor by
reason of your accepting any such warranty or additional liability.



39 changes: 21 additions & 18 deletions audrey_puppet/COPYING
@@ -1,59 +1,65 @@
Apache License

Version 2.0, January 2004

http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

License shall mean the terms and conditions for use, reproduction,
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

Licensor shall mean the copyright owner or entity authorized by the
"Licensor" shall mean the copyright owner or entity authorized by the
copyright owner that is granting the License.

Legal Entity shall mean the union of the acting entity and all other
"Legal Entity" shall mean the union of the acting entity and all other
entities that control, are controlled by, or are under common control with
that entity. For the purposes of this definition, control means (i) the
that entity. For the purposes of this definition, "control" means (i) the
power, direct or indirect, to cause the direction or management of such
entity, whether by contract or otherwise, or (ii) ownership of fifty percent
(50%) or more of the outstanding shares, or (iii) beneficial ownership
of such entity.

You (or Your) shall mean an individual or Legal Entity exercising permissions
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions
granted by this License.

Source form shall mean the preferred form for making modifications, including
"Source" form shall mean the preferred form for making modifications, including
but not limited to software source code, documentation source, and configuration
files.

Object form shall mean any form resulting from mechanical transformation
"Object" form shall mean any form resulting from mechanical transformation
or translation of a Source form, including but not limited to compiled
object code, generated documentation, and conversions to other media types.

Work shall mean the work of authorship, whether in Source or Object form,
"Work" shall mean the work of authorship, whether in Source or Object form,
made available under the License, as indicated by a copyright notice that
is included in or attached to the work (an example is provided in the Appendix
below).

Derivative Works shall mean any work, whether in Source or Object form,
"Derivative Works" shall mean any work, whether in Source or Object form,
that is based on (or derived from) the Work and for which the editorial
revisions, annotations, elaborations, or other modifications represent,
as a whole, an original work of authorship. For the purposes of this License,
Derivative Works shall not include works that remain separable from, or
merely link (or bind by name) to the interfaces of, the Work and Derivative
Works thereof.

Contribution shall mean any work of authorship, including the original
"Contribution" shall mean any work of authorship, including the original
version of the Work and any modifications or additions to that Work or
Derivative Works thereof, that is intentionally submitted to Licensor for
inclusion in the Work by the copyright owner or by an individual or Legal
Entity authorized to submit on behalf of the copyright owner. For the purposes
of this definition, submitted means any form of electronic, verbal, or
of this definition, "submitted" means any form of electronic, verbal, or
written communication sent to the Licensor or its representatives, including
but not limited to communication on electronic mailing lists, source code
control systems, and issue tracking systems that are managed by, or on
behalf of, the Licensor for the purpose of discussing and improving the
Work, but excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as Not a Contribution.
designated in writing by the copyright owner as "Not a Contribution."

Contributor shall mean Licensor and any individual or Legal Entity on
"Contributor" shall mean Licensor and any individual or Legal Entity on
behalf of whom a Contribution has been received by Licensor and subsequently
incorporated within the Work.

Expand Down Expand Up @@ -90,7 +96,7 @@ that You changed the files; and
You distribute, all copyright, patent, trademark, and attribution notices
from the Source form of the Work, excluding those notices that do not pertain
to any part of the Derivative Works; and
4. If the Work includes a NOTICE text file as part of its distribution,
4. If the Work includes a "NOTICE" text file as part of its distribution,
then any Derivative Works that You distribute must include a readable copy
of the attribution notices contained within such NOTICE file, excluding
those notices that do not pertain to any part of the Derivative Works,
Expand Down Expand Up @@ -123,7 +129,7 @@ the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable
law or agreed to in writing, Licensor provides the Work (and each Contributor
provides its Contributions) on an AS IS BASIS, WITHOUT WARRANTIES OR
provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied, including, without limitation,
any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY,
or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining
Expand All @@ -150,6 +156,3 @@ responsibility, not on behalf of any other Contributor, and only if You
agree to indemnify, defend, and hold each Contributor harmless for any
liability incurred by, or claims asserted against, such Contributor by
reason of your accepting any such warranty or additional liability.



39 changes: 21 additions & 18 deletions audrey_start/COPYING
@@ -1,59 +1,65 @@
Apache License

Version 2.0, January 2004

http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

License shall mean the terms and conditions for use, reproduction,
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

Licensor shall mean the copyright owner or entity authorized by the
"Licensor" shall mean the copyright owner or entity authorized by the
copyright owner that is granting the License.

Legal Entity shall mean the union of the acting entity and all other
"Legal Entity" shall mean the union of the acting entity and all other
entities that control, are controlled by, or are under common control with
that entity. For the purposes of this definition, control means (i) the
that entity. For the purposes of this definition, "control" means (i) the
power, direct or indirect, to cause the direction or management of such
entity, whether by contract or otherwise, or (ii) ownership of fifty percent
(50%) or more of the outstanding shares, or (iii) beneficial ownership
of such entity.

You (or Your) shall mean an individual or Legal Entity exercising permissions
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions
granted by this License.

Source form shall mean the preferred form for making modifications, including
"Source" form shall mean the preferred form for making modifications, including
but not limited to software source code, documentation source, and configuration
files.

Object form shall mean any form resulting from mechanical transformation
"Object" form shall mean any form resulting from mechanical transformation
or translation of a Source form, including but not limited to compiled
object code, generated documentation, and conversions to other media types.

Work shall mean the work of authorship, whether in Source or Object form,
"Work" shall mean the work of authorship, whether in Source or Object form,
made available under the License, as indicated by a copyright notice that
is included in or attached to the work (an example is provided in the Appendix
below).

Derivative Works shall mean any work, whether in Source or Object form,
"Derivative Works" shall mean any work, whether in Source or Object form,
that is based on (or derived from) the Work and for which the editorial
revisions, annotations, elaborations, or other modifications represent,
as a whole, an original work of authorship. For the purposes of this License,
Derivative Works shall not include works that remain separable from, or
merely link (or bind by name) to the interfaces of, the Work and Derivative
Works thereof.

Contribution shall mean any work of authorship, including the original
"Contribution" shall mean any work of authorship, including the original
version of the Work and any modifications or additions to that Work or
Derivative Works thereof, that is intentionally submitted to Licensor for
inclusion in the Work by the copyright owner or by an individual or Legal
Entity authorized to submit on behalf of the copyright owner. For the purposes
of this definition, submitted means any form of electronic, verbal, or
of this definition, "submitted" means any form of electronic, verbal, or
written communication sent to the Licensor or its representatives, including
but not limited to communication on electronic mailing lists, source code
control systems, and issue tracking systems that are managed by, or on
behalf of, the Licensor for the purpose of discussing and improving the
Work, but excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as Not a Contribution.
designated in writing by the copyright owner as "Not a Contribution."

Contributor shall mean Licensor and any individual or Legal Entity on
"Contributor" shall mean Licensor and any individual or Legal Entity on
behalf of whom a Contribution has been received by Licensor and subsequently
incorporated within the Work.

Expand Down Expand Up @@ -90,7 +96,7 @@ that You changed the files; and
You distribute, all copyright, patent, trademark, and attribution notices
from the Source form of the Work, excluding those notices that do not pertain
to any part of the Derivative Works; and
4. If the Work includes a NOTICE text file as part of its distribution,
4. If the Work includes a "NOTICE" text file as part of its distribution,
then any Derivative Works that You distribute must include a readable copy
of the attribution notices contained within such NOTICE file, excluding
those notices that do not pertain to any part of the Derivative Works,
Expand Down Expand Up @@ -123,7 +129,7 @@ the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable
law or agreed to in writing, Licensor provides the Work (and each Contributor
provides its Contributions) on an AS IS BASIS, WITHOUT WARRANTIES OR
provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied, including, without limitation,
any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY,
or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining
Expand All @@ -150,6 +156,3 @@ responsibility, not on behalf of any other Contributor, and only if You
agree to indemnify, defend, and hold each Contributor harmless for any
liability incurred by, or claims asserted against, such Contributor by
reason of your accepting any such warranty or additional liability.



0 comments on commit 13f072e

Please sign in to comment.