Rename Contributor to Significant Contributor

The term "Contributor" was too generic and could easily be confused with
the contributors that are listed in the release notes. Also, we want to
make room for listing more contributors on the website, outside of the
"Recognized Contributors" list.

Also do some copy-editing of the contributor pages:

The Recognized Contributors policy page title gets "Policy" appended
because the old title looked like it was the actual contributors list.

The Contributors Profiles page title gets a "PostgreSQL" prepended so
the "PostgreSQL Contributor" term appears there. (Only the in-page title
is updated since the html header title gets "PostgreSQL:" prepended
automatically anyway.) The section on how to submit additions is moved
to the bottom of the page so people can start looking at the list without
that distraction.

All the sections on that page get short introductory text. (The changes
to data.json will need to be manually transferred to the Django admin
interface.)

Author: Christoph Berg <myon@debian.org>
Reviewed-By: Jonathan S. Katz <jkatz@postgresql.org>

diff --git a/pgweb/contributors/fixtures/data.json b/pgweb/contributors/fixtures/data.json
index 97a4072e0f93d7e4c249dd2c43442e47a55aa18a..76e9066511270f966fb6f353fd797745a92ff0f0 100644 (file)
--- a/pgweb/contributors/fixtures/data.json
+++ b/pgweb/contributors/fixtures/data.json
@@ -5,7 +5,7 @@
  "fields": {
   "typename": "Core Team",
   "sortorder": 100,
-  "extrainfo": "For more information on the purpose of the core team, please click <a\r\nhref=\"/developer/core/\">here</a>.",
+  "extrainfo": "The role of the Core Team is described on the <a href=\"/developer/core/\">Core Team page</a>. Core Team members are also Major Contributors.",
   "detailed": true,
   "showemail": true
  }
@@ -16,7 +16,7 @@
  "fields": {
   "typename": "Major Contributors",
   "sortorder": 200,
-  "extrainfo": "",
+  "extrainfo": "Major Contributors are individuals who have provided a sustained stream of contributions, having substantial positive impact on the development of the PostgreSQL Community, over many years.",
   "detailed": true,
   "showemail": true
  }
@@ -36,9 +36,9 @@
  "model": "contributors.contributortype",
  "pk": 4,
  "fields": {
-  "typename": "Contributors",
+  "typename": "Significant Contributors",
   "sortorder": 300,
-  "extrainfo": "",
+  "extrainfo": "Significant Contributors are individuals who have provided a sustained stream of notable contributions in recent years.",
   "detailed": false,
   "showemail": true
  }
@@ -47,9 +47,9 @@
  "model": "contributors.contributortype",
  "pk": 5,
  "fields": {
-  "typename": "Past Contributors",
+  "typename": "Past Significant Contributors",
   "sortorder": 500,
-  "extrainfo": "",
+  "extrainfo": "These people have made significant contributions to PostgreSQL in the past.",
   "detailed": false,
   "showemail": false
  }

diff --git a/templates/contributors/list.html b/templates/contributors/list.html
index 40a32205b89e7b8794db7db12a1408426a0cf891..068fc94914a824924a714eee1906bb42be8ec092 100644 (file)
--- a/templates/contributors/list.html
+++ b/templates/contributors/list.html
@@ -2,15 +2,10 @@
 {%load pgfilters%}
 {%block title%}Contributor Profiles{%endblock%}
 {%block contents%}
-<h1>Contributor Profiles <i class="fa fa-users"></i></h1>
+<h1>PostgreSQL Contributor Profiles <i class="fa fa-users"></i></h1>
+
 <p>These are the fine people that make PostgreSQL what it is today!</p>
 
-<p>To suggest additions to this list, please email the
-  <a href="/about/governance/contributors/">Contributors Committee</a> at
-  <a href="mailto:contributors@postgresql.org">contributors@postgresql.org</a>.
-    See the <a href="/about/policies/contributors/">Recognized Contributors</a>
-    policy for more information on becoming a recognized contributor.
-</p>
 <p>
     For a list of all code contributions to a specific release, see the
   <a href="/docs/release/">Release Notes</a> for released versions of PostgreSQL.
