Merge tag 'docs-4.20' of git://git.lwn.net/linux
[sfrench/cifs-2.6.git] / Documentation / process / index.rst
index 1ddde440f333d8f239cc9c34f0586e4a2b56e84b..757808526d9a8bbb2197dc54a532ea766e5c4be3 100644 (file)
@@ -21,7 +21,8 @@ Below are the essential guides that every developer should read.
 
    license-rules
    howto
-   code-of-conflict
+   code-of-conduct
+   code-of-conduct-interpretation
    development-process
    submitting-patches
    coding-style