git: 3b2548e467 - main - Use One Sentece Per Line in code of conduct and conduct reporting

The branch main has been updated by carlavilla:

URL: https://cgit.FreeBSD.org/doc/commit/?id=3b2548e4676e3a176f66d45f8371906fe392aa0f

commit 3b2548e4676e3a176f66d45f8371906fe392aa0f
Author:     Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
AuthorDate: 2023-06-14 19:37:38 +0000
Commit:     Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
CommitDate: 2023-06-14 19:37:38 +0000

    Use One Sentece Per Line in code of conduct and conduct reporting
---
 website/content/en/internal/code-of-conduct.adoc   | 14 ++++++++++----
 website/content/en/internal/conduct-reporting.adoc | 19 ++++++++++++++-----
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/website/content/en/internal/code-of-conduct.adoc b/website/content/en/internal/code-of-conduct.adoc
index 70912ef760..601b344ed7 100644
--- a/website/content/en/internal/code-of-conduct.adoc
+++ b/website/content/en/internal/code-of-conduct.adoc
@@ -7,7 +7,8 @@ sidenav: docs
 
 == FreeBSD Community Code of Conduct
 
-The FreeBSD community has always worked to be a welcoming and respectful community, and we want to ensure that doesn't change as we grow and evolve. To that end, we have a few ground rules that we ask people to adhere to:
+The FreeBSD community has always worked to be a welcoming and respectful community, and we want to ensure that doesn't change as we grow and evolve.
+To that end, we have a few ground rules that we ask people to adhere to:
 
 * be friendly and patient,
 * be welcoming,
@@ -16,11 +17,16 @@ The FreeBSD community has always worked to be a welcoming and respectful communi
 * be careful in the words that you choose and be kind to others,
 * when we disagree, try to understand why.
 
-This isn't an exhaustive list of things that you can't do. Rather, take it in the spirit in which it's intended - a guide to make it easier to communicate and participate in the community.
+This isn't an exhaustive list of things that you can't do.
+Rather, take it in the spirit in which it's intended - a guide to make it easier to communicate and participate in the community.
 
-This code of conduct applies to all spaces managed by the FreeBSD project. This includes online chat, mailing lists, bug trackers, FreeBSD events such as the developer meetings and socials, and any other forums created by the project that the community uses for communication. It applies to all of your communication and conduct in these spaces, including emails, chats, things you say, slides, videos, posters, signs, or even t-shirts you display in these spaces. In addition, violations of this code outside these spaces may, in rare cases, affect a person's ability to participate within them, when the conduct amounts to an egregious violation of this code.
+This code of conduct applies to all spaces managed by the FreeBSD project.
+This includes online chat, mailing lists, bug trackers, FreeBSD events such as the developer meetings and socials, and any other forums created by the project that the community uses for communication.
+It applies to all of your communication and conduct in these spaces, including emails, chats, things you say, slides, videos, posters, signs, or even t-shirts you display in these spaces.
+In addition, violations of this code outside these spaces may, in rare cases, affect a person's ability to participate within them, when the conduct amounts to an egregious violation of this code.
 
-If you believe someone is violating the code of conduct, we ask that you report it by emailing mailto:conduct@freebsd.org[conduct@FreeBSD.org]. For more details please see our link:../conduct-reporting/[Reporting Guide].
+If you believe someone is violating the code of conduct, we ask that you report it by emailing mailto:conduct@freebsd.org[conduct@FreeBSD.org].
+For more details please see our link:../conduct-reporting/[Reporting Guide].
 
 * *Be friendly and patient.*
 * *Be welcoming.* We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, color, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion or lack thereof, and mental and physical ability.
diff --git a/website/content/en/internal/conduct-reporting.adoc b/website/content/en/internal/conduct-reporting.adoc
index 0574a39de3..88bbfce5cb 100644
--- a/website/content/en/internal/conduct-reporting.adoc
+++ b/website/content/en/internal/conduct-reporting.adoc
@@ -9,7 +9,12 @@ sidenav: docs
 
 If you believe someone is violating the link:../code-of-conduct[code of conduct] we ask that you report it to the FreeBSD Code of Conduct Committee by emailing conduct@freebsd.org.
 
-All reports will be kept confidential whenever possible. We strive to protect the identity and safety of reporters. In some cases we may need to make a public statement of some form, in which case we will use the minimum of details and identifying information necessary to protect our community. In rare cases, we may need to identify some of the people involved to comply with the law or protect other potential victims. In these cases, we will consult with the reporter to find out what their wishes are and take them into account in our final decision. In all cases, we will not directly or indirectly identify reporters without their consent unless we see no other option.
+All reports will be kept confidential whenever possible.
+We strive to protect the identity and safety of reporters.
+In some cases we may need to make a public statement of some form, in which case we will use the minimum of details and identifying information necessary to protect our community.
+In rare cases, we may need to identify some of the people involved to comply with the law or protect other potential victims.
+In these cases, we will consult with the reporter to find out what their wishes are and take them into account in our final decision.
+In all cases, we will not directly or indirectly identify reporters without their consent unless we see no other option.
 
 If you believe anyone is in physical danger, please notify appropriate law enforcement first.
 
@@ -35,7 +40,8 @@ The committee will meet as quickly as possible to review the incident and determ
 
 If a member of the FreeBSD Code of Conduct Committee is one of the individuals included in the report they will recuse themselves from handling the report.
 
-Once the working group has a complete account of the events they will make a decision as to how to respond. Actions taken may include:
+Once the working group has a complete account of the events they will make a decision as to how to respond.
+Actions taken may include:
 
 * Nothing (for example, if we determine that no violation occurred).
 * If determined to be solely technical in nature or if it falls outside the scope of the Code of Conduct, forwarding the incident to the FreeBSD Core Team
@@ -48,10 +54,13 @@ Once the working group has a complete account of the events they will make a dec
 
 We will do our best to respond within one week to the person who filed the report with either a resolution or an explanation of why the situation is not yet resolved.
 
-Once we have determined our final action, we will contact the original reporter to let them know what action (if any) we will be taking. We will take into account feedback from the reporter on the appropriateness of our response, but we do not guarantee we will act on it.
+Once we have determined our final action, we will contact the original reporter to let them know what action (if any) we will be taking. 
+We will take into account feedback from the reporter on the appropriateness of our response, but we do not guarantee we will act on it.
 
-Finally, the committee will make a report on the situation to the FreeBSD Core Team. The Core Team may choose to issue a public report of the incident.
+Finally, the committee will make a report on the situation to the FreeBSD Core Team.
+The Core Team may choose to issue a public report of the incident.
 
 == Appeals
 
-Only permanent resolutions (such as bans) may be appealed. To appeal a decision of the CoC Committee, contact the FreeBSD Core Team at core@freebsd.org with your appeal and the Core Team will review the case.
+Only permanent resolutions (such as bans) may be appealed.
+To appeal a decision of the CoC Committee, contact the FreeBSD Core Team at core@freebsd.org with your appeal and the Core Team will review the case.