summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2023-11-10 02:35:02 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2023-11-25 19:01:07 +0200
commite25003e78b13b7db5d24a1082294d9596c735fd6 (patch)
tree38363e1b9b019b27d4056bb18aa589948fde33c7
parentcfb7a260e9c3cd41718e8e53b26ac10495929e6d (diff)
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 <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--Documentation/code-of-conduct.rst2
-rw-r--r--Documentation/contributing.rst5
-rw-r--r--Documentation/meson.build1
3 files changed, 8 insertions, 0 deletions
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 <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 <code-of-conduct>
Coding Style <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',