From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tonton Subject: Re: [PATCH] website: Add section section and links to code of conduct Date: Wed, 16 May 2018 02:29:54 +0200 Message-ID: <20180516022954.4809d80d@merlin.browniehive.net> References: <20180515233631.9165-1-tonton@riseup.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/ytdkXEJamPfxXYJ=92Opke6"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIkKa-0003c9-5b for guix-devel@gnu.org; Tue, 15 May 2018 20:30:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIkKX-0007vq-Dd for guix-devel@gnu.org; Tue, 15 May 2018 20:30:12 -0400 Received: from mx1.riseup.net ([198.252.153.129]:46142) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fIkKX-0007va-3u for guix-devel@gnu.org; Tue, 15 May 2018 20:30:09 -0400 Received: from cotinga.riseup.net (cotinga-pn.riseup.net [10.0.1.164]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id C467B1A0ABB for ; Tue, 15 May 2018 17:30:07 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by cotinga.riseup.net with ESMTPSA id 33137AAE55 for ; Tue, 15 May 2018 17:30:06 -0700 (PDT) In-Reply-To: <20180515233631.9165-1-tonton@riseup.net> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --Sig_/ytdkXEJamPfxXYJ=92Opke6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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 =E2=80=9CContributor Covenant=E2=80=9D, which was = adapted from > . You can find a local version in the > =E2=80=98CODE-OF-CONDUCT=E2=80=99 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 wrote: > --- > website/apps/base/templates/contribute.scm | 11 +++++++++++ > 1 file changed, 11 insertions(+) >=20 > 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. ") > =20 > + (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")) > =20 --=20 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/ --Sig_/ytdkXEJamPfxXYJ=92Opke6 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEJpQ8ER/dPhCuYhy5z+UMpbuBoZAFAlr7e4MACgkQz+UMpbuB oZCeBg//b6Q6FpulTNCHfyRT+mgaJpvohsi/I834+uY3Rj6WatxOVpDNq2Bd5cA0 50x8/wcozMDI0reH2VAHL+cYjMiLJr+ccbFPuJuaJzQAA+xDDSENYRQG121FMnGQ p2qf9ZfAVSmLx28YzvWdBYV1LU8n+RwTKcW9VGdkiYWBRAft/R2LtfsICmdmUUM9 9+9ECDxjBbpZ7gnPSvHebiTOa7SdpXrz4JokpP//IVtDuUJ8YEmLY4OgXFzhFfui PwhqihCRza40dVRjHnCLHeet3yKx0EMm95Xu07sr0rh8RsavPna8l2seucCmmGlz RT9sj6RLg8wI0fPLVZs6HVqeCNt73NzLksnrsxsPPJn1p7/hDZRikJY11wYBLHTc Mg/kpsVkR2ONH9Qag8EbP5RA5jBV/D91DUfDbafINgO2lqVOyZY9W23/mS2GM8Qx H2/8RE+FEgA6qZqWjdK/WpM0kMTqGfF9wSc8ND3pUX8L9H3cPBLqh2ZQfleNvfph 17J2qtd5rDGXo65EAZ4vSs0jkpUCNacgCvvk4c8wBiJjF/3e4YnFgN/xKTAP3hmt BJCQBM3/F+HMsEgXcBD5cBrCYzJloVJTgcd/F+CKo42BJ155AoEiofOlNgkcJ9cW AQmtdJrUzW2hacTVp1T8yt/amk60tx5sPhXbaKXTskonlgeZR8g= =mMPI -----END PGP SIGNATURE----- --Sig_/ytdkXEJamPfxXYJ=92Opke6--