lkml.org 
[lkml]   [2018]   [Oct]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    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@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
    \
     
     \ /
      Last update: 2018-10-20 15:53    [W:4.126 / U:1.776 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site