From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 02EE63858D3C; Tue, 12 Sep 2023 22:45:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 02EE63858D3C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1694558754; bh=Gh2olizxllYIMiRjvZszS/59Qv0ChHxBACdSV/Q2UeU=; h=To:Subject:Date:From:From; b=WNNP09lsyICuYTgCSWDCujqEe+QnrIzXjYgmqguTWHAVcxTM1l4C53WqLHSB3XyUV u4lg2adKmQKMy+GXHa0gFfy0YNk1bOgA9b9e+U3Jc5pZT/2ROYWHSK6r8exjAjMrt+ bFJkNGjs5h+1jMqGhWzCXFxigQKSq8QoyMR60WzA= To: gcc-cvs-wwwdocs@gcc.gnu.org Subject: gcc-wwwdocs branch master updated. 073b97f6a2dee2ac535eb0bf76a641f53a930ebe X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 24127b05c065c0fd24c996f5b27829bfa37de485 X-Git-Newrev: 073b97f6a2dee2ac535eb0bf76a641f53a930ebe Message-Id: <20230912224554.02EE63858D3C@sourceware.org> Date: Tue, 12 Sep 2023 22:45:53 +0000 (GMT) From: Jason Merrill List-Id: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "gcc-wwwdocs". The branch, master has been updated via 073b97f6a2dee2ac535eb0bf76a641f53a930ebe (commit) via cade1c3cb7995144329b74f17f726aecd345df21 (commit) from 24127b05c065c0fd24c996f5b27829bfa37de485 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 073b97f6a2dee2ac535eb0bf76a641f53a930ebe Author: Jason Merrill Date: Tue Aug 22 14:23:06 2023 -0400 conduct: use CC BY-SA licence diff --git a/htdocs/conduct-faq.html b/htdocs/conduct-faq.html index 867527e8..380e9166 100644 --- a/htdocs/conduct-faq.html +++ b/htdocs/conduct-faq.html @@ -63,4 +63,4 @@ your question either, email conduct@gcc.gnu.org with any additional questions or feedback.

- +Creative Commons License
This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. diff --git a/htdocs/conduct-report.html b/htdocs/conduct-report.html index 13be57ce..87758745 100644 --- a/htdocs/conduct-report.html +++ b/htdocs/conduct-report.html @@ -113,10 +113,10 @@ directly to another member, or to a member of the Steering Committee.

of the committee's decision. To make such a request, contact a member of the Steering Committee with your request and motivation.

+Creative Commons License
This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. +

Text derived from the Django project Code of Conduct Reporting Guidelines, used under the Creative Commons Attribution license.

- - diff --git a/htdocs/conduct-response.html b/htdocs/conduct-response.html index 6904634c..c67e8b0b 100644 --- a/htdocs/conduct-response.html +++ b/htdocs/conduct-response.html @@ -132,10 +132,10 @@ excluded from the response process. For these cases, anyone can make a report directly to any of the committee members, as documented in the reporting guidelines.

+Creative Commons License
This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. +

Text derived from the Django project Code of Conduct Enforcement Manual, used under the Creative Commons Attribution license.

- - diff --git a/htdocs/conduct.html b/htdocs/conduct.html index 78df0b5c..736e2f6d 100644 --- a/htdocs/conduct.html +++ b/htdocs/conduct.html @@ -114,6 +114,8 @@ email conduct@gcc.gnu.org.

that doesn't answer your questions, feel free to contact us.

+Creative Commons License
This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. +

Text derived from the Django project Code of Conduct, used under the Creative Commons commit cade1c3cb7995144329b74f17f726aecd345df21 Author: Jason Merrill Date: Tue Aug 22 14:23:13 2023 -0400 conduct: clarify context Someone pointed out that this passage seemed to contradict the FAQ entry that says that the code only applies to behavior within the context of GCC, so let's clarify the intent here. diff --git a/htdocs/conduct.html b/htdocs/conduct.html index da940a47..78df0b5c 100644 --- a/htdocs/conduct.html +++ b/htdocs/conduct.html @@ -31,8 +31,9 @@ participate.

This code of conduct applies to all spaces managed by the GCC project. This includes IRC, the mailing lists, the issue tracker, events, and any other forums created by the project team which the community uses for -communication. In addition, violations of this code outside these spaces may -affect a person's ability to participate within them.

+communication. In addition, violations of this code outside these spaces +(though still in the context of GCC) may affect a person's ability to +participate within them.

  • Be friendly and patient.
    • ----------------------------------------------------------------------- Summary of changes: htdocs/conduct-faq.html | 2 +- htdocs/conduct-report.html | 4 ++-- htdocs/conduct-response.html | 4 ++-- htdocs/conduct.html | 7 +++++-- 4 files changed, 10 insertions(+), 7 deletions(-) hooks/post-receive -- gcc-wwwdocs