From 41b66bb2920c773cc921d13f6b4ba8eb1b8824d3 Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Thu, 19 Nov 2020 13:06:03 +0100
Subject: [PATCH] Fix some consistency and formatting in news/events policy

Consistently talk about postgresql.org vs www.postgresql.org, and call
the team "web team" (not a mix of teams and groups, with and without
admin etc). Don't use markdown/wiki style for emphasis, use proper HTML.

As this does not contain any changes to the actual policy, this commit
does not bump the "last updated" date of the page.
---
 templates/pages/about/policies/news-and-events.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/pages/about/policies/news-and-events.html b/templates/pages/about/policies/news-and-events.html
index aaa69b95..d1820220 100644
--- a/templates/pages/about/policies/news-and-events.html
+++ b/templates/pages/about/policies/news-and-events.html
@@ -11,7 +11,7 @@
 
 <h3>General Rules</h3>
 
-<p>The www.postgresql.org home page contains News and Events listings which are
+<p>The postgresql.org home page contains News and Events listings which are
     maintained entirely for the benefit of the PostgreSQL community. As this
     space would be quite valuable (up to $400 per listing) if commercially
     available, our admins have unlimited authority to be restrictive about what
@@ -36,11 +36,11 @@
 <ul>
     <li>All items must relate to PostgreSQL in some direct and obvious way.</li>
     <li>Link-only events or news will never be acceptable.</li>
-    <li>The WWW admin group of the PostgreSQL project may permanently ban any
+    <li>The web team of the PostgreSQL project may permanently ban any
         organization which is the cause of substantiated complaints about
         accuracy, ethics or legality from members of our community.
     </li>
-    <li>The WWW team makes no promises about timely approval of announcements.
+    <li>The web team makes no promises about timely approval of announcements.
         If publication on a specific day is critical to you, you will need to
         contact the pgsql-www mailing list or a core team member prior to the
         submission.
@@ -49,7 +49,7 @@
         any of the limitations on news and events, such as allowed posting
         frequency, at the discretion of the web team.
     </li>
-    <li>The WWW team reserves the right to partially or entirely rewrite News
+    <li>The web team reserves the right to partially or entirely rewrite News
         or Events postings to improve clarity.
     </li>
     <li>Starting at midnight UTC on the day of a PostgreSQL release, including
@@ -57,7 +57,7 @@
         approved until after midnight UTC 72 hours later. For example, if a new
         version of PostgreSQL is released on 2018-02-08, then no other
         announcements will be approved between 2018-02-08 0:00 UTC and
-        2018-02-11 0:00 UTC. Any announcements submitted *during* this time
+        2018-02-11 0:00 UTC. Any announcements submitted <em>during</em> this time
         should have their timestamp updated once they are approved, so they
         don't end up looking like old once they do post.
     </li>
@@ -168,7 +168,7 @@
 
 <p>More routine events, such as monthly local meetings or mini-conferences, will
     not be listed. Conferences must have significant PostgreSQL content to be
-    worth listing, with decisions on relative significance to be made by the WWW
+    worth listing, with decisions on relative significance to be made by the web
     team.</p>
 
 <h2>Training Events</h2>
-- 
2.39.5