From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel <linux-kernel@vger.kernel.org>
Cc: ksummit-discuss@lists.linuxfoundation.org,
Thomas Gleixner <tglx@linutronix.de>,
Olof Johansson <olof@lixom.net>, Chris Mason <clm@fb.com>,
Mishi Choudhary <mishi@linux.com>
Subject: [PATCH 4/7] Code of Conduct: Provide links between the two documents
Date: Sat, 20 Oct 2018 15:50:43 +0200 [thread overview]
Message-ID: <20181020135043.GE32218@kroah.com> (raw)
In-Reply-To: <20181020134908.GA32218@kroah.com>
Create a link between the Code of Conduct and the Code of Conduct
Interpretation so that people can see that they are related.
Acked-by: Chris Mason <clm@fb.com>
Acked-by: Olof Johansson <olof@lixom.net>
Acked-by: Theodore Ts'o <tytso@mit.edu>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
Documentation/process/code-of-conduct-interpretation.rst | 4 +++-
Documentation/process/code-of-conduct.rst | 8 ++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/Documentation/process/code-of-conduct-interpretation.rst b/Documentation/process/code-of-conduct-interpretation.rst
index ecf84cd29735..4d4e2cc94b5e 100644
--- a/Documentation/process/code-of-conduct-interpretation.rst
+++ b/Documentation/process/code-of-conduct-interpretation.rst
@@ -1,7 +1,9 @@
+.. _code_of_conduct_interpretation:
+
Linux Kernel Contributor Covenant Code of Conduct Interpretation
================================================================
-The Contributor Covenant Code of Conduct is a general document meant to
+The :ref:`code_of_conduct` is a general document meant to
provide a set of rules for almost any open source community. Every
open-source community is unique and the Linux kernel is no exception.
Because of this, this document describes how we in the Linux kernel
diff --git a/Documentation/process/code-of-conduct.rst b/Documentation/process/code-of-conduct.rst
index a2641c19cf26..3046664c929e 100644
--- a/Documentation/process/code-of-conduct.rst
+++ b/Documentation/process/code-of-conduct.rst
@@ -1,3 +1,5 @@
+.. _code_of_conduct:
+
Contributor Covenant Code of Conduct
++++++++++++++++++++++++++++++++++++
@@ -75,3 +77,9 @@ Attribution
This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+Interpretation
+==============
+
+See the :ref:`code_of_conduct_interpretation` document for how the Linux
+kernel community will be interpreting this document.
--
2.19.1
next prev parent reply other threads:[~2018-10-20 13:52 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-20 13:49 [PATCH 0/7] Code of Conduct: Fix some wording, and add an interpretation document Greg Kroah-Hartman
2018-10-20 13:49 ` [PATCH 1/7] Code of conduct: Fix wording around maintainers enforcing the code of conduct Greg Kroah-Hartman
2018-10-20 13:50 ` [PATCH 2/7] Code of Conduct Interpretation: Add document explaining how the Code of Conduct is to be interpreted Greg Kroah-Hartman
2018-10-20 13:50 ` [PATCH 3/7] Code of Conduct Interpretation: Properly reference the TAB correctly Greg Kroah-Hartman
2018-10-20 13:50 ` Greg Kroah-Hartman [this message]
2018-10-20 13:50 ` [PATCH 5/7] Code of Conduct Interpretation: Put in the proper URL for the committee Greg Kroah-Hartman
2018-10-20 19:01 ` Geert Uytterhoeven
2018-10-21 7:18 ` [Ksummit-discuss] " Greg KH
2018-10-20 13:51 ` [PATCH 6/7] Code of Conduct: Change the contact email address Greg Kroah-Hartman
2018-10-20 18:28 ` Alan Cox
2018-10-20 18:45 ` [Ksummit-discuss] " Trond Myklebust
2018-10-20 19:14 ` jonsmirl
2018-10-21 8:27 ` Theodore Y. Ts'o
2018-10-21 9:23 ` Greg KH
2018-10-20 19:24 ` Tim.Bird
2018-10-20 20:07 ` Trond Myklebust
2018-10-21 0:13 ` Alan Cox
2018-10-21 6:19 ` Thomas Gleixner
2018-10-20 20:13 ` James Bottomley
2018-10-20 13:51 ` [PATCH 7/7] MAINTAINERS: Add an entry for the code of conduct Greg Kroah-Hartman
2018-10-21 21:20 ` Call to Action Re: [PATCH 0/7] Code of Conduct: Fix some wording, and add an interpretation document NeilBrown
2018-10-21 22:26 ` [Ksummit-discuss] " Josh Triplett
2018-10-21 23:37 ` Theodore Y. Ts'o
2018-10-23 1:44 ` NeilBrown
2018-10-22 20:26 ` NeilBrown
2018-10-22 22:46 ` Theodore Y. Ts'o
2018-10-23 1:31 ` NeilBrown
2018-10-23 6:26 ` Dan Carpenter
2018-10-23 6:40 ` Al Viro
2018-10-23 6:46 ` Dan Carpenter
2018-10-23 3:31 ` Al Viro
2018-10-23 4:25 ` NeilBrown
2018-10-23 4:52 ` Al Viro
2018-10-23 5:28 ` NeilBrown
2018-10-23 6:00 ` Al Viro
2018-10-23 20:45 ` NeilBrown
2018-10-23 8:11 ` Theodore Y. Ts'o
2018-10-23 14:22 ` Rainer Fiebig
2018-10-23 15:43 ` Theodore Y. Ts'o
2018-10-23 17:51 ` Rainer Fiebig
2018-10-23 21:14 ` NeilBrown
2018-10-24 12:16 ` Josh Triplett
2018-10-25 21:14 ` NeilBrown
2018-10-27 1:10 ` Josh Triplett
2018-10-28 21:48 ` NeilBrown
2018-11-01 16:45 ` Paul E. McKenney
2018-11-01 21:11 ` Josh Triplett
2018-11-02 13:13 ` Paul E. McKenney
2018-11-01 21:50 ` NeilBrown
2018-11-02 13:33 ` Paul E. McKenney
2018-11-03 8:36 ` NeilBrown
2018-11-03 17:37 ` Paul E. McKenney
2018-11-03 21:06 ` NeilBrown
2018-11-03 22:23 ` Paul E. McKenney
2018-11-02 13:52 ` James Bottomley
2018-11-03 9:19 ` Eric S. Raymond
2018-11-04 10:35 ` Geert Uytterhoeven
2018-10-21 22:33 ` Joe Perches
2018-10-21 22:37 ` Randy Dunlap
2018-10-22 9:09 ` Rainer Fiebig
2018-10-22 11:02 ` [Ksummit-discuss] " James Bottomley
2018-10-24 8:49 ` Laura Abbott
2018-10-25 7:56 ` The linux devs can rescind their license grant visionsofalice
2018-10-25 8:19 ` Greg Kroah-Hartman
2018-10-25 19:39 ` Eric S. Raymond
2018-10-25 20:47 ` Theodore Y. Ts'o
2018-10-25 21:41 ` Eric S. Raymond
2018-10-25 22:12 ` NeilBrown
2018-10-25 22:38 ` Eric S. Raymond
2018-10-25 22:52 ` NeilBrown
2018-11-04 10:47 ` [Ksummit-discuss] " Geert Uytterhoeven
2018-10-25 23:06 ` Al Viro
2018-10-26 2:28 ` Eric S. Raymond
2018-10-26 5:49 ` Al Viro
2018-10-27 6:52 ` visionsofalice
2018-10-27 7:32 ` Al Viro
2018-10-27 16:18 ` [Ksummit-discuss] " Tim.Bird
2018-10-27 22:09 ` Jiri Kosina
[not found] ` <CAK2MWOtNUTjWy5pTcGco5DNurqNCc=9CfDJ-Ko-K+6HDC55ikg@mail.gmail.com>
2018-10-27 23:07 ` Eric S. Raymond
2018-10-27 23:40 ` Al Viro
2018-10-28 21:13 ` NeilBrown
2018-10-25 23:32 ` Iván Chavero
2018-10-26 13:15 ` Eben Moglen
2018-10-26 15:50 ` Eric S. Raymond
2018-10-26 15:53 ` Eben Moglen
2018-10-26 17:32 ` visionsofalice
2018-10-26 18:31 ` Eben Moglen
2018-10-27 7:12 ` visionsofalice
2018-12-18 18:53 ` The linux devs can rescind their license grant. - Analysis published? visionsofalice
2018-10-26 10:34 ` The linux devs can rescind their license grant visionsofalice
2018-10-29 22:31 ` Bradley M. Kuhn
2018-12-18 19:17 ` visionsofalice
2018-10-27 5:04 ` The linux devs can rescind their license grant. - Additional restrictive terms visionsofalice
2018-12-18 20:55 ` The CoC regime is a License violation " visionsofalice
2018-12-19 1:17 ` visionsofalice
2018-12-23 16:05 ` visionsofalice
2018-10-25 22:02 ` Call to Action Re: [PATCH 0/7] Code of Conduct: Fix some wording, and add an interpretation document NeilBrown
2018-10-25 8:06 ` Pavel Machek
2018-10-25 11:20 ` Rainer Fiebig
2018-10-25 22:18 ` NeilBrown
2018-10-26 8:33 ` Rainer Fiebig
2018-10-26 22:40 ` NeilBrown
2018-10-27 11:49 ` Rainer Fiebig
2018-10-21 23:36 ` Eric S. Raymond
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=20181020135043.GE32218@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=clm@fb.com \
--cc=ksummit-discuss@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mishi@linux.com \
--cc=olof@lixom.net \
--cc=tglx@linutronix.de \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).