[comdev-site] branch master updated: Update etiquette.md

[rb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rbowen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/comdev-site.git


The following commit(s) were added to refs/heads/master by this push:
     new 15949ab  Update etiquette.md
     new d11323b  Merge pull request #91 from mjfoulks/patch-3
15949ab is described below

commit 15949abf53c2d61f3a9b5673a0aa33f750af47a4
Author: mjfoulks <59...@users.noreply.github.com>
AuthorDate: Fri Mar 17 10:20:59 2023 -0500

    Update etiquette.md
    
    Fixed typos; removed redundancies.
---
 source/contributors/etiquette.md | 49 ++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 32 deletions(-)

diff --git a/source/contributors/etiquette.md b/source/contributors/etiquette.md
index 95950a3..150705b 100644
--- a/source/contributors/etiquette.md
+++ b/source/contributors/etiquette.md
@@ -1,27 +1,24 @@
 ---
-title: Apache Community Etiquette Guidelines
+title: ASF Community Etiquette Guidelines
 ---
 
-The Apache Software Foundation (ASF) and our many Apache projects welcome all 
-participants.  Before you begin, it is important to review and respect our community guidelines.   There are 
-many behavior or etiquette guides for online communities out there; we have a few 
-Apache-specific tips below.
+The ASF and our many projects welcome all 
+participants.  Before you begin, it is important to review and respect our community guidelines. We have a few 
+ASF-specific tips below.
 
 # Code of Conduct # {#coc}
 
 The ASF has adopted a [Code of Conduct][1] which covers interactions in 
-all the online spaces that Apache projects use - email, issue trackers, wikis, 
-websites, IRC, and the like.  Apache projects are made up of volunteers, and 
-we work to ensure that all productive contributions are welcomed.  Every 
-Apache PMC is expected to ensure their project's lists show 
+all the online spaces that ASF projects use - email, issue trackers, wikis, 
+websites, IRC, and the like.  ASF projects are made up of volunteers, and 
+we work to ensure that all productive contributions are welcomed.  Every PMC is expected to ensure their project's lists show 
 proper behavior.
 
 
 # Guidelines for Conduct and Etiquette # {#member}
 
-The ASF as a corporation is run by several hundred Members, who have deep and lasting experience 
-in helping to build and run long-term, successful open source projects here 
-at Apache.  Below are some guidelines to help you communicate with other volunteers, and get the most out of your communication experience.   
+The ASF as a corporation is run by several hundred members, who have deep and lasting experience 
+in helping to build and run long-term, successful open source projects.  Below are some guidelines to help you communicate with other volunteers, and get the most out of your communication experience.   
 
 
 **General Communication Guidelines**
@@ -40,7 +37,7 @@ is best to avoid this type of language in favor of clear, direct statements.
 "asynchronous responders."  We understand that it can be difficult and frustrating to wait, but please give these asynchronous responders time to read 
 and address your message.  The ASF strives to respond to all messages (email, slack, etc.) in a timely manner.  
 
-  * Dealing with Conflict and miscommunication:  Here at the ASF, we strive to make everyone feel welcome and wanted in their roles.  With that said, we 
+  * Dealing with conflict and miscommunication:  Here at the ASF, we strive to make everyone feel welcome and wanted in their roles.  With that said, we 
 also understand that miscommunications happen, especially in text.  If you are sent a message that you don't understand, or feel uncomfortable with, a 
 good first step would be to ask for clarification. Don't be afraid to ask specific questions.  Chances are, the person you're communicating with has been
 in your position before, and will understand.  
@@ -48,38 +45,26 @@ in your position before, and will understand.
   * Be forgiving and accept different priorities:  Everyone that works on ASF projects is passsionate about their work, and we love and welcome that 
 passion and hope you will bring your own passion to your projects. Please remember, the ASF currently has over 300 projects, each with their own project 
 priorities. If your priorities seem at odds with others, remember that compromise is essential to progress.  Work with the other person to come up with a
-compromise that takes all project's priorities into account.  
+compromise that takes all project priorities into account.  
 
-  * Note:  Foul, derogaroty, or divisive language in any form, up to and including threats, harassment, and discriminatory language, is strongly 
+  * Note:  Foul, derogatory, or divisive language in any form, up to and including threats, harassment, and discriminatory language, is strongly 
 prohibited.   
 
 
-**Most communities at Apache consists of level-headed, reasonable people** who
-have a strong vested interest in their Apache project. This interest, often
-passion, can be a source of tension, but it is also what unites the
-people within the community. It is easy to forget the vast amount of
-agreement that exists, and get upset over relatively small disagreements.
-Ability to put aside or downplay the importance of minor disagreements will ensure a
-harmonious project.
-
 **Face-to-Face** is excellent way to eliminate disagreements, but that is often
 not practical. Consider a conversation via Skype, Google Hangouts or a Slack channel, just for the social aspect
-of being part of this community. It should not be formal, and the
-invitation should go out to everyone. Someone may want to make a short
-presentation of what they are doing, to have some "structure", but that
-might not be needed either. Once we have a face to add to the words, and a general
-idea how that person is socially, we are much more capable to interact by
-email.
+of being part of this community. It does not need to be a formal meeting.  Once we have a face to add to the words, and a general
+idea how that person is socially, we are much more capable to interact via text.
 
 **Project decisions must always be made on mailing lists**.  
 It's great to have a synchronous online chat to work through some questions, but 
-be sure to bring the results of the chat - and any proposals for the 
-project community to consider - back to the mailing list.  People who 
+be sure to bring the results of the chat (and any proposals for the 
+project community to consider)  back to the mailing list.  People who 
 weren't able to attend the chat or call might also have ideas on the topic.
 Be sure to allow at least 72 hours for others to read the proposals and 
 comment before closing out the issue.
 
-# Other Apache Etiquette Guidelines # {#other}
+# Other Etiquette Guidelines # {#other}
 
  - [Official Apache-wide Code of Conduct][1]
  - [Email Etiquette Guidelines - writing good emails](https://www.apache.org/dev/contrib-email-tips)