summaryrefslogtreecommitdiffstats
path: root/Documentation/process/index.rst
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-15 20:26:44 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2018-09-16 11:42:28 -0700
commit8a104f8b5867c682d994ffa7a74093c54469c11f (patch)
treea8c6159ab818cc601c662d0e5cadfb67ea240fca /Documentation/process/index.rst
parent27c5a778dfe23d1de8d9ebfbc6a54595a79ac709 (diff)
downloadlinux-8a104f8b5867c682d994ffa7a74093c54469c11f.tar.bz2
Code of Conduct: Let's revamp it.
The Code of Conflict is not achieving its implicit goal of fostering civility and the spirit of 'be excellent to each other'. Explicit guidelines have demonstrated success in other projects and other areas of the kernel. Here is a Code of Conduct statement for the wider kernel. It is based on the Contributor Covenant as described at www.contributor-covenant.org From this point forward, we should abide by these rules in order to help make the kernel community a welcoming environment to participate in. Signed-off-by: Chris Mason <clm@fb.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Olof Johansson <olof@lxom.net> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/process/index.rst')
-rw-r--r--Documentation/process/index.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/process/index.rst b/Documentation/process/index.rst
index 37bd0628b6ee..9ae3e317bddf 100644
--- a/Documentation/process/index.rst
+++ b/Documentation/process/index.rst
@@ -20,7 +20,7 @@ Below are the essential guides that every developer should read.
:maxdepth: 1
howto
- code-of-conflict
+ code-of-conduct
development-process
submitting-patches
coding-style