1 files changed, 102 insertions, 21 deletions

diff --git a/pages/gnu/gsc-feedback.txt b/pages/gnu/gsc-feedback.txt
index 80deb0c..aee31d9 100644
--- a/pages/gnu/gsc-feedback.txt
+++ b/pages/gnu/gsc-feedback.txt
@@ -6,7 +6,7 @@ Social contract. Each piece of feedback will be reviewed and
 evaluated for inclusion. The feedback is included here anonymized
 without any personally identifying information.
 
-# Name of the document
+# (a) Name of the document
 
 > Please don't call the document a Social Contract.  The first sentence says:
 > "These are the core commitments of the GNU Project...".  In other words:
@@ -14,19 +14,47 @@ without any personally identifying information.
 >
 >   The GNU Promises
 
-# Pledge to whom?
+## Resolution
+
+We sympathise and this was a point of discussion among the GSC drafting
+working group, but it is the option that got the most support.  We hope
+that those GNU participants that prefer another name can look beyond the
+title to the content. The term Social Contract is also commonly used by
+other Free Software projects to describe their core values and mission.
+
+# (b) Pledge to whom?
+
+Original: "These are the core commitments of the GNU Project to the
+broader free software community. "
 
 > The first sentence continues with: "to the broader free software community".
 > Well, why only to the free-software people?  I would say: "to the world".
 
-# GNU software
+## Resolution
+
+Good point.  We have updated the wording to 'These are the core
+commitments of the GNU Project, which creates and distributes a software
+system that respects users' freedoms.'
+
+# (c) GNU software
 
 > The second sentence says: "The GNU Project provides a software system..."
 > The word "system" is both too vague and too all-encompassing; it sounds as
 > if it wants to be a single, massive block of software.  I would say that
 > the GNU project "provides software packages...".
 
-# GNU and the broader free software community
+## Resolution
+
+Thank you for the feedback.  The new wording is "The GNU Project creates
+and distributes a software system that respect users' freedoms", which
+keeps "system" in place as an aspirational statement
+
+# (d) GNU and the broader free software community
+
+Original text: "Free software extends beyond the GNU Project, which
+works with companion free software projects that develop key components
+of the GNU System.  The GNU Project aims to extend the reach of free
+software to new fields."
 
 > The third section begins: "Free software extends beyond the GNU Project..."
 > Huh?  Vague.  Does this want to say that there is also free software that
@@ -43,7 +71,15 @@ without any personally identifying information.
 > new fields."  Huh?  What new "fields"?  Again: what is the promise here?
 > Is it that we intend to assimilate everything?
 
-# On GNU welcoming contributions from everyone
+## Resolution
+
+These are good points.  After much discussion, the revised text is
+now:"The GNU Project works together with other free software projects to
+advance its goals, and aims to extend the reach of the project beyond
+the GNU System."  Again, as this document states goals, we keep an
+aspirational component.
+
+# (e) On GNU welcoming contributions from everyone
 
 > The fourth section says: "The GNU Project wants to give everyone the
 > opportunity of contributing to its efforts..."  To me this sounds as if
@@ -72,10 +108,21 @@ Related comment:
 > harassment-free experience for all contributors. It wants to
 > give..."
 
-# External threats
+## Resolution
+
+We agree that the "welcoming" point should lead with the main message.
+The intention is certainly not that all contributions must be accepted,
+but rather that GNU should take steps to make sure that no one should
+feel unwelcome in GNU based on personal characteristics such as gender.
+The new text is: 'The GNU Project commits to providing a harassment-free
+experience for all contributors.  It wants to give everyone the
+opportunity of contributing to its efforts on any of the many tasks that
+require work.  It welcomes all contributors, regardless of their gender,
+ethnicity, sexual orientation, level of experience, or any other
+personal characteristics.'
+
+# (f) External threats
 
-> A native speaker sent this to me:
-> 
 > > > the GNU Project pays attention and responds to
 > > 
 > > IMHO missing "to"
@@ -85,14 +132,18 @@ Related comment:
 > > optionally "pays attention to, and responds to, ..."
 > > 
 > > or "monitors and responds to"
-> 
-> I agree with the proposal and would go for:
-> 
->   the GNU Project pays attention to, and responds to threats
-> 
-> Should we discuss this on gnu-misc-discuss or just apply the change?
 
-# GSC signature required for contribution?
+Original text: "Besides upholding the Four Essential Freedoms, the GNU
+Project pays attention and responds to new threats to users' freedom as
+they arise."
+
+## Resolution
+
+The new text is "Besides upholding the Four Essential Freedoms, the GNU
+Project pays attention to new threats to users' freedom, and responds to
+them as they arise."
+
+# (g) GSC signature required for contribution?
 
 > > Just to clarify here, do you mean to say that you do not
 > > want to make endorsement of the GNU Social Contract a
@@ -112,23 +163,53 @@ Related comment:
 >   for contribution are left entirely up to the individual.
 > 
 
-# Implications regarding non-GNU activity
+## Resolution
+
+We do not intend to make endorsing the document a condition for
+contribution to any package.  The GSC simply defines the core values of
+the GNU Project.  For brevity, we are choosing not to add a
+clarification to the document.
+
+# (h) Implications regarding non-GNU activity
 
 > Does adhering to this "social contract" mean that as a GNU developer
 > I should not work at <state sponsored spying agency>, <proprietary
 > company> or <privacy violating entity>.
 
-# A wording suggestion
+## Resolution
 
-> "pays attention and responds to" should be "pays attention to and
-> responds to" or "pays attention to, and responds to," or "monitors
-> and responds to".
+While we certainly do not think that you should violate anyone's
+privacy, the document simply describes what we do in GNU and when
+representing GNU and does not have any broader scope.
 
-# A general meta-question regarding why the document is needed
+# (i) A general meta-question regarding why the document is needed
 
 > The tone and content of the draft contract are not changed from
 > existing practice. But give a better explanation of why a
 > restatement of the GNU project's goals and standards is needed, and
 > where it differs from the goals/standards in previous years.
 
+## Resolution
+
+The goals and principles of the GNU Project should stand on their own
+and provide volunteers with a key document they can use to decide what
+actions they should be taking when faced with difficult decisions. The
+document helps create a common understanding among all volunteers and
+helps guide them through their interactions within the project and
+without.  Existing documents are spread around and mix policies,
+rationales, and technical details. The goal of the GSC is to provide a
+short document that summarizes our core commitments, with the goal of
+building a shared understanding of our mission as part of the GNU
+Project.
+
+# (j) Welcoming all contributions even from those who don't endorse
+
+- Endorsement of the GNU Social Contract should not be a requirement
+  for contributing to GNU. Explicitly adding this under "welcomes
+  contributions from all and everyone" would be helpful.
+
+## Resolution
+
+Accepted in point (g).
+
 </markdown>