Infra 3777 - Update AsciiDoc Charter and WGPA

Change-Id: Ibeb5c06dc44736f23a42d6b189c9215fbd1a8d78
Signed-off-by: Eric Poirier <eric.poirier@eclipse-foundation.org>
diff --git a/workinggroups/content/en-asciidoc-charter.php b/workinggroups/content/en-asciidoc-charter.php
index 8c5026b..c212bad 100644
--- a/workinggroups/content/en-asciidoc-charter.php
+++ b/workinggroups/content/en-asciidoc-charter.php
@@ -14,9 +14,11 @@
 ?>
 <div id="maincontent">
   <div id="midcolumn">
-  	  <p><strong>Draft - Not yet approved.</strong></p>
-      <p>v0.4 - Version history is at the end of document</p>
-      <h2>Vision and Scope</h2>
+    <p>
+      <strong>Draft - Not yet approved.</strong>
+    </p>
+    <p>v0.6 - Version history is at the end of document</p>
+    <h2>Vision and Scope</h2>
     <p>The AsciiDoc Working Group will drive the standardization, adoption, and evolution
       of the AsciiDoc language. This effort will include tools to comprehend, analyze, and transform
       this language for use in creating technical communication encoded in AsciiDoc. Our goal is to
@@ -43,11 +45,11 @@
     <ul>
       <li>Promote the AsciiDoc brand and its value in the marketplace.</li>
       <li>Provide vendor neutral marketing and other services to the AsciiDoc ecosystem.</li>
-      <li>Leverage the Eclipse Foundation Specification Process to
-        formalize the specifications that are developed within the scope of this Working Group.</li>
-      <li>Establish compatibility rules—including a compatibility and branding process for
-        specification implementations—to ensure application portability and usage patterns that
-        remain consistent with the AsciiDoc model.</li>
+      <li>Leverage the Eclipse Foundation Specification Process to formalize the specifications that
+        are developed within the scope of this Working Group.</li>
+      <li>Establish compatibility rules&mdash;including a compatibility and branding process for
+        specification implementations&mdash;to ensure application portability and usage patterns
+        that remain consistent with the AsciiDoc model.</li>
       <li>Leverage Eclipse-defined licensing and intellectual property flows that encourage
         community participation, protect community members, and promote usage of AsciiDoc and its
         ecosystem.</li>
@@ -81,11 +83,11 @@
       <li><a href="/legal/tck.php">Eclipse Foundation Technology
           Compatibility Kit License</a></li>
     </ul>
-    <p>In the event of any conflict between the terms set forth in this Working Group's
-      Charter and the Eclipse Foundation Bylaws, Membership Agreement, Eclipse Development Process,
-      Eclipse Industry Working Group Process, or any policies of the Eclipse Foundation, the terms
-      of the Eclipse Foundation Bylaws, Membership Agreement, process, or policy shall take
-      precedence.</p>
+    <p>In the event of any conflict between the terms set forth in this Working
+      Group&#39;s Charter and the Eclipse Foundation Bylaws, Membership Agreement, Eclipse
+      Development Process, Eclipse Industry Working Group Process, or any policies of the Eclipse
+      Foundation, the terms of the Eclipse Foundation Bylaws, Membership Agreement, process, or
+      policy shall take precedence.</p>
     <h2>Membership</h2>
     <p>
       With the exception of Guest members as described below, an entity must be at least a <a
@@ -94,11 +96,11 @@
       Participation Agreement once defined, and adhere to the requirements set forth in this Charter
       to participate.
     </p>
-    <p>There are four classes of AsciiDoc Working Group membership - Strategic,
-      Participant, Commiter, and Guest. Each of these classes is described in detail below.</p>
-    <p>The participation fees associated with each of these membership classes is shown in
-      the tables in Schedule A. These are annual fees, and are established by the AsciiDoc Steering
-      Committee, and will be updated in this charter document accordingly.</p>
+    <p>There are three classes of AsciiDoc Working Group membership - Partner, Commiter,
+      and Guest. Each of these classes is described in detail below.</p>
+    <p>The participation fees associated with each of these membership classes are shown
+      in the Annual Participation Fees section. These are annual fees, and are established by the
+      AsciiDoc Steering Committee, and will be updated in this charter document accordingly.</p>
     <p>
       The fees associated with membership in the Eclipse Foundation are separate from any Working
       Group membership fees, and are decided as described in the <a
