[PATCH] website: Add section section and links to code of conduct

[PATCH] website: Add section section and links to code of conduct

[Tonton]

---
 website/apps/base/templates/contribute.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/website/apps/base/templates/contribute.scm b/website/apps/base/templates/contribute.scm
index 274938a..8b62994 100644
--- a/website/apps/base/templates/contribute.scm
+++ b/website/apps/base/templates/contribute.scm
@@ -44,6 +44,17 @@
        " in IRC Freenode. Tell us how would you like to help, and we
        will do our best to guide you. ")
 
+      (p
+       "The Guix community pledge to making participation a harrassment
+	free experience for everyone, regardless of age, body size, disability,
+	ethnicity, gender identity and expression, level of experience,
+	education, socio-economic status, nationality, personal appearance,
+	race, religion, or sexual identity and orientation. The full text of our
+	code of conduct is in "
+       (a (@ (href ,(guix-url "manual/html_node/Contributing.html")))
+          "the manual ")
+       "and the file 'CODE-OF-CONDUCT' in the source tree. ")
+
       (div
        (@ (class "centered-text"))
 
-- 
2.17.0

Re: [PATCH] website: Add section section and links to code of conduct

[Tonton]

[-- Attachment #1: Type: text/plain, Size: 2848 bytes --]

I realize as I'm updating the CoC in the source and adding it to the info
docs, that the original introduction from contributing was much nicer. It
has a positive focus. Should I change the paragraf under to use
something like the following from contributing:

> We want to provide a warm, friendly, and harassment-free environment,
> so that anyone can contribute to the best of their abilities.  To this
> end our project uses a “Contributor Covenant”, which was adapted from
> <http://contributor-covenant.org/>.  You can find a local version in the
> ‘CODE-OF-CONDUCT’ file in the source tree.

I also took the liberty of starting to add the updated CoC in full as a
section under contributing in the manual (learning texinfo, it's actually
quite nice I find). Gives me two questions:

First this something we would like - to have the
CoC as a section just like we have the section Building from Git
(https://www.gnu.org/software/guix/manual/html_node/Building-from-Git.html#Building-from-Git)?
I could also add it as a subsection of contributing, making it part of the
landing. But it seemed better to me to have it separately, maybe.

Secondly, how do I see the changes I make to the texi files after 'make
info'? This is probably covered in the manual, if so I'll find it when I
continue tomorrow.

On Wed, 16 May 2018 01:36:31 +0200
Tonton <tonton@riseup.net> wrote:

> ---
>  website/apps/base/templates/contribute.scm | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/website/apps/base/templates/contribute.scm
> b/website/apps/base/templates/contribute.scm index 274938a..8b62994 100644
> --- a/website/apps/base/templates/contribute.scm
> +++ b/website/apps/base/templates/contribute.scm
> @@ -44,6 +44,17 @@
>         " in IRC Freenode. Tell us how would you like to help, and we
>         will do our best to guide you. ")
>  
> +      (p
> +       "The Guix community pledge to making participation a harrassment
> +	free experience for everyone, regardless of age, body size,
> disability,
> +	ethnicity, gender identity and expression, level of experience,
> +	education, socio-economic status, nationality, personal appearance,
> +	race, religion, or sexual identity and orientation. The full text
> of our
> +	code of conduct is in "
> +       (a (@ (href ,(guix-url "manual/html_node/Contributing.html")))
> +          "the manual ")
> +       "and the file 'CODE-OF-CONDUCT' in the source tree. ")
> +
>        (div
>         (@ (class "centered-text"))
>  



-- 
I use gpg to sign my emails. All the symbols you may see at the bottom
of this mail is my cryptographic signature. It can be ignored, or used
to check that it really is me sending this email. Learn more by asking
me or see: https://u.fsf.org/zb or https://ssd.eff.org/

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Fwd: [PATCH] website: Add section section and links to code of conduct

[rain1]

For the section about IRC. Please add a bit that explains why you 
shouldn't say "hi guys" when you join IRC. Instead "Hi guix" or "Hi 
#guix" is recommended.


-------- Original Message --------
Subject: [PATCH] website: Add section section and links to code of 
conduct
Date: 2018-05-16 00:36
 From: Tonton <tonton@riseup.net>
To: guix-devel@gnu.org

---
  website/apps/base/templates/contribute.scm | 11 +++++++++++
  1 file changed, 11 insertions(+)

diff --git a/website/apps/base/templates/contribute.scm 
b/website/apps/base/templates/contribute.scm
index 274938a..8b62994 100644
--- a/website/apps/base/templates/contribute.scm
+++ b/website/apps/base/templates/contribute.scm
@@ -44,6 +44,17 @@
         " in IRC Freenode. Tell us how would you like to help, and we
         will do our best to guide you. ")

+      (p
+       "The Guix community pledge to making participation a harrassment
+	free experience for everyone, regardless of age, body size, 
disability,
+	ethnicity, gender identity and expression, level of experience,
+	education, socio-economic status, nationality, personal appearance,
+	race, religion, or sexual identity and orientation. The full text of 
our
+	code of conduct is in "
+       (a (@ (href ,(guix-url "manual/html_node/Contributing.html")))
+          "the manual ")
+       "and the file 'CODE-OF-CONDUCT' in the source tree. ")
+
        (div
         (@ (class "centered-text"))

Re: [PATCH] website: Add section section and links to code of conduct

[Nils Gillmann]

Tonton transcribed 3.8K bytes:
> I realize as I'm updating the CoC in the source and adding it to the info
> docs, that the original introduction from contributing was much nicer. It
> has a positive focus. Should I change the paragraf under to use
> something like the following from contributing:
> 
> > We want to provide a warm, friendly, and harassment-free environment,
> > so that anyone can contribute to the best of their abilities.  To this
> > end our project uses a “Contributor Covenant”, which was adapted from
> > <http://contributor-covenant.org/>.  You can find a local version in the
> > ‘CODE-OF-CONDUCT’ file in the source tree.
> 
> I also took the liberty of starting to add the updated CoC in full as a
> section under contributing in the manual (learning texinfo, it's actually
> quite nice I find). Gives me two questions:
> 
> First this something we would like - to have the
> CoC as a section just like we have the section Building from Git
> (https://www.gnu.org/software/guix/manual/html_node/Building-from-Git.html#Building-from-Git)?
> I could also add it as a subsection of contributing, making it part of the
> landing. But it seemed better to me to have it separately, maybe.
> 
> Secondly, how do I see the changes I make to the texi files after 'make
> info'? This is probably covered in the manual, if so I'll find it when I
> continue tomorrow.

For the website, I have a sxml version of this CoC version. You'd need
to check which words I added in (I added 3 or 4 extra words I think), but
if you want to link to it on the website or even include it, could that
be useful?

> On Wed, 16 May 2018 01:36:31 +0200
> Tonton <tonton@riseup.net> wrote:
> 
> > ---
> >  website/apps/base/templates/contribute.scm | 11 +++++++++++
> >  1 file changed, 11 insertions(+)
> > 
> > diff --git a/website/apps/base/templates/contribute.scm
> > b/website/apps/base/templates/contribute.scm index 274938a..8b62994 100644
> > --- a/website/apps/base/templates/contribute.scm
> > +++ b/website/apps/base/templates/contribute.scm
> > @@ -44,6 +44,17 @@
> >         " in IRC Freenode. Tell us how would you like to help, and we
> >         will do our best to guide you. ")
> >  
> > +      (p
> > +       "The Guix community pledge to making participation a harrassment
> > +	free experience for everyone, regardless of age, body size,
> > disability,
> > +	ethnicity, gender identity and expression, level of experience,
> > +	education, socio-economic status, nationality, personal appearance,
> > +	race, religion, or sexual identity and orientation. The full text
> > of our
> > +	code of conduct is in "
> > +       (a (@ (href ,(guix-url "manual/html_node/Contributing.html")))
> > +          "the manual ")
> > +       "and the file 'CODE-OF-CONDUCT' in the source tree. ")
> > +
> >        (div
> >         (@ (class "centered-text"))
> >  
> 
> 
> 
> -- 
> I use gpg to sign my emails. All the symbols you may see at the bottom
> of this mail is my cryptographic signature. It can be ignored, or used
> to check that it really is me sending this email. Learn more by asking
> me or see: https://u.fsf.org/zb or https://ssd.eff.org/

Re: [PATCH] website: Add section section and links to code of conduct

[Tonton]

[-- Attachment #1: Type: text/plain, Size: 2292 bytes --]

I realize as I finish writing, I've created a wall of text. Maybe more than
you bargained for.

  :)

On Wed, 16 May 2018 16:06:07 +0100
rain1@airmail.cc wrote:

> For the section about IRC. Please add a bit that explains why you 
> shouldn't say "hi guys" when you join IRC. Instead "Hi guix" or "Hi 
> #guix" is recommended.
> 

I'm not sure explaining some edge cases would be a-good-thing(tm). Instead I
think it is better that we keep an eye out and tell each other when we make
mistakes like this. This will also train our lenses to see these things
better because we're using them.

I see two distinct paths here (of many, greyscales are everywhere).
1. we specify every edgecase, and expect everyone to follow it. I.e. we
	should be perfect and know the rules.
2. we assume we are fallible and make mistakes, but try our best; so we
	gently tell when someone does something more or less bad.

I think the first leads to a harder regime on everyone, and in most cases
leads to a less humane culture. I think path 2 is the better choice.

The reason I (we) have the CoC and strive to be better in this manner, as I
see it; is because I (we) want to foster a kind culture where we can have
thorough calm discussions where everyone has a say - because no one are
radicalized, othered, ridiculed or worse.

It is important that we don't make microaggressions big. We all make
mistakes. And if someone tells me 'hey, that was a somewhat racist comment' I
should (even though it can be hard) take a look at myself and what I said;
learn - and move on.

The reason guys is not an appropriate term for the guix community is that it
is a word that connotes gender. Yes, I know it can be used about females; but
that use of the term is extremely varying from culture to culture. The origin
and most common use is for cis males. I'm quite sure we have incredibly
talented women, genderqueers and other non-binary gendered beings among us.
Therefore it is inapropriate to call us all male.

I saw a case a day or three ago where someone was called on using 'hi guys'
in the guix channel. I would like to give points to those involved, because
it was handled very well. It made me think as well, I hadn't thought of that
as a microaggression before.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] website: Add section section and links to code of conduct

[Tonton]

[-- Attachment #1: Type: text/plain, Size: 812 bytes --]

On Wed, 16 May 2018 15:14:45 +0000
Nils Gillmann <ng0@n0.is> wrote:
> 
> For the website, I have a sxml version of this CoC version. You'd need
> to check which words I added in (I added 3 or 4 extra words I think), but
> if you want to link to it on the website or even include it, could that
> be useful?
> 
That would be great, then it could be added as a page side by side with
contributing and so on. ?

Where can I access it, or would you share it with email or something? Or just
add it and send a patch.

 :)

-- 
I use gpg to sign my emails. All the symbols you may see at the bottom
of this mail is my cryptographic signature. It can be ignored, or used
to check that it really is me sending this email. Learn more by asking
me or see: https://u.fsf.org/zb or https://ssd.eff.org/

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] website: Add section section and links to code of conduct

[Ludovic Courtès]

Hello,

Tonton <tonton@riseup.net> skribis:

> First this something we would like - to have the
> CoC as a section just like we have the section Building from Git
> (https://www.gnu.org/software/guix/manual/html_node/Building-from-Git.html#Building-from-Git)?
> I could also add it as a subsection of contributing, making it part of the
> landing. But it seemed better to me to have it separately, maybe.

I’m unsure about adding a complete copy of the Code in the manual; I’d
prefer keep the URL and a reference to the ‘CODE-OF-CONDUCT’ file.

Thoughts?

Also, to be clear, I wanted to leave a few days before updating to
version 1.4 of the Contributor Covenant so that people have a chance to
speak (a few days have passed already so it looks like we’re on the
right track :-)), and to have Ricardo’s agreement as well as
co-maintainer.

Thanks,
Ludo’.

Re: [PATCH] website: Add section section and links to code of conduct

[Ludovic Courtès]

Hi,

Tonton <tonton@riseup.net> skribis:

> On Wed, 16 May 2018 16:06:07 +0100
> rain1@airmail.cc wrote:
>
>> For the section about IRC. Please add a bit that explains why you 
>> shouldn't say "hi guys" when you join IRC. Instead "Hi guix" or "Hi 
>> #guix" is recommended.
>> 
>
> I'm not sure explaining some edge cases would be a-good-thing(tm). Instead I
> think it is better that we keep an eye out and tell each other when we make
> mistakes like this. This will also train our lenses to see these things
> better because we're using them.

I agree.  I think it’s important to clearly explain the general spirit
(and have a code of conduct for that), and then handle “mistakes” like
these when they happen.  For this specific case, I think it’s OK to
simply explain people when that happens that we’d prefer a
gender-neutral phrase, in line with our goal of being inclusive (I do
that from time to time on IRC and people understand, sometimes they just
didn’t realize.)

Ludo’.

Re: [PATCH] website: Add section section and links to code of conduct

[Tonton]

[-- Attachment #1: Type: text/plain, Size: 1974 bytes --]

Hi, I might have been a tad too quick, yes. I felt like I had taken so long,
but looking at the mails, I see my perspective was a bit skewed.

On Thu, 17 May 2018 13:43:17 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> Hello,
> 
> Tonton <tonton@riseup.net> skribis:
> 
> > First this something we would like - to have the
> > CoC as a section just like we have the section Building from Git
> > (https://www.gnu.org/software/guix/manual/html_node/Building-from-Git.html#Building-from-Git)?
> > I could also add it as a subsection of contributing, making it part of the
> > landing. But it seemed better to me to have it separately, maybe.  
> 
> I’m unsure about adding a complete copy of the Code in the manual; I’d
> prefer keep the URL and a reference to the ‘CODE-OF-CONDUCT’ file.
> 
> Thoughts?

I had 2 reasons for putting it there, one is that it is then easily
accessible from the website. And second is that it would be easy to find for
users/contributers that don't have the source repo locally (I don't know if
the CODE-OF-CONDUCT file exists in guix/guixsd, or only in the sources).

The first could easily be addressed by a separate page on the website (e.g.
under about) or even simpler by a link to the CODE-OF-CONDUCT file in the
source tree.

The second I'm not sure how to fix. But we could probably assume most
contributors will have the source checked out and available.

At the same time, these two don't need to be fixed, these are just what I
thought would be a good presentation/balance.

> 
> Also, to be clear, I wanted to leave a few days before updating to
> version 1.4 of the Contributor Covenant so that people have a chance to
> speak (a few days have passed already so it looks like we’re on the
> right track :-)), and to have Ricardo’s agreement as well as
> co-maintainer.

Oh, yes, that is reasonable. I didn't mean to rush this.

> 
> Thanks,
> Ludo’.

Thanks!
Tonton

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] website: Add section section and links to code of conduct

[Ricardo Wurmus]

Ludovic Courtès <ludo@gnu.org> writes:

> Hello,
>
> Tonton <tonton@riseup.net> skribis:
>
>> First this something we would like - to have the
>> CoC as a section just like we have the section Building from Git
>> (https://www.gnu.org/software/guix/manual/html_node/Building-from-Git.html#Building-from-Git)?
>> I could also add it as a subsection of contributing, making it part of the
>> landing. But it seemed better to me to have it separately, maybe.
>
> I’m unsure about adding a complete copy of the Code in the manual; I’d
> prefer keep the URL and a reference to the ‘CODE-OF-CONDUCT’ file.
>
> Thoughts?
>
> Also, to be clear, I wanted to leave a few days before updating to
> version 1.4 of the Contributor Covenant so that people have a chance to
> speak (a few days have passed already so it looks like we’re on the
> right track :-)), and to have Ricardo’s agreement as well as
> co-maintainer.

I have been following this conversation, but since I’m travelling and
attending a conference I haven’t read the new version yet.

Generally, I’m not opposed to updating the Contributor Covenant, and I
agree it would be great to make more prominent mention of the CoC on the
website.  I’m not really happy with the wording in the original patch,
but that’s a minor issue.

--
Ricardo