Skip to content

Commit d6d4d60

Browse files
authored
Merge pull request #2075 from jaimergp/adjust-coc-wording
2 parents 7daff3e + 28d69d7 commit d6d4d60

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ Thank you for helping make this a welcoming, friendly community for all.
4343

4444
If you believe someone is violating the code of conduct, please report this in a timely manner. Code of conduct violations reduce the value of the community for everyone. The team at conda-forge takes reports of misconduct very seriously and is committed to preserving and maintaining the welcoming nature of our community.
4545

46+
Reports should be sent to <[email protected]>, a private mailing list only accessible by the members of the core team. If your report involves a member of the core team, please send it to NumFOCUS following [these instructions](https://numfocus.org/code-of-conduct#how-to-report).
47+
4648
All reports will be kept confidential. Please have a look at the [Reporting guidelines](https://numfocus.org/code-of-conduct#reporting-guidelines).
4749

4850
### Enforcement: What happens after a report is filed?

sphinx/src/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@
134134
r'https://app.element.io/#.*$', # anchors are generated dynamically
135135
r'https://wave.webaim.org/report#.*$', # anchors are generated dynamically
136136
r'https://endoflife.software/.*$', # TLS certificate expired
137+
r'https://github.com/conda-forge/conda-forge.github.io#code-of-conduct', # anchors are generated dynamically
137138
r'https://github.com/conda-forge/conda-forge.github.io/tree/main/sphinx/src/.*$', # temporary; REVERT
138139
r'https://github.com/conda-forge/conda-forge.github.io/tree/main/sphinx/src', # temporary; REVERT
139140
r'https://conda-forge.org/news', # temporary; REVERT

sphinx/src/orga/governance.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ appreciate all good faith contributions.
1111

1212
Code of Conduct
1313
---------------
14-
conda-forge adheres to the
15-
`NumFOCUS Code of Conduct <https://www.numfocus.org/code-of-conduct>`_.
14+
15+
Please refer to the `Code of Conduct section in our README <https://github.com/conda-forge/conda-forge.github.io#code-of-conduct>`__ for more information.
1616

1717
Teams & Roles
1818
-------------

0 commit comments

Comments
 (0)