@@ -108,20 +110,14 @@
       >Eclipse Membership Agreement</a>.
     </p>
     <h2>Classes of AsciiDoc Membership</h2>
-    <h3>Strategic members</h3>
-    <p>Strategic Members are organizations that view open technical communication
-      standards and technologies as strategic to their organization and are investing significant
-      resources to sustain and shape the activities of this Working Group.</p>
-    <p>Strategic Members of the AsciiDoc Working Group must be at least a Solutions Member
-      of the Eclipse Foundation, and have a minimum of 1 committer participating on AsciiDoc
-      projects.</p>
-    <h3>Participant members</h3>
-    <p>Participant Members are typically organizations that need open technical
-      communication standards and technologies to deliver their products or services. These
-      organizations want to participate in the development of an open technical communication
-      ecosystem.</p>
-    <p>Participant Members of the AsciiDoc Working Group must be at least Solutions
-      Members of the Eclipse Foundation.</p>
+    <h3>Partner members</h3>
+    <p>Partner Members are organizations that view open technical communication standards
+      and technologies as strategic to their organization and are investing significant resources to
+      sustain and shape the activities of this Working Group. These organizations need open
+      technical communication standards and technologies to deliver their products or services and
+      want to participate in the development of an open technical communication ecosystem.&nbsp;</p>
+    <p>Partner Members of the AsciiDoc Working Group must be at least Solutions Members of
+      the Eclipse Foundation.</p>
     <h3>Committer members</h3>
     <p>
       Committer Members are individuals who through a process of meritocracy defined by the Eclipse
@@ -146,16 +142,13 @@
         <thead>
           <tr>
             <th>&nbsp;</th>
-            <th>
-              Strategic Member
+            <th class="text-center">
+              Partner Member
             </th>
-            <th>
-              Participant Member
-            </th>
-            <th>
+            <th class="text-center">
               Committer Member
             </th>
-            <th>
+            <th class="text-center">
               Guest Member
             </th>
           </tr>
@@ -172,9 +165,6 @@
               Elected
             </td>
             <td class="text-center">
-              Elected
-            </td>
-            <td class="text-center">
               N/A
             </td>
           </tr>
@@ -184,20 +174,19 @@
     <h2>Governance</h2>
     <p>This Working Group is designed as:</p>
     <ul>
-      <li>
-        <p>a member driven organization,</p>
-      </li>
-      <li>
-        <p>a means to foster a vibrant and sustainable ecosystem of components and service
-          providers,</p>
-      </li>
-      <li>
-        <p>a means to organize the community of each project or component so that users
-          and developers define the roadmap collaboratively.</p>
-      </li>
+      <li>a member driven organization,</li>
+      <li>a means to foster a vibrant and sustainable ecosystem of components and service providers,</li>
+      <li>a means to organize the community of each project or component so that users and
+        developers define the roadmap collaboratively.</li>
     </ul>
     <p>In order to implement these principles, the Steering Committee has been defined
-      (also referred to as the "Body" below) as described below:</p>
+      (also referred to as the &quot;Body&quot; below) as described below:</p>
+    <ul>
+      <li>
+        <p>The Steering Committee must fulfill the responsibilities of the Specification
+          Committee as defined in the Eclipse Foundation Specification Process.</p>
+      </li>
+    </ul>
     <h2>Steering Committee</h2>
     <h3>Powers and Duties</h3>
     <p>Steering Committee members are required to:</p>
@@ -205,10 +194,12 @@
       <li>Define and manage the strategy of the Working Group.</li>
       <li>Review and approve this charter.</li>
       <li>Define and manage which Eclipse Foundation projects are included within the scope of this
