[debbugs-tracker] bug#31482: closed ([PATCH] website: contribute: Add paragraph on code of conduct.)

[GNU bug Tracking System]

Your message dated Thu, 17 May 2018 15:46:12 +0200
with message-id <address@hidden>
and subject line Re: [bug#31482] [PATCH] website: contribute: Add paragraph on 
code of conduct.
has caused the debbugs.gnu.org bug report #31482,
regarding [PATCH] website: contribute: Add paragraph on code of conduct.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
31482: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=31482
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] website: contribute: Add paragraph on code of conduct.
>
>
>
>
> Date: 
>
> Thu, 17 May 2018 01:41:21 +0200
>
>
>
>
>  * website/apps/base/templates/contribute.scm: Add paragraph on
>    code of conduct.
> ---
>  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..b9879cf 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
> +       "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 "
> +       (a (@ (href "https://contributor-covenant.org/";))
> +          "https://contributor-covenant.org/";)
> +       ". You can find the full pledge in "
> +       (a (@ (href ,(guix-url 
> "manual/html_node/Code-of-Conduct.html#Code-of-Conduct")))
> +          "the manual")
> +       ".")
> +
>        (div
>         (@ (class "centered-text"))
>  
> -- 
> 2.17.0
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#31482] [PATCH] website: contribute: Add paragraph on code of conduct.
>
>
>
>
> Date: 
>
> Thu, 17 May 2018 15:46:12 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux)
>
>
>
>
> Hi!
>
> Tonton <address@hidden> skribis:
>
> >  * website/apps/base/templates/contribute.scm: Add paragraph on
> >    code of conduct.
>
> I made the changes below so that the link matches what we currently have
> on line (the on-line copy of the manual is updated only upon new
> releases), and pushed it on-line.
>
> Thanks!  :-)
>
> Ludo’.
>
> diff --git a/website/apps/base/templates/contribute.scm 
> b/website/apps/base/templates/contribute.scm
> index b9879cf..2cf9e8b 100644
> --- a/website/apps/base/templates/contribute.scm
> +++ b/website/apps/base/templates/contribute.scm
> @@ -50,10 +50,9 @@
>         end our project uses a “Contributor Covenant”, which was adapted from "
>         (a (@ (href "https://contributor-covenant.org/";))
>            "https://contributor-covenant.org/";)
> -       ". You can find the full pledge in "
> -       (a (@ (href ,(guix-url 
> "manual/html_node/Code-of-Conduct.html#Code-of-Conduct")))
> -          "the manual")
> -       ".")
> +       ".  You can find the full pledge in the "
> +       (a (@ (href 
> "//git.savannah.gnu.org/cgit/guix.git/tree/CODE-OF-CONDUCT"))
> +          (tt "CODE-OF-CONDUCT")) " file.")
>  
>        (div
>         (@ (class "centered-text"))
>
> --- End Message ---