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

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


The following commit(s) were added to refs/heads/asf-site by this push:
     new 5dac1d5  Updated asf-site from master at 
d11323be0461f2ec933b9a18ae05a0eb18f8623b using 
https://ci-builds.apache.org/job/Community%20Development/job/site/job/master/202/
5dac1d5 is described below

commit 5dac1d58d9f553890c5a99df2435803bdb7f72ea
Author: jenkins <[email protected]>
AuthorDate: Fri Mar 17 15:48:51 2023 +0000

    Updated asf-site from master at d11323be0461f2ec933b9a18ae05a0eb18f8623b 
using 
https://ci-builds.apache.org/job/Community%20Development/job/site/job/master/202/
---
 content/contributors/etiquette.html | 56 ++++++++++++++-----------------------
 content/contributors/index.xml      |  6 ++--
 content/index.xml                   | 20 ++++++-------
 content/sitemap.xml                 | 12 ++++----
 4 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/content/contributors/etiquette.html 
b/content/contributors/etiquette.html
index 61499ce..6e8ca74 100644
--- a/content/contributors/etiquette.html
+++ b/content/contributors/etiquette.html
@@ -6,16 +6,16 @@
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community 
development, opensource"/>
   <meta name="viewport" content="width=device-width, initial-scale=1, 
maximum-scale=1" />
-  <meta property="og:title" content="Apache Community Etiquette Guidelines" />
-<meta property="og:description" content="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.
-Code of Conduct The ASF has adopted a Code of Conduct which covers 
interactions in all the online spaces that Apache projects use - email, issue 
trackers, wikis, websites, IRC, and the like." />
+  <meta property="og:title" content="ASF Community Etiquette Guidelines" />
+<meta property="og:description" content="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 The ASF has adopted a Code of Conduct which covers 
interactions in 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." />
 <meta property="og:type" content="article" />
 <meta property="og:url" 
content="https://community.apache.org/contributors/etiquette.html"; />
 <meta property="og:image" 
content="https://community.apache.org/images/aceu19_1.jpg"/>
-<meta property="article:modified_time" content="2023-02-13T12:54:55-06:00" 
/><meta property="og:site_name" content="Apache Community Development" />
+<meta property="article:modified_time" content="2023-03-17T10:20:59-05:00" 
/><meta property="og:site_name" content="Apache Community Development" />
 
 
-  <title>Apache Community Development - Apache Community Etiquette 
Guidelines</title>
+  <title>Apache Community Development - ASF Community Etiquette 
Guidelines</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -198,21 +198,18 @@ Code of Conduct The ASF has adopted a Code of Conduct 
which covers interactions
 
       <hr>
       
-       <p>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.</p>
+       <p>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.</p>
 <h1 id="coc">Code of Conduct</h1>
 <p>The ASF has adopted a <a 
href="https://www.apache.org/foundation/policies/conduct.html";>Code of 
Conduct</a> 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&rsquo;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&rsquo;s lists show
 proper behavior.</p>
 <h1 id="member">Guidelines for Conduct and Etiquette</h1>
-<p>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.</p>
+<p>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.</p>
 <p><strong>General Communication Guidelines</strong></p>
 <ul>
 <li>
@@ -234,7 +231,7 @@ is best to avoid this type of language in favor of clear, 
direct statements.</p>
 and address your message.  The ASF strives to respond to all messages (email, 
slack, etc.) in a timely manner.</p>
 </li>
 <li>
-<p>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
+<p>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&rsquo;t understand, or feel uncomfortable with, a
 good first step would be to ask for clarification. Don&rsquo;t be afraid to 
ask specific questions.  Chances are, the person you&rsquo;re communicating 
with has been
 in your position before, and will understand.</p>
@@ -243,36 +240,25 @@ in your position before, and will understand.</p>
 <p>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&rsquo;s priorities into account.</p>
+compromise that takes all project priorities into account.</p>
 </li>
 <li>
-<p>Note:  Foul, derogaroty, or divisive language in any form, up to and 
including threats, harassment, and discriminatory language, is strongly
+<p>Note:  Foul, derogatory, or divisive language in any form, up to and 
including threats, harassment, and discriminatory language, is strongly
 prohibited.</p>
 </li>
 </ul>
-<p><strong>Most communities at Apache consists of level-headed, reasonable 
people</strong> 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.</p>
 <p><strong>Face-to-Face</strong> 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 &ldquo;structure&rdquo;, 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.</p>
+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.</p>
 <p><strong>Project decisions must always be made on mailing lists</strong>.<br>
 It&rsquo;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&rsquo;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.</p>
