From f266143c8f7f381e96761e3867bbad98899aaade Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Wed, 2 May 2018 12:30:23 +0200 Subject: [PATCH 1/3] Remove references to non-existent docs to fix build --- contributing/code_of_conduct/index.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/contributing/code_of_conduct/index.rst b/contributing/code_of_conduct/index.rst index e0ddb07476f..ca9fe73f341 100644 --- a/contributing/code_of_conduct/index.rst +++ b/contributing/code_of_conduct/index.rst @@ -61,7 +61,7 @@ further defined and clarified by enforcement team members. Enforcement ----------- -Instances of abusive, harassing, or otherwise unacceptable behavior +Instances of abusive, harassing, or otherwise unacceptable behavior :doc:`may be reported ` by contacting the :doc:`enforcement team members `. All complaints will be reviewed and investigated and will result in a response that @@ -85,8 +85,6 @@ Related Documents .. toctree:: :maxdepth: 1 - reporting_guidelines - enforcement_team concrete_example_document .. _Contributor Covenant: https://www.contributor-covenant.org From 79f9705215150fc4830a4967e76b958f1c3c62e6 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Wed, 2 May 2018 12:48:46 +0200 Subject: [PATCH 2/3] Link to the CoC from the contributing index --- contributing/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/contributing/index.rst b/contributing/index.rst index a3177b959f0..06d2c1c061b 100644 --- a/contributing/index.rst +++ b/contributing/index.rst @@ -4,6 +4,7 @@ Contributing .. toctree:: :hidden: + code_of_conduct/index code/index documentation/index community/index From 1ecf41f4a249e67c2945746c88c9a4f46d3b606a Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Wed, 2 May 2018 13:02:49 +0200 Subject: [PATCH 3/3] Added some placeholder docs to fix the build --- contributing/code_of_conduct/enforcement_team.rst | 5 +++++ contributing/code_of_conduct/index.rst | 2 ++ contributing/code_of_conduct/reporting_guidelines.rst | 6 ++++++ 3 files changed, 13 insertions(+) create mode 100644 contributing/code_of_conduct/enforcement_team.rst create mode 100644 contributing/code_of_conduct/reporting_guidelines.rst diff --git a/contributing/code_of_conduct/enforcement_team.rst b/contributing/code_of_conduct/enforcement_team.rst new file mode 100644 index 00000000000..c35c747e454 --- /dev/null +++ b/contributing/code_of_conduct/enforcement_team.rst @@ -0,0 +1,5 @@ +Enforcement Team +================ + +We're preparing the "Enforcement Team" for the new Symfony Code of Conduct. +Come back to this article in a few days to see the members of that team. diff --git a/contributing/code_of_conduct/index.rst b/contributing/code_of_conduct/index.rst index ca9fe73f341..cd537228e48 100644 --- a/contributing/code_of_conduct/index.rst +++ b/contributing/code_of_conduct/index.rst @@ -85,6 +85,8 @@ Related Documents .. toctree:: :maxdepth: 1 + reporting_guidelines + enforcement_team concrete_example_document .. _Contributor Covenant: https://www.contributor-covenant.org diff --git a/contributing/code_of_conduct/reporting_guidelines.rst b/contributing/code_of_conduct/reporting_guidelines.rst new file mode 100644 index 00000000000..60bff5e65e7 --- /dev/null +++ b/contributing/code_of_conduct/reporting_guidelines.rst @@ -0,0 +1,6 @@ +Reporting Guidelines +==================== + +We're preparing the "Reporting Guidelines" to explain how can you report a +violation of the new Symfony Code of Conduct. Come back to this article in a +few days to see the process in detail.