Add an extra blank line to improve its output and add it to the development-process bookset. Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxxx> --- Documentation/CodeOfConflict | 1 + Documentation/development-process/CodeOfConflict.rst | 1 + Documentation/development-process/index.rst | 1 + 3 files changed, 3 insertions(+) create mode 120000 Documentation/development-process/CodeOfConflict.rst diff --git a/Documentation/CodeOfConflict b/Documentation/CodeOfConflict index 1684d0b4efa6..c498ca80fce2 100644 --- a/Documentation/CodeOfConflict +++ b/Documentation/CodeOfConflict @@ -19,6 +19,7 @@ please contact the Linux Foundation's Technical Advisory Board at will work to resolve the issue to the best of their ability. For more information on who is on the Technical Advisory Board and what their role is, please see: + http://www.linuxfoundation.org/programs/advisory-councils/tab As a reviewer of code, please strive to keep things civil and focused on diff --git a/Documentation/development-process/CodeOfConflict.rst b/Documentation/development-process/CodeOfConflict.rst new file mode 120000 index 000000000000..555f8a5d3424 --- /dev/null +++ b/Documentation/development-process/CodeOfConflict.rst @@ -0,0 +1 @@ +../CodeOfConflict \ No newline at end of file diff --git a/Documentation/development-process/index.rst b/Documentation/development-process/index.rst index acb2c00fa5c1..fe765ec5b52d 100644 --- a/Documentation/development-process/index.rst +++ b/Documentation/development-process/index.rst @@ -24,6 +24,7 @@ Contents: applying-patches email-clients SubmitChecklist + CodeOfConflict adding-syscalls development-process -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html