[gentoo-project] [PATCH 0/4] Some updates to the Social Contract

[gentoo-project] [PATCH 0/4] Some updates to the Social Contract

[Ulrich Müller]

The first patch of the series changes the requirement for contributions
from OSI-approved to FSF-approved licenses. In practice this will make
very little difference, but it avoids the problem that we require
CC-BY-SA for documentation, which isn't an OSI approved license.
See the commit message for a more complete rationale.

The second patch shifts the responsibility for exceptions to the public
bug policy from Trustees to the Council.

The remaining two patches are editorial changes.

Ulrich Müller (4):
  Social contract: Change OSI approved to FSF approved
  Social contract: Exceptions to the public bug policy
  Social contract: Update spelling of CC-BY-SA license
  Social contract: Restore Gentoo metastructure link

 get-started/philosophy/social-contract.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

-- 
2.45.2

[gentoo-project] [PATCH 1/4] Social contract: Change OSI approved to FSF approved

[Ulrich Müller]

Rationale:
- The Creative Commons Attribution-ShareAlike License is approved by
  the FSF but not by the OSI.
- The OSI has approved some dubious licenses (e.g. Watcom-1.0) which
  we do not want.
- FSF approved is more in line with the term "free software" (instead
  of "open source") that is used throughout.
- GLEP 76 says "approved as GPL compatible by the Free Software
  Foundation" (which is a stronger requirement).

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 get-started/philosophy/social-contract.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/get-started/philosophy/social-contract.md b/get-started/philosophy/social-contract.md
index 6972245..36f2e35 100644
--- a/get-started/philosophy/social-contract.md
+++ b/get-started/philosophy/social-contract.md
@@ -32,11 +32,10 @@ under the GNU General Public License version 2 (or later, at our discretion) or
 Any external contributions to Gentoo (in the form of freely-distributable sources, binaries, metadata or documentation) may be incorporated into Gentoo
 provided that we are legally entitled to do so.
 However, Gentoo will never depend upon a piece of software or metadata unless it conforms to the GNU General Public License, the GNU Lesser General Public License,
-the Creative Commons - Attribution/Share Alike or some other license approved by the Open Source Initiative ([OSI](https://www.opensource.org/licenses)).
+the Creative Commons - Attribution/Share Alike or some other license approved by the Free Software Foundation ([FSF](https://www.fsf.org/licensing/)).
 
 <div class="alert alert-success">
-Note: We are considering extending the above clause to require that all core Gentoo components must conform
-to a license approved by the OSI and Free Software Foundation (<a href="https://www.gnu.org/">FSF</a>).
+Note: Details of our copyright policy are regulated by [GLEP 76](https://www.gentoo.org/glep/glep-0076.html).
 </div>
 
 ## We will give back to the free software community
-- 
2.45.2

[gentoo-project] [PATCH 2/4] Social contract: Exceptions to the public bug policy

[Ulrich Müller]

After Gentoo Linux has become an associated project of SPI, the
Council is the obvious entity to be responsible for the tasks
previously assigned to the Trustees.

See also commit b48c808 and bug 536668 for a previous update of the
same sentence.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 get-started/philosophy/social-contract.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/get-started/philosophy/social-contract.md b/get-started/philosophy/social-contract.md
index 36f2e35..f51989d 100644
--- a/get-started/philosophy/social-contract.md
+++ b/get-started/philosophy/social-contract.md
@@ -46,4 +46,4 @@ We will establish relationships with free software authors and collaborate with
 
 We will keep our [bug report database](https://bugs.gentoo.org/) open for public view at all times; reports that users file online will immediately become visible to others.
 
-Exceptions may be made at the discretion of the Trustees.
+Exceptions may be made at the discretion of the Council.
-- 
2.45.2

[gentoo-project] [PATCH 3/4] Social contract: Update spelling of CC-BY-SA license

[Ulrich Müller]

Its official name is "Creative Commons Attribution-ShareAlike License".
Change version to 2.0 because there never was a version 2.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 get-started/philosophy/social-contract.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/get-started/philosophy/social-contract.md b/get-started/philosophy/social-contract.md
index f51989d..d126690 100644
--- a/get-started/philosophy/social-contract.md
+++ b/get-started/philosophy/social-contract.md
@@ -28,11 +28,11 @@ A Gentoo project does not need to produce a Gentoo operating system in order to
 ## Gentoo is and will remain free software
 
 We will release our contributions to Gentoo as free software, metadata or documentation,
-under the GNU General Public License version 2 (or later, at our discretion) or the Creative Commons - Attribution / Share Alike version 2 (or later, at our discretion).
+under the GNU General Public License version 2 (or later, at our discretion) or the Creative Commons Attribution-ShareAlike License version 2.0 (or later, at our discretion).
 Any external contributions to Gentoo (in the form of freely-distributable sources, binaries, metadata or documentation) may be incorporated into Gentoo
 provided that we are legally entitled to do so.
 However, Gentoo will never depend upon a piece of software or metadata unless it conforms to the GNU General Public License, the GNU Lesser General Public License,
-the Creative Commons - Attribution/Share Alike or some other license approved by the Free Software Foundation ([FSF](https://www.fsf.org/licensing/)).
+the Creative Commons Attribution-ShareAlike License or some other license approved by the Free Software Foundation ([FSF](https://www.fsf.org/licensing/)).
 
 <div class="alert alert-success">
 Note: Details of our copyright policy are regulated by [GLEP 76](https://www.gentoo.org/glep/glep-0076.html).
-- 
2.45.2

[gentoo-project] [PATCH 4/4] Social contract: Restore Gentoo metastructure link

[Ulrich Müller]

This had existed in the GuideXML version before:
https://gitweb.gentoo.org/archive/proj/gentoo.git/tree/xml/htdocs/main/en/contract.xml#n66
Presumably, the link was dropped when migrating to Tyrian layout.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 get-started/philosophy/social-contract.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/get-started/philosophy/social-contract.md b/get-started/philosophy/social-contract.md
index d126690..e8c47f1 100644
--- a/get-started/philosophy/social-contract.md
+++ b/get-started/philosophy/social-contract.md
@@ -22,7 +22,7 @@ A Gentoo operating system should satisfy the self-hosting requirement.
 In other words, the operating system should be able to build itself from scratch using the aforementioned tools and metadata.
 If a product associated with an official Gentoo project does not satisfy these requirements, the product does not qualify as a Gentoo operating system.
 
-An official list of Gentoo projects is listed under the Gentoo Metastructure.
+An official list of Gentoo projects is listed under the [Gentoo metastructure](https://wiki.gentoo.org/wiki/Project:Gentoo).
 A Gentoo project does not need to produce a Gentoo operating system in order to be officially recognized.
 
 ## Gentoo is and will remain free software
-- 
2.45.2