-        Working Group. This will require acceptance of the specification process by these projects.</li>
+        Working Group, and for those projects that are specification projects, they agree to adhere
+        to the Eclipse Foundation Specification Process.</li>
       <li>Define and approve the specification process to be used by the AsciiDoc specifications.</li>
-      <li>Ensure that all specification expert groups operate in an open, transparent, and
-        vendor-neutral fashion in compliance with the specification process.</li>
+      <li>Ensure that all software projects and specification projects operate in an open,
+        transparent, and vendor-neutral fashion in compliance with the Eclipse Development Process
+        and Eclipse Foundation Specification Process, respectively.</li>
       <li>Work with the AsciiDoc Project Management Committee (AsciiDoc PMC) to ensure that the
         specification process is complied with by all AsciiDoc specification projects.</li>
       <li>Approve specifications for adoption by the community. In this context, the Steering
@@ -217,18 +208,17 @@
       <li>Define and manage the roadmaps.</li>
       <li>Review and approve the trademark policy to ensure compatibility of independent
         implementations of specifications.</li>
-      <li>Define the trademark policy to be used by the AsciiDoc specification.</li>
+      <li>Define the trademark and branding policy to be used by the AsciiDoc specification.</li>
       <li>Ensure the consistency of logo usage and other marketing materials.</li>
-      <li>Define the budget and fees for all classes of Working Group membership each year.</li>
+      <li>Define the budget and fees for all classes of Working Group membership.</li>
       <li>Invite Guest members to participate in the Working Group.</li>
     </ul>
     <h3>Composition</h3>
     <ul>
-      <li>Each Strategic Member of the Working Group has a seat on the Steering Committee.</li>
-      <li>Two seats are allocated to Participant Members. Participant Member seats are allocated
-        following the Eclipse "Single Transferable Vote", as defined in the Eclipse Bylaws.</li>
-      <li>At least one seat is allocated to Committer Members. Committer Member seats are allocated
-        following the Eclipse "Single Transferable Vote", as defined in the Eclipse Bylaws.</li>
+      <li>Each Partner Member of the Working Group has one appointed seat on the Steering Committee.</li>
+      <li>Three elected seats are allocated to Committer Members. Committer Member seats are
+        allocated following the Eclipse &quot;Single Transferable Vote&quot;, as defined in the
+        Eclipse Bylaws.</li>
     </ul>
     <h3>Meeting Management</h3>
     <p>The Steering Committee meets at least twice a year.</p>
@@ -248,23 +238,23 @@
       meeting of the Body, they may send a representative and may vote by proxy, which shall be
       included in determining whether the representative is in Good Standing. As per the Eclipse
       Foundation Bylaws, a representative shall be immediately removed from the Body upon the
-      termination of the membership of such representative’s Member organization.</p>
+      termination of the membership of such representative&rsquo;s Member organization.</p>
     <h3>Voting</h3>
     <p>For actions (i) requesting that the Eclipse Foundation Board of Directors approve a
       specification license; (ii) approving specifications for adoption; (iii) amending the terms of
-      the Working Group’s participation agreement; (iv) approving or changing the name of the
+      the Working Group&rsquo;s participation agreement; (iv) approving or changing the name of the
       Working Group; and (v) approving changes to annual Member contribution requirements; any such
       actions must be approved by no less than two-thirds (2/3) of the representatives in Good
       Standing represented at a committee meeting at which a quorum is present.</p>
-    <h3>Term and Dates of elections</h3>
+    <h3>Term and Dates of Elections</h3>
     <p>All representatives shall hold office until their respective successors are
       appointed or elected, as applicable. There shall be no prohibition on re-election or
