From e25003e78b13b7db5d24a1082294d9596c735fd6 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 10 Nov 2023 02:35:02 +0200 Subject: Documentation: contributing: Integrate the code of conduct Now that libcamera has an official code of conduct, mention it in the 'contributing' document with a clear indication that all community members are expected to follow the code of conduct. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- Documentation/code-of-conduct.rst | 2 ++ Documentation/contributing.rst | 5 +++++ Documentation/meson.build | 1 + 3 files changed, 8 insertions(+) diff --git a/Documentation/code-of-conduct.rst b/Documentation/code-of-conduct.rst index cdf7dd2c..38b7d7ad 100644 --- a/Documentation/code-of-conduct.rst +++ b/Documentation/code-of-conduct.rst @@ -1,5 +1,7 @@ .. SPDX-License-Identifier: CC-BY-4.0 +.. _code-of-conduct: + Contributor Covenant Code of Conduct ==================================== diff --git a/Documentation/contributing.rst b/Documentation/contributing.rst index 2f0b4921..18b1914a 100644 --- a/Documentation/contributing.rst +++ b/Documentation/contributing.rst @@ -8,6 +8,10 @@ Whether you would like to help with coding, documentation, testing, proposing new features, or just discussing the project with the community, you can join our official public communication channels, or simply check out the code. +The project adheres to a :ref:`code of conduct ` that +maintainers, contributors and community members are expected to follow in all +online and offline communication. + Mailing List ------------ @@ -134,4 +138,5 @@ By making a contribution to this project, I certify that: .. toctree:: :hidden: + Code of Conduct Coding Style diff --git a/Documentation/meson.build b/Documentation/meson.build index 7c150259..3eb2897e 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -64,6 +64,7 @@ endif if sphinx.found() docs_sources = [ 'camera-sensor-model.rst', + 'code-of-conduct.rst', 'coding-style.rst', 'conf.py', 'contributing.rst', -- cgit v1.2.1