* [gentoo-commits] proj/devmanual:master commit in: general-concepts/copyright-policy/
@ 2021-09-27 16:53 Ulrich Müller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2021-09-27 16:53 UTC (permalink / raw
To: gentoo-commits
commit: 95a410bde2def81a15840bb7aa016bc25a0f793c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 27 16:52:07 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 27 16:52:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=95a410bd
general-concepts/copyright-policy: Small touchups
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
general-concepts/copyright-policy/text.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/general-concepts/copyright-policy/text.xml b/general-concepts/copyright-policy/text.xml
index c8a488b..a4ad96e 100644
--- a/general-concepts/copyright-policy/text.xml
+++ b/general-concepts/copyright-policy/text.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<guide self="general-concepts/copyright-policy/">
<chapter>
-<title>Gentoo's copyright policy</title>
+<title>Copyright Policy</title>
<body>
<p>
@@ -25,8 +25,8 @@ Foundation per-case basis.
<body>
<p>
-Per Gentoo's <uri link="https://www.gentoo.org/glep/glep-0076.html">GLEP 76
-(Copyright Policy GLEP)</uri>, you must sign-off all your commits to any
+Per <uri link="https://www.gentoo.org/glep/glep-0076.html">GLEP 76
+(Copyright Policy)</uri>, you must sign-off all your commits to any
Gentoo-hosted repository with accordance to the
<uri link="https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin">
copyright policy</uri>.
@@ -53,7 +53,7 @@ author is, or is not required. The list below serves as a general guideline.
software license. The committer adds another S-o-b line and certifies the
commit under point 4 of the
<uri link="https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin">
- GCO</uri>.
+ Certificate of Origin</uri>.
<note>
Use common sense here, especially if you don't know the contributor. If the
contribution was taken from somewhere else and the contributor doesn't have
@@ -70,7 +70,7 @@ author is, or is not required. The list below serves as a general guideline.
</dt>
<dd>
Can be accepted. The committer adds a S-o-b line and certifies the commit
- under GCO point 2.
+ under point 2 of the Certificate of Origin.
</dd>
<dt>
A contribution without a S-o-b line but not
@@ -79,7 +79,7 @@ author is, or is not required. The list below serves as a general guideline.
</dt>
<dd>
Can be accepted. The committer adds a S-o-b line and certifies the commit
- under GCO point 2.
+ under point 2 of the Certificate of Origin.
</dd>
<dt>
A contribution without a S-o-b line and of significant size, without any
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: general-concepts/copyright-policy/
@ 2022-06-25 6:18 Ulrich Müller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2022-06-25 6:18 UTC (permalink / raw
To: gentoo-commits
commit: fda14234ce15ae7aaf07efd55a3ad3c44dcda9a7
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 16:55:14 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 06:16:09 2022 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=fda14234
general-concepts/copyright-policy: Drop a link
There is a link to GLEP 76 immediately above and another in the same
sentence.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
general-concepts/copyright-policy/text.xml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/general-concepts/copyright-policy/text.xml b/general-concepts/copyright-policy/text.xml
index a4ad96e..60a022d 100644
--- a/general-concepts/copyright-policy/text.xml
+++ b/general-concepts/copyright-policy/text.xml
@@ -5,7 +5,7 @@
<body>
<p>
-<uri link="https://www.gentoo.org/glep/glep-0076.html">GLEP-76</uri> defines
+<uri link="https://www.gentoo.org/glep/glep-0076.html">GLEP 76</uri> defines
copyright and license policies for Gentoo Linux.
</p>
@@ -25,9 +25,8 @@ Foundation per-case basis.
<body>
<p>
-Per <uri link="https://www.gentoo.org/glep/glep-0076.html">GLEP 76
-(Copyright Policy)</uri>, you must sign-off all your commits to any
-Gentoo-hosted repository with accordance to the
+Per GLEP 76, you must sign-off all your commits to any Gentoo-hosted repository
+with accordance to the
<uri link="https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin">
copyright policy</uri>.
</p>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: general-concepts/copyright-policy/
@ 2022-06-25 6:18 Ulrich Müller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2022-06-25 6:18 UTC (permalink / raw
To: gentoo-commits
commit: 5edf168127267c3cf2a6bfc4eb42634986feb6c2
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 16:56:46 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 06:16:13 2022 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=5edf1681
general-concepts/copyright-policy: List licenses explicitly
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
general-concepts/copyright-policy/text.xml | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/general-concepts/copyright-policy/text.xml b/general-concepts/copyright-policy/text.xml
index 60a022d..c9cc3fb 100644
--- a/general-concepts/copyright-policy/text.xml
+++ b/general-concepts/copyright-policy/text.xml
@@ -12,10 +12,30 @@ copyright and license policies for Gentoo Linux.
<p>
Every Gentoo project must abide by the
<uri link="https://www.gentoo.org/get-started/philosophy/social-contract.html">
-Gentoo Social Contract</uri> and release its work under one or more of
-<uri link="https://www.gentoo.org/glep/glep-0076.html#licensing-of-gentoo-projects">
-predetermined licenses</uri>. Exceptions may be granted by the Gentoo
-Foundation per-case basis.
+Gentoo Social Contract</uri> and release its work under one or more of the
+following licenses:
+</p>
+
+<ul>
+ <li>
+ The <uri link="https://www.gnu.org/licenses/gpl-2.0.html">
+ GNU General Public License, version 2 or later</uri> (GPL-2+)
+ </li>
+ <li>
+ The <uri link="https://creativecommons.org/licenses/by-sa/4.0/">
+ Creative Commons Attribution-ShareAlike 4.0 International License</uri>
+ (CC-BY-SA-4.0), only for documentation
+ </li>
+ <li>
+ Any
+ <uri link="https://www.gnu.org/licenses/license-list.en.html#GPLCompatibleLicenses">
+ GPL-compatible free software license</uri>
+ </li>
+</ul>
+
+<p>
+Exceptions for other (GPL-incompatible) free software licenses may be granted
+by the Gentoo Foundation on a case-by-case basis.
</p>
</body>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: general-concepts/copyright-policy/
@ 2024-07-25 8:51 Ulrich Müller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2024-07-25 8:51 UTC (permalink / raw
To: gentoo-commits
commit: fdc98e37df5ab45c00e1ba6347bd619ac623ac9d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 08:44:31 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 08:44:31 2024 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=fdc98e37
general-concepts/copyright-policy: Exceptions are granted by the Council
See GLEP 76 update:
https://gitweb.gentoo.org/data/glep.git/commit/?id=7f0ce454b2359ed742b84d1d60176fadad15c066
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
general-concepts/copyright-policy/text.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/general-concepts/copyright-policy/text.xml b/general-concepts/copyright-policy/text.xml
index 5fb9d19..2b97939 100644
--- a/general-concepts/copyright-policy/text.xml
+++ b/general-concepts/copyright-policy/text.xml
@@ -35,7 +35,7 @@ following licenses:
<p>
Exceptions for other (GPL-incompatible) free software licenses may be granted
-by the Gentoo Foundation on a case-by-case basis.
+by the Gentoo Council on a case-by-case basis.
</p>
</body>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-25 8:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-25 6:18 [gentoo-commits] proj/devmanual:master commit in: general-concepts/copyright-policy/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2024-07-25 8:51 Ulrich Müller
2022-06-25 6:18 Ulrich Müller
2021-09-27 16:53 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox