summaryrefslogtreecommitdiffstats
path: root/Documentation/process
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-19 10:45:08 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-22 07:33:36 +0100
commitf7e585843217caff0aa9fb7dc9d796f0fa92162b (patch)
tree77f717845b3daf73dd656a7ba651fa7ca2fd55d0 /Documentation/process
parentd84feee76f7f8171550ea2859c16f393599d0f58 (diff)
downloadlinux-f7e585843217caff0aa9fb7dc9d796f0fa92162b.tar.gz
linux-f7e585843217caff0aa9fb7dc9d796f0fa92162b.tar.bz2
linux-f7e585843217caff0aa9fb7dc9d796f0fa92162b.zip
Code of Conduct: Provide links between the two documents
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>
Diffstat (limited to 'Documentation/process')
-rw-r--r--Documentation/process/code-of-conduct-interpretation.rst4
-rw-r--r--Documentation/process/code-of-conduct.rst8
2 files changed, 11 insertions, 1 deletions
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.