-      re-designation of any representative following the completion of that representative’s term of
-      office.</p>
-    <h4>Strategic Members</h4>
-    <p>Strategic Member Representatives shall serve in such capacity on committees until
-      the earlier of their removal by their respective appointing Member organization or as
-      otherwise provided for in this Charter.</p>
+      re-designation of any representative following the completion of that representative&rsquo;s
+      term of office.</p>
+    <h4>Partner Members</h4>
+    <p>Partner Member Representatives shall serve in such capacity on committees until the
+      earlier of their removal by their respective appointing Member organization or as otherwise
+      provided for in this Charter.</p>
     <h4>Elected representatives</h4>
     <p>Elected representatives shall each serve one-year terms and shall be elected to
       serve from April 1 to March 31 of each calendar year, or until their respective successors are
@@ -280,12 +270,12 @@
       corresponding Body.</p>
     <h4>Regular meetings</h4>
     <p>No Body meeting will be deemed to have been validly held unless a notice of same
-      has been provided to each of the representatives in Good Standing at least thirty (30)
-      calendar days prior to such meeting, which notice will identify all potential actions to be
-      undertaken by the Body at the Body meeting. No representative will be intentionally excluded
-      from Body meetings and all representatives shall receive notice of the meeting as specified
-      above; however, Body meetings need not be delayed or rescheduled merely because one or more of
-      the representatives cannot attend or participate so long as at least a quorum of the Body is
+      has been provided to each of the representatives in Good Standing at least ten (10) calendar
+      days prior to such meeting, which notice will identify all potential actions to be undertaken
+      by the Body at the Body meeting. No representative will be intentionally excluded from Body
+      meetings and all representatives shall receive notice of the meeting as specified above;
+      however, Body meetings need not be delayed or rescheduled merely because one or more of the
+      representatives cannot attend or participate so long as at least a quorum of the Body is
       represented at the Body meeting. Electronic voting shall be permitted in conjunction with any
       and all meetings of the Body the subject matter of which requires a vote of the Body to be
       delayed until each such representative in attendance thereat has conferred with his or her
@@ -296,134 +286,14 @@
     <h3>Invitations</h3>
     <p>The Body may invite any member to any of its meetings. These invited attendees have
       no right of vote.</p>
-    <h2>AsciiDoc Working Group Annual Participation Fees Schedule A</h2>
-    <p>The following fees have been established by the AsciiDoc Steering Committee.&nbsp;</p>
-    <h3>AsciiDoc Strategic Member Annual Participation Fees</h3>
-    <p>Strategic members are required to execute the Eclipse AsciiDoc Participation
-      Agreement, and to begin paying the fees shown below once established by the Steering
-      Committee.</p>
-    <p>Strategic members are required to commit to three (3) years of membership and have
-      a minimum of 1 committer participating on AsciiDoc projects.</p>
-    <div>
-      <table class="table table-stripped">
-        <thead>
-          <tr>
-            <th>
-              Corporate Revenue
-            </th>
-            <th class="text-center">
-              Annual Fees
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td>
-              Annual Corporate Revenues greater than $1 billion
-            </td>
-            <td class="text-center">
-              $25,000
-            </td>
-          </tr>
-          <tr>
-            <td>
-              Annual Corporate Revenues greater than $100 million but less than or
-                equal to $1 billion
-            </td>
-            <td class="text-center">
-              $20,000
-            </td>
-          </tr>
-          <tr>
-            <td>
-              Annual Corporate Revenues greater than $10 million but less than or equal
-                to $100 million
-            </td>
-            <td class="text-center">
-              $15,000
-            </td>
-          </tr>
-          <tr>
-            <td>
-              Annual Corporate Revenues less than or equal to $10 million
-            </td>
-            <td class="text-center">
-              $10,000
-            </td>
-          </tr>
-          <tr>
-            <td>
-              Annual Corporate Revenues less than $1 million and &lt; 10 employees
-            </td>
-            <td class="text-center">
-              $5,000
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <h3>AsciiDoc Participant Member Annual Participation Fees</h3>
-    <p>Participant members are required to execute the Eclipse AsciiDoc Participation
-      Agreement, and to begin paying the fees shown below once established by the Steering
-      Committee.</p>
-    <div>
-      <table class="table table-stripped">
-        <thead>
-          <tr>
-            <th>
-              Corporate Revenue
-            </th>
-            <th class="text-center">
-              Annual Fees
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td>
-              Annual Corporate Revenues greater than $1 billion
-            </td>
-            <td class="text-center">
-              $10,000
-            </td>
-          </tr>
-          <tr>
-            <td>
-              Annual Corporate Revenues greater than $100 million but less than or
-                equal to $1 billion
-            </td>
-            <td class="text-center">
-              $7,500
-            </td>
-          </tr>
-          <tr>
-            <td>
-              Annual Corporate Revenues greater than $10 million but less than or equal
-                to $100 million
-            </td>
-            <td class="text-center">
-             $5,000
-            </td>
-          </tr>
-          <tr>
-            <td>
-              Annual Corporate Revenues less than or equal to $10 million
-            </td>
-            <td class="text-center">
-              $2,500
-            </td>
-          </tr>
-          <tr>
-            <td>
-              Annual Corporate Revenues less than $1 million and &lt; 10 employees
-            </td>
-            <td class="text-center">
-              $1,500
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
+    <h2>AsciiDoc Working Group Annual Participation Fees</h2>
+    <p>The AsciiDoc Working Group shall not charge members any fees in 2020. The Steering
+      Committee will establish a fee structure; fees will be due beginning with calendar year 2021.
+      The fees are based on the resource requirements needed to achieve the group&#39;s objectives,
+      to be described in the working group&rsquo;s program plan and budget.</p>
+    <h3>AsciiDoc Partner Member Annual Participation Fees</h3>
+    <p>Partner members are required to execute the Eclipse AsciiDoc Participation
+      Agreement. Partner members will pay no participation fees in 2020.</p>
     <h3>AsciiDoc Committer Member Annual Participation Fees</h3>
     <p>Committer members pay no annual fees, but are required to execute the Eclipse
       AsciiDoc Participation Agreement.</p>
