linux-kernel - [PATCH 4/7] Code of Conduct: Provide links between the two documents

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20181020135043.GE32218@kroah.com>
Date:   Sat, 20 Oct 2018 15:50:43 +0200
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     linux-kernel <linux-kernel@...r.kernel.org>
Cc:     ksummit-discuss@...ts.linuxfoundation.org,
        Thomas Gleixner <tglx@...utronix.de>,
        Olof Johansson <olof@...om.net>, Chris Mason <clm@...com>,
        Mishi Choudhary <mishi@...ux.com>
Subject: [PATCH 4/7] 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@...com>
Acked-by: Olof Johansson <olof@...om.net>
Acked-by: Theodore Ts'o <tytso@....edu>
Acked-by: Thomas Gleixner <tglx@...utronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.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