all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Nils Gillmann <ng0@n0.is>
To: Tonton <tonton@riseup.net>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] website: Add section section and links to code of conduct
Date: Wed, 16 May 2018 15:14:45 +0000	[thread overview]
Message-ID: <20180516151445.3gznulwkbqvhlzqa@abyayala> (raw)
In-Reply-To: <20180516022954.4809d80d@merlin.browniehive.net>

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/

  reply	other threads:[~2018-05-16 15:14 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-15 23:36 [PATCH] website: Add section section and links to code of conduct Tonton
2018-05-16  0:29 ` Tonton
2018-05-16 15:14   ` Nils Gillmann [this message]
2018-05-16 16:17     ` Tonton
2018-05-17 11:43   ` Ludovic Courtès
2018-05-17 13:13     ` Tonton
2018-05-17 21:28     ` Ricardo Wurmus
2018-05-16 15:06 ` Fwd: " rain1
2018-05-16 16:05   ` Tonton
2018-05-17 11:48     ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180516151445.3gznulwkbqvhlzqa@abyayala \
    --to=ng0@n0.is \
    --cc=guix-devel@gnu.org \
    --cc=tonton@riseup.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.