@@ -431,12 +301,20 @@
     <p>Guest members pay no annual fees, but are required to execute the Eclipse AsciiDoc
       Participation Agreement.</p>
     <hr />
-      <p style="text-decoration: underline;"><strong>Charter Version History</strong></p>
-      <ul>
-        <li>v0.1 created April 28, 2019.</li>
-        <li>v0.2 updated August 1, 2019. Minor edits</li>
-        <li>v0.3 updated February 7, 2020. Update of fees.</li>
-        <li>v0.4 updated April 4, 2020.  Minor edits</li>
-      </ul>
+    <p>Charter Version History</p>
+    <ul>
+      <li>v0.1 created April 28, 2019.</li>
+      <li>v0.2 updated August 1, 2019.&nbsp; Minor edits&nbsp;</li>
+      <li>v0.3 updated February 7, 2020. Update of fees</li>
+      <li>v0.4 updated April 4, 2020.&nbsp; Minor edits</li>
+      <li>v0.5 updated June 4, 2020. Eliminate Strategic Member class. Change Participant Member
+        class name to Partner Member. Each Partner Member appoints one representative to the
+        Steering Committee. Eliminate 2020 membership fees. Reserve three Steering Committee seats
+        for Committer Members. Update meeting notice from 30 days to 10 days</li>
+      <li>v0.6 updated June 16, 2020. Clarify that basis for fees must be described in the working
+        group&rsquo;s plan and budget. Reiterate that the Steering Committee&rsquo;s
+        responsibilities include those of the Specification Committee as defined by the Eclipse
+        Foundation Specification Process.</li>
+    </ul>
   </div>
 </div>
diff --git a/workinggroups/wpga/asciidoc-working-group-participation-agreement.pdf b/workinggroups/wpga/asciidoc-working-group-participation-agreement.pdf
index a6c9c5a..1ceb46b 100644
--- a/workinggroups/wpga/asciidoc-working-group-participation-agreement.pdf
+++ b/workinggroups/wpga/asciidoc-working-group-participation-agreement.pdf
Binary files differ