-<h1 id="other">Other Apache Etiquette Guidelines</h1>
+<h1 id="other">Other Etiquette Guidelines</h1>
 <ul>
 <li><a href="https://www.apache.org/foundation/policies/conduct.html";>Official 
Apache-wide Code of Conduct</a></li>
 <li><a href="https://www.apache.org/dev/contrib-email-tips";>Email Etiquette 
Guidelines - writing good emails</a></li>
diff --git a/content/contributors/index.xml b/content/contributors/index.xml
index 0903752..6810231 100644
--- a/content/contributors/index.xml
+++ b/content/contributors/index.xml
@@ -11,13 +11,13 @@
     
     
     <item>
-      <title>Apache Community Etiquette Guidelines</title>
+      <title>ASF Community Etiquette Guidelines</title>
       <link>https://community.apache.org/contributors/etiquette.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://community.apache.org/contributors/etiquette.html</guid>
-      <description>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.
-Code of Conduct The ASF has adopted a Code of Conduct which covers 
interactions in all the online spaces that Apache projects use - email, issue 
trackers, wikis, websites, IRC, and the like.</description>
+      <description>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 The ASF has adopted a Code of Conduct which covers 
interactions in 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.</description>
     </item>
     
     <item>
diff --git a/content/index.xml b/content/index.xml
index 8f77126..a73bc38 100644
--- a/content/index.xml
+++ b/content/index.xml
@@ -31,16 +31,6 @@ Governance of Provisional Top Level Project Provisional Top 
Level Project is a n
 Overview The goals of this maturity model are to describe how Apache projects 
operate in a concise and high-level way, and to provide a basic framework that 
projects may choose to use to evaluate themselves.</description>
     </item>
     
-    <item>
-      <title>Apache Community Etiquette Guidelines</title>
-      <link>https://community.apache.org/contributors/etiquette.html</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://community.apache.org/contributors/etiquette.html</guid>
-      <description>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.
-Code of Conduct The ASF has adopted a Code of Conduct which covers 
interactions in all the online spaces that Apache projects use - email, issue 
trackers, wikis, websites, IRC, and the like.</description>
-    </item>
-    
     <item>
       <title>Apache Conferences Calendar</title>
       <link>https://community.apache.org/calendars/conferences.html</link>
@@ -106,6 +96,16 @@ Thank you for your hard work on our Apache projects. You 
are the reason the Foun
 In our recent community survey, we heard from a lot of you that you want more 
information about what committer resources are available, how to connect with 
developers from other projects, and more information about what’s going on in 
the Foundation at large.</description>
     </item>
     
+    <item>
+      <title>ASF Community Etiquette Guidelines</title>
+      <link>https://community.apache.org/contributors/etiquette.html</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://community.apache.org/contributors/etiquette.html</guid>
+      <description>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 The ASF has adopted a Code of Conduct which covers 
interactions in 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.</description>
+    </item>
+    
     <item>
       <title>BoardReport</title>
       <link>https://community.apache.org/boardreport.html</link>
diff --git a/content/sitemap.xml b/content/sitemap.xml
index bc22db2..d029416 100644
--- a/content/sitemap.xml
+++ b/content/sitemap.xml
@@ -22,11 +22,6 @@
     <lastmod>2023-03-16T11:05:50-04:00</lastmod>
   </url>
   
-  <url>
-    <loc>https://community.apache.org/contributors/etiquette.html</loc>
-    <lastmod>2023-02-13T12:54:55-06:00</lastmod>
-  </url>
-  
   <url>
     <loc>https://community.apache.org/calendars/conferences.html</loc>
     <lastmod>2020-07-20T20:22:04+02:00</lastmod>
@@ -62,6 +57,11 @@
     <lastmod>2020-07-20T20:22:04+02:00</lastmod>
   </url>
   
+  <url>
+    <loc>https://community.apache.org/contributors/etiquette.html</loc>
+    <lastmod>2023-03-17T10:20:59-05:00</lastmod>
+  </url>
+  
   <url>
     <loc>https://community.apache.org/boardreport.html</loc>
     <lastmod>2020-09-23T00:32:47+02:00</lastmod>
@@ -119,7 +119,7 @@
   
   <url>
     <loc>https://community.apache.org/contributors.html</loc>
-    <lastmod>2023-02-13T12:54:55-06:00</lastmod>
+    <lastmod>2023-03-17T10:20:59-05:00</lastmod>
   </url>
   
   <url>

Reply via email to