diff --git a/_data/cocfaq.yml b/_data/cocfaq.yml index b04ade89b..f49ac9409 100644 --- a/_data/cocfaq.yml +++ b/_data/cocfaq.yml @@ -9,7 +9,7 @@ - question: Why this Code of Conduct? - answer: The Microsoft Open Source Code of Conduct is an instantiation of the Contributor's Covenant 2.0, that captures the Microsoft culture of equality, respect and inclusion. By leveraging this template, which is used by many open source projects, we acknowledge both the opportunity gained by leveraging a community-based effort for inclusion, and responsibility to contribute to its evolution. + answer: The Microsoft Open Source Code of Conduct is an instantiation of the Contributor's Covenant 2.0, that captures the Microsoft culture of equality, respect and inclusion. By leveraging this template, which is used by many open source projects, we acknowledge both the opportunity gained by leveraging a community-based effort for inclusion, and responsibility to contribute to its evolution. - question: Why do this across all repos? @@ -17,23 +17,23 @@ - question: How does a project adopt the code and process? answer: | -
All Microsoft projects are automatically covered by the Code of Conduct and the Issue Resolution Process. However, it is critical that everyone in the communities be aware of the code and process. For that reason, all projects must link to the Code of Conduct. Please refer to this repository standard for the current CODE_OF_CONDUCT.md version.
+All Microsoft projects are automatically covered by the Code of Conduct and the Issue Resolution Process. However, it is critical that everyone in the communities be aware of the code and process. For that reason, all projects must link to the Code of Conduct. Please refer to this repository standard for the current CODE_OF_CONDUCT.md version.
- question: What if my Microsoft project already has a Code of Conduct? answer: | -Thanks for being proactive in this important area. You are welcome to continue using your existing Code of Conduct, or you may change to the Microsoft Open Source Code of Conduct. Either way, all Microsoft projects must use the same issue resolution process. Please ensure that your documentation and guidance is updated to point people at the process outlined in this FAQ (see below).
-Projects in the .NET Foundation are already covered by the .NET Foundation Contributors Code of Conduct. As such, there is no need for .NET Foundation projects to make any changes.
+Thanks for being proactive in this important area. You are welcome to continue using your existing Code of Conduct, or you may change to the Microsoft Open Source Code of Conduct. Either way, all Microsoft projects must use the same issue resolution process. Please ensure that your documentation and guidance is updated to point people at the process outlined in this FAQ (see below).
+Projects in the .NET Foundation are already covered by the .NET Foundation Contributors Code of Conduct. As such, there is no need for .NET Foundation projects to make any changes.
- question: How do I raise a concern? answer: | -If you have witnessed or been subjected to a violation of the Code of Conduct, please send an email to opencode@microsoft.com. Your message will be handled in a secure and confidential manner. This email address is monitored by the Open Source Program's Office, who are not directly active in open source projects or communities — so you can be sure that you are not communicating with a person involved in the issue you are reporting.
+If you have witnessed or been subjected to a violation of the Code of Conduct, please send an email to opencode@microsoft.com. Your message will be handled in a secure and confidential manner. This email address is monitored by the Open Source Program's Office, who are not directly active in open source projects or communities — so you can be sure that you are not communicating with a person involved in the issue you are reporting.
You will receive a response within one business day acknowledging receipt of your email and describing the process for its resolution. (See below for more details.)
-NOTE: this process is not appropriate for reporting spamming. Please reach out to GitHub Support for these issues.
+NOTE: this process is not appropriate for reporting spamming. Please reach out to GitHub Support for these issues.
- question: What is the process for addressing issues that arise? answer: | -Emails sent to opencode@microsoft.com or reported directly to a member of the OSPO team, kick off the following process:
+Emails sent to opencode@microsoft.com or reported directly to a member of the OSPO team, kick off the following process:
Step 1: Issue Reported
-Reporter reports directly to a member of the OSPO team or via email to opencode@microsoft.com
- Email address is published with Code of Conduct, linked from every Microsoft Open Source project’s repo. +Reporter reports directly to a member of the OSPO team or via email to opencode@microsoft.com
+ Email address is published with Code of Conduct, linked from every Microsoft Open Source project's repo.