gcc-wwwdocs branch master updated. 073b97f6a2dee2ac535eb0bf76a641f53a930ebe

gcc-wwwdocs branch master updated. 073b97f6a2dee2ac535eb0bf76a641f53a930ebe

[Jason Merrill]

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 <jason@redhat.com>
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 <a href="mailto:conduct@gcc.gnu.org">conduct@gcc.gnu.org</a> with any
 additional questions or feedback.</p>
 
-</body>
+<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.
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.</p>
 of the committee's decision. To make such a request, contact a member of the
 Steering Committee with your request and motivation.</p>
 
+<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.
+
 <p>Text derived from
 the <a href="https://www.djangoproject.com/conduct/reporting/">Django project
 Code of Conduct Reporting Guidelines</a>, used under
 the <a href="https://creativecommons.org/licenses/by/3.0/">Creative Commons
 Attribution</a> license.</p>
-
-</body>
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.</p>
 
+<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.
+
 <p>Text derived from
 the <a href="https://www.djangoproject.com/conduct/enforcement-manual/">Django
 project Code of Conduct Enforcement Manual</a>, used under
 the <a href="https://creativecommons.org/licenses/by/3.0/">Creative Commons
 Attribution</a> license.</p>
-
-</body>
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 <a href="mailto:conduct@gcc.gnu.org">conduct@gcc.gnu.org</a>.</p>
 that doesn't answer your questions, feel free
 to <a href="mailto:conduct@gcc.gnu.org">contact us</a>.</p>
 
+<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.
+
 <p>Text derived from the <a href="https://www.djangoproject.com/conduct/">Django
 project Code of Conduct</a>, used under
 the <a href="https://creativecommons.org/licenses/by/3.0/">Creative Commons

commit cade1c3cb7995144329b74f17f726aecd345df21
Author: Jason Merrill <jason@redhat.com>
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.</p>
 <p>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.</p>
+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.</p>
 
 <ul>
   <li><strong>Be friendly and patient.</strong></li>

-----------------------------------------------------------------------

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