aboutsummaryrefslogtreecommitdiff
path: root/content/conduct-2018.article
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2020-03-09 23:23:49 -0400
committerRuss Cox <rsc@golang.org>2020-03-11 14:10:22 +0000
commit7fd29cb024126de10a90c54427e050e7928c54b4 (patch)
tree42498c25ba0669a5914b2d883419e5d15b7a7a8c /content/conduct-2018.article
parent9dd3d9b97af3dba2bd18f1a5e18bd8e8edf78962 (diff)
content: make spacing consistent + remove comments
Remove repeated blank lines, trailing spaces, trailing blank lines Remove comments from survey2018.article (only article using them). Remove blank lines between successive ".commands". For golang/go#33955. Change-Id: I90cae37a859a8e39549520569d5f10bc455415d3 Reviewed-on: https://go-review.googlesource.com/c/blog/+/222841 Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'content/conduct-2018.article')
-rw-r--r--content/conduct-2018.article54
1 files changed, 27 insertions, 27 deletions
diff --git a/content/conduct-2018.article b/content/conduct-2018.article
index 64edcf2..7fbda8c 100644
--- a/content/conduct-2018.article
+++ b/content/conduct-2018.article
@@ -12,27 +12,27 @@ the Go team members at Google and the Go community.
I was fortunate to be one of the community members
invited to participate in both drafting and then enforcing
the Go Code of Conduct.
-Since then, we have learned two lessons about
-limitations in our code of conduct that restricted us from
+Since then, we have learned two lessons about
+limitations in our code of conduct that restricted us from
being able to cultivate the safe culture
-essential to Go’s success.
+essential to Go’s success.
The first lesson we learned is that toxic behaviors by
-project participants in non-project spaces can have a
+project participants in non-project spaces can have a
negative impact on the project affecting the security and safety of
community members. There were a few reported
incidents where actions took place outside of project spaces
-but the impact was felt inside our community. The specific
-language in our code of conduct restricted our ability to
-respond only to actions happening “in the official
-forums operated by the Go project”. We needed a way
-to protect our community members wherever they are.
+but the impact was felt inside our community. The specific
+language in our code of conduct restricted our ability to
+respond only to actions happening “in the official
+forums operated by the Go project”. We needed a way
+to protect our community members wherever they are.
-The second lesson we learned is that the demands required
+The second lesson we learned is that the demands required
to enforce the code
-of conduct place too heavy of a burden on volunteers.
-The initial version of the code of conduct presented the
-working group as disciplinarians. It was soon clear
+of conduct place too heavy of a burden on volunteers.
+The initial version of the code of conduct presented the
+working group as disciplinarians. It was soon clear
that this was too much, so in early 2017 [[https://golang.org/cl/37014][we changed the group’s role]]
to that of advisors and mediators.
Still, working group community members
@@ -40,14 +40,14 @@ reported feeling overwhelmed, untrained, and vulnerable.
This well-intentioned shift left us without an enforcement mechanism
without solving the issue with overburdened volunteers.
-In mid-2017, I represented the Go project in a meeting with
-Google’s Open Source Programs Office and Open Source Strategy Team
+In mid-2017, I represented the Go project in a meeting with
+Google’s Open Source Programs Office and Open Source Strategy Team
to address the shortcomings in our respective
codes of conduct, particularly in their enforcement.
It quickly became clear that our problems had a lot in common,
and that working together on a single code of conduct for all
-of Google’s open source projects made sense.
-We started with the text from the
+of Google’s open source projects made sense.
+We started with the text from the
Contributor Covenant Code of Conduct v1.4
and then made changes, influenced by
our experiences in Go community and our collective experiences in open source.
@@ -55,26 +55,26 @@ This resulted in the Google [[https://opensource.google.com/docs/releasing/templ
Today the Go project is adopting this new code of conduct,
and we’ve updated [[https://golang.org/conduct][golang.org/conduct]].
-This revised code of conduct retains much of the intent, structure and
-language of the original Go code of conduct while making two critical
-changes that address the shortcomings identified above.
+This revised code of conduct retains much of the intent, structure and
+language of the original Go code of conduct while making two critical
+changes that address the shortcomings identified above.
First, [[https://golang.org/conduct/#scope][the new code of conduct makes clear]] that people who
participate in any kind of harassment or inappropriate behavior,
-even outside our project spaces, are not welcome in our project spaces.
-This means that the Code of Conduct applies outside
-the project spaces when there is a reasonable belief that
+even outside our project spaces, are not welcome in our project spaces.
+This means that the Code of Conduct applies outside
+the project spaces when there is a reasonable belief that
an individual’s behavior may have a negative
impact on the project or its community.
Second, in the place of the working group,
-[[https://golang.org/conduct/#reporting][the new code of conduct introduces a single Project Steward]]
+[[https://golang.org/conduct/#reporting][the new code of conduct introduces a single Project Steward]]
who will have explicit training and support for this role.
The Project Steward will receive reported violations
and then work with a committee,
consisting of representatives from the Open Source Programs Office
and the Google Open Source Strategy team,
-to find a resolution.
+to find a resolution.
Our first Project Steward will be [[https://twitter.com/cassandraoid][Cassandra Salisbury]].
She is well known to the Go community as a member of Go Bridge,
@@ -83,8 +83,8 @@ and as a lead of the Go community outreach working group.
Cassandra now works on the Go team at Google
with a focus on advocating for and supporting the Go community.
-We are grateful to everyone who served on the original Code of
-Conduct Working Group. Your efforts were essential in creating an
+We are grateful to everyone who served on the original Code of
+Conduct Working Group. Your efforts were essential in creating an
inclusive and safe community.
We believe the code of conduct has contributed to the