@@ -70,5 +65,11 @@
 {%endfor%}
 
 <p>All contributors are listed in alphabetical order.
-Please report omissions or corrections to <a href="mailto:contributors@postgresql.org">contributors@postgresql.org</a>.</p>
+  To suggest additions or corrections to this list, please email the
+  <a href="/about/governance/contributors/">Contributors Committee</a> at
+  <a href="mailto:contributors@postgresql.org">contributors@postgresql.org</a>.
+    See the <a href="/about/policies/contributors/">Recognized Contributors Policy</a>
+    for more information on becoming a recognized contributor.
+</p>
+
 {%endblock%}

diff --git a/templates/pages/about/policies/contributors.html b/templates/pages/about/policies/contributors.html
index 3ad18a766d8d1b03fe0e24dbf49b200e72e558ac..93ee012da52367e3e62c4ff0801c7b487f84ab96 100644 (file)
--- a/templates/pages/about/policies/contributors.html
+++ b/templates/pages/about/policies/contributors.html
@@ -1,9 +1,9 @@
 {%extends "base/page.html"%}
 {%load pgfilters%}
-{%block title%}Recognized Contributors{%endblock%}
+{%block title%}Recognized Contributors Policy{%endblock%}
 {%block contents%}
 
-<h1>Recognized Contributors <i class="fas fa-gavel"></i></h1>
+<h1>Recognized Contributors Policy <i class="fas fa-gavel"></i></h1>
 
 <p>
   The PostgreSQL <a href="/community/contributors/">Contributor Profiles</a>
@@ -32,14 +32,14 @@
   lists Core Team members and two levels of PostgreSQL Contributors:
 </p>
 <ul>
-  <li><strong>Core Team</strong> people on the
+  <li><strong>Core Team</strong>: people on the
       <a href="/developer/core/">PostgreSQL Core Team</a>
   </li>
-  <li><strong>Major Contributors</strong> individuals that have provided
+  <li><strong>Major Contributors</strong>: individuals who have provided
       a sustained stream of contributions, having substantial positive
       impact on the development of the PostgreSQL Community, over many years.
   </li>
-  <li><strong>Contributors</strong> individuals that have provided a sustained
+  <li><strong>Significant Contributors</strong>: individuals who have provided a sustained
        stream of notable contributions in recent years.
   </li>
 </ul>
@@ -47,13 +47,13 @@
 <h3>Past Contributors</h3>
 <p>
   This section lists people who were in the Core Team, Major Contributor,
-  or Contributor section, but have stopped contributing for an extended
-  period of time.
+  or Significant Contributor sections, but who have stepped down or stopped
+  contributing for an extended period of time.
 </p>
 <ul>
   <li><strong>Past Major Contributors</strong>: previous Major Contributors and
     previous Core Team members</li>
-  <li><strong>Past Contributors</strong>: previous Contributors</li>
+  <li><strong>Past Contributors</strong>: previous Significant Contributors</li>
 </ul>
 
 <h2>Types of Contributions</h2>
@@ -91,6 +91,14 @@
   <a href="mailto:contributors@postgresql.org">contributors@postgresql.org</a>.
 </p>
 
+<h2>Nominating New Recognized Contributors</h2>
+<p>
+  If you want to nominate a PostgreSQL contributor who you think is making sustained
+  contributions of the type described here, email a description of their
+  contributions to the
+  <a href="/about/governance/contributors/">Contributors Committee</a> at
+  <a href="mailto:contributors@postgresql.org">contributors@postgresql.org</a>.
+</p>
 
 <h2>Contributors Committee Governance</h2>
 <p>
@@ -100,11 +108,4 @@
   page.
 </p>
 
-<h2>Nominating New Recognized Contributors</h2>
-<p>
-  If there is a PostgreSQL contributor who you think is making sustained
-  contributions of the type described here, email a description of their
-  contributions to
-  <a href="mailto:contributors@postgresql.org">contributors@postgresql.org</a>.
-</p>
 {%endblock%}