Merge branch 'main' into xueyuanjia-patch-1

Author: plehegar

chair/role.md

@@ -28,7 +28,7 @@ Interested parties should visit the dedicated [Chair Buddy System page](buddy.md
 - Maintains close coordination with W3C *Staff Contact.*
 - Maintains coordination with assigned liaisons from other W3C working groups.
 - Participates in the Chairs mailing list ([archive](https://lists.w3.org/Archives/Member/chairs/)) and attends Chairs meetings.
-- Works with the Communications Team and Team Contact in preparing press release.
+- Works with the Communications Team and Staff Contact in preparing press release.
 - Communicates with the press, when necessary and appropriate, and with prior coordination with the communication team, on behalf of the group.
 - *Ensures all participants have proper access to Group data with assistance from Staff Contact.*
 

council/council-steps.md

@@ -10,34 +10,34 @@ This document describes the different steps to resolve a Formal Objection. It sh
 Note that at any step, the whole process might end by the originator by withdrawing the Formal Objection. This is the best outcome and should always be sought
 
 1.  Formal Objection received
-1.  The Team Contact tries to resolve the Formal Objection before starting the process.
-1.  The FO stands: The Team assigns a "FO Assignee" to handle the Formal Objection. Note that is is not always the Team Contact, but someone having knowledge of the issue raised in the FO.
+1.  The Staff Contact tries to resolve the Formal Objection before starting the process.
+1.  The FO stands: The Team assigns a "FO Assignee" to handle the Formal Objection. Note that is is not always the Staff Contact, but someone having knowledge of the issue raised in the FO.
 1.  The FO Assignee produces a Team Report:
   *   The Team Report is circulated to the Team for review (one week review time)
   *   The Team Report is circulated (at the same time or after Team review) to both parties.
 1.  The FO Assignee updates the [Formal Objection dashboard](https://www.w3.org/Member/wiki/DirectorFOdashboard).
-1.  The Council Team Contact drafts an announcement and call for dismissal reasons with a minimum deadline of two weeks (See this [example](https://lists.w3.org/Archives/Member/w3c-ac-members/2024JanMar/0021.html), and the [Council composition](https://www.w3.org/policies/process/#council-composition)).
+1.  The Council Staff Contact drafts an announcement and call for dismissal reasons with a minimum deadline of two weeks (See this [example](https://lists.w3.org/Archives/Member/w3c-ac-members/2024JanMar/0021.html), and the [Council composition](https://www.w3.org/policies/process/#council-composition)).
   *   Announcement is sent to the AC members list
-1.  The Council Team Contact creates a new [Group](https://www.w3.org/admin/othergroups/list) (name should be _Council-YYYY-MM-\<readable shortname>_) in the db, filled with all the potential members of this Potential Council
-1.  The Council Team Contact creates a new [Mailing List](https://www.w3.org/Systems/Mail/Request/) (name should be _group-council-YYYY-MM-\<readable shortname>_)
-1.  The Council Team Contact tries to find a Chair for the Potential Council
-1.  The Council Team contact circulates the collected dismissal reasons to the Potential Council (1 week to amend or answer)
-1.  The Council Team contact circulates the Team Report while point above is discussed, if available
-1.  The Council Team contact create a WBS for dismissal, with the option to self-recuse, and accept the Chair, if found; if not ask for chairs.
+1.  The Council Staff Contact creates a new [Group](https://www.w3.org/admin/othergroups/list) (name should be _Council-YYYY-MM-\<readable shortname>_) in the db, filled with all the potential members of this Potential Council
+1.  The Council Staff Contact creates a new [Mailing List](https://www.w3.org/Systems/Mail/Request/) (name should be _group-council-YYYY-MM-\<readable shortname>_)
+1.  The Council Staff Contact tries to find a Chair for the Potential Council
+1.  The Council Staff Contact circulates the collected dismissal reasons to the Potential Council (1 week to amend or answer)
+1.  The Council Staff Contact circulates the Team Report while point above is discussed, if available
+1.  The Council Staff Contact create a WBS for dismissal, with the option to self-recuse, and accept the Chair, if found; if not ask for chairs.
 1.  If the Team Report contains a Team Recommendation that can resolve the FO:
-  *   The Council Team contact create a WBS for an [Unanimous Short Ciruit](https://www.w3.org/policies/process/#council-short-circuit)
-  *   TAG and AB Team contact to ensure that _everyone_ is voting
+  *   The Council Staff Contact create a WBS for an [Unanimous Short Ciruit](https://www.w3.org/policies/process/#council-short-circuit)
+  *   TAG and AB Staff Contact to ensure that _everyone_ is voting
   *   If the USC succeed, the Council is not formed and the resolution is accepted
 1.  If the chair is not found, the Potential Council elects one chair
 1.  If the chair is found:
-  *   The Council Team contact announce with Comm the composition of the Council to the AC
-  *   The Council Team contact announce to the Council that the Council started
-  *   The Council Team contact update the FO Dashboard to indicate that the Council started and the date
-  *   The Council Team contact adds to the FO Dashboard the 45 days dealine for this Council
-1.  The Council chair\[s\] (and Council Team contact) may start an [Extraordinary Delegation](https://www.w3.org/policies/process/#council-delegation) WBS
+  *   The Council Staff Contact announce with Comm the composition of the Council to the AC
+  *   The Council Staff Contact announce to the Council that the Council started
+  *   The Council Staff Contact update the FO Dashboard to indicate that the Council started and the date
+  *   The Council Staff Contact adds to the FO Dashboard the 45 days dealine for this Council
+1.  The Council chair\[s\] (and Council Staff Contact) may start an [Extraordinary Delegation](https://www.w3.org/policies/process/#council-delegation) WBS
 1.  The Council takes a decision
 1.  The Council writes a report
-1.  The Council Team Contact ensures that the [W3C Council](https://www.w3.org/about/council/) as well as the FO Dashboard are updated
+1.  The Council Staff Contact ensures that the [W3C Council](https://www.w3.org/about/council/) as well as the FO Dashboard are updated
 1.  The decision is announced to the different parties and the AC
 1.  After the deadline for filing an appeal has passed, archive the Council Mailing List
 

council/council.md

@@ -45,7 +45,7 @@ When a Formal Objection is raised, the Team assigns someone to attempt to resolv
 
 Within the bounds set by the Process, the Team decides how long the assignee has to attempt resolution and to write the report before the decision will be brought to a W3C Council. It is important that not too much time is spent in trying to resolve irreconcilable differences. Appropriate timing will depend on the complexity of the issue, and on the cooperation of the objector(s) and decider(s).
 
-The assignee should be well versed in the topic at hand. The assignee could be the Team Contact for the relevant Working Group, the person that drafted the Charter that is being objected to, or another member of the Team who has familiarity with the situation. It is important that the assignee be perceived as unbiased with respect to the decision under review, and it is extremely important that they execute this task in a way that is as neutral and transparent as possible.
+The assignee should be well versed in the topic at hand. The assignee could be the Staff Contact for the relevant Working Group, the person that drafted the Charter that is being objected to, or another member of the Team who has familiarity with the situation. It is important that the assignee be perceived as unbiased with respect to the decision under review, and it is extremely important that they execute this task in a way that is as neutral and transparent as possible.
 
 The assignee works with all parties to explore whether there is a way to resolve the Formal Objection. If the assignee believes that they have succeeded then the assignee needs ample documentation that the objection is resolved. Resolution requires both the satisfaction of the objectors and ensuring that the proposed resolution does not itself have objectors. Here are some examples:
 
@@ -70,7 +70,7 @@ To avoid leaving people wondering what happened, the Team should post a response
 
 If resolution is not possible in the allocated time frame, the assignee must refer the Formal Objection to the W3C Council for decision. The steps for that are as follows:
 
-- The assignee writes a report for the W3C Council summarizing the decision and the objection.
+- The assignee writes a report for the W3C Council that includes the decision and the objection.
 
   - The document is typically public.
   - If there are limited portions of the document which are confidential, there may be pointers to a separate confidential document. These may be summarized in the main document without compromising confidential information.
@@ -81,16 +81,16 @@ If resolution is not possible in the allocated time frame, the assignee must ref
 - The report should be available for review by the relevant groups and objectors.
 
   - If any participant feels that their viewpoint is not fairly represented, a limited time effort should be made to get all relevant information into the document.
-  - If at the end of the allocated time the Team determines that it is not possible to get agreement on the summary document, then the Team publishes their summary and notes which participants believe that it is not a fair summary. Those participants may write up their own viewpoints.
-  - The assignee should indicate an explicit team contact (which can be the assignee) for comments on the draft document.
+  - If at the end of the allocated time the Team determines that it is not possible to get agreement on the report, then the Team publishes their findings which participants believe that it is not a fair report. Those participants may write up their own viewpoints.
+  - The assignee should indicate an explicit staff contact (which can be the assignee) for comments on the draft document.
 - The W3C Council determines who will rule on this objection and who will chair the Council.
 
   - See [Council Participation, Dismissal, and Renunciation](https://www.w3.org/policies/process/#council-participation) and [Council Chairing](https://www.w3.org/policies/process/#council-chairing).
   - Every person serving on the W3C Council is expected to be sufficiently knowledgeable that they feel comfortable with the decision of the W3C Council. The breadth of the W3C Council membership, and therefore the participation of each of its members, is key to the Council’s ability to provide an appropriate balance of viewpoints.
 - In extraordinary circumstances, the W3C Council may vote to [delegate](https://www.w3.org/policies/process/#council-delegation) or [short-circuit](https://www.w3.org/policies/process/#council-short-circuit) its decision.
 - The W3C Council [deliberates and reaches a decision](https://www.w3.org/policies/process/#council-deliberations) to sustain or overrule the original decision.
 
-  - If the W3C Council members deem that the written summaries are sufficient, they are not required to discuss with participants further, although they may do so if they wish. They may consult with deciders and objectors if they wish. See thoroughness and fairness below.
+  - If the W3C Council members deem that the written reports are sufficient, they are not required to discuss with participants further, although they may do so if they wish. They may consult with deciders and objectors if they wish. See thoroughness and fairness below.
   - Once consultations are completed, the Chair of the W3C Council assesses the consensus of the Council, or if consensus cannot be found, calls for a vote of the W3C Council to sustain or overrule the Formal Objection.
   - If there is disagreement within the Council about the meaning of those sections of the Process that govern the Council itself, in a way that interferes with its ability to discuss the substance of the case, the Chair should try to resolve this by consensus, and should seek advice from the Team contact on how to interpret the Process. If consensus cannot be found, the chair should make a determination, possibly through a vote, to allow the deliberations to move on. Any such point of procedural contention should be covered in the Council Report.
   - The W3C Council [publishes its decision and its rationale](https://www.w3.org/policies/process/#council-decision).
@@ -233,7 +233,7 @@ Ongoing communications
 : As the Formal Objection resolution process unfolds, all parties should be apprised of the status.
     There should be no ambiguity about who is responsible for the current step or what that next step is
     (e.g., the Team is writing a report, the Team is waiting for the Objector or deciders to respond to some question,
-    the W3C Council is being convened, the W3C Council is in deliberations, etc.). The W3C Council Team Contact should ensure that
+    the W3C Council is being convened, the W3C Council is in deliberations, etc.). The W3C Council Staff Contact should ensure that
     such communications take place and the process continues to move forward.
 
 ## Revision History

documentreview/index.md

@@ -73,7 +73,7 @@ The meaning of "Long enough" depends on how many changes there are, how clearly
 <dl>
 <dt>Accessibility</dt>
 <dd>
-  <span class="step">Work through <a rel="nofollow" class="external text" href="https://w3c.github.io/apa/fast/checklist.html">this questionnaire</a></span> then
+  <span class="step">Work through <a rel="nofollow" class="external text" href="https://w3c.github.io/fast/checklist.html">this questionnaire</a></span> then
   <span class="step"><a rel="nofollow" class="external text" href="https://github.com/w3c/a11y-request/issues/new/choose">request a review via GitHub</a> from <a rel="nofollow" class="external text" href="https://www.w3.org/WAI/about/groups/apawg/">APA</a></span>
 <details>
 <summary>Show useful links</summary>
@@ -123,12 +123,12 @@ The meaning of "Long enough" depends on how many changes there are, how clearly
 <dt>Privacy</dt>
 <dd>
   <span class="step">Write a "Privacy Considerations" section for your document, taking into account the <a rel="nofollow" class="external text" href="https://www.w3.org/TR/security-privacy-questionnaire/">Self-Review Questionnaire: Security and Privacy</a>, <a rel="nofollow" class="external text" href="https://www.w3.org/TR/fingerprinting-guidance/">Mitigating Browser Fingerprinting in Web Specifications</a>, and <a rel="nofollow" class="external text" href="https://www.rfc-editor.org/rfc/rfc6973.html">RFC6973</a></span> then
-  <span class="step"><a rel="nofollow" class="external text" href="https://github.com/w3cping/privacy-request/issues/new/choose">request a review via GitHub</a> from the <a rel="nofollow" class="external text" href="https://www.w3.org/groups/ig/privacy/">Privacy Interest Group</a></span>.
+  <span class="step"><a rel="nofollow" class="external text" href="https://github.com/w3cping/privacy-request/issues/new/choose">request a review via GitHub</a> from the <a rel="nofollow" class="external text" href="https://www.w3.org/groups/wg/privacy/">Privacy Working Group</a></span>.
 <details>
 <summary>Show useful links</summary>
 <ul>
 <li>groups
-<ul><li> <a rel="nofollow" class="external text" href="https://www.w3.org/groups/ig/privacy/">Privacy Interest Group</a>; <a rel="nofollow" class="external text" href="https://lists.w3.org/Archives/Public/public-privacy/">public-privacy</a></li></ul></li>
+<ul><li> <a rel="nofollow" class="external text" href="https://www.w3.org/groups/wg/privacy/">Privacy Working Group</a>; <a rel="nofollow" class="external text" href="https://lists.w3.org/Archives/Public/public-privacy/">public-privacy</a></li></ul></li>
 <li>links
 <ul>
 <li><a rel="nofollow" class="external text" href="https://www.w3.org/TR/security-privacy-questionnaire/"><cite>Self-Review Questionnaire: Security and Privacy</cite>, published by the TAG and PING</a></li>

github/faq.md

@@ -19,9 +19,9 @@ You can just publish HTML as you normally would simply by setting up [GitHub Pag
 
 W3C projects include W3C staff selected projects as well as W3C Working (Interest) Group projects. It is possible that we decide to assess other group's requests to host a given repository. In any case, a prerequisite would be identifying the owner(s) either by name or by e-mail address. Refer to [the Guidebook for Community Groups](https://www.w3.org/2016/04/cg-support/#what) for more information.
 
-1. Your Team Contact should become (if they're not already) a part of the [Owners Team](https://github.com/organizations/w3c/settings/owners) of the W3C organization. (Ask any of the current owners directly, or ask on &sysreq. This is only for W3C Staff.)
-1. If there is no GitHub team roughly matching the group that will be pushing to that repository, the Team Contact should create a new team for the editors who will be contributing to the document, and give that team push and pull access.
-1. W3C staff (or Team Contacts of the group) create a new repository for each document (each deliverable, it can of course contain multiple resources). Add each such repository to the GitHub team so that the contributors all have push access. Other people can suggest changes by submitting pull requests (in fact, editors can do that too to enable reviewing before commits, if desired), but not every contributor will be given direct commit access.
+1. Your Staff Contact should become (if they're not already) a part of the [Owners Team](https://github.com/organizations/w3c/settings/owners) of the W3C organization. (Ask any of the current owners directly, or ask on &sysreq. This is only for W3C Staff.)
+1. If there is no GitHub team roughly matching the group that will be pushing to that repository, the Staff Contact should create a new team for the editors who will be contributing to the document, and give that team push and pull access.
+1. W3C staff (or Staff Contacts of the group) create a new repository for each document (each deliverable, it can of course contain multiple resources). Add each such repository to the GitHub team so that the contributors all have push access. Other people can suggest changes by submitting pull requests (in fact, editors can do that too to enable reviewing before commits, if desired), but not every contributor will be given direct commit access.
 
 ### Detailed steps for staff contacts to create a repo {#steps}
 

github/w3c.json.md

@@ -70,7 +70,7 @@ The fields that are understood at this point are:
    : Other purposes
 
 `policy`
-: This is essentially a W3C-internal flag. If set to `open`, any W3C Team member should feel empowered to help with the management of this given repository. This can be set to `restricted` to indicate that for whatever reason, it is preferable to let the repository be handled only by team contacts directly associated with it. The default value is `open`.
+: This is essentially a W3C-internal flag. If set to `open`, any W3C Team member should feel empowered to help with the management of this given repository. This can be set to `restricted` to indicate that for whatever reason, it is preferable to let the repository be handled only by staff contacts directly associated with it. The default value is `open`.
 
 `exposed`
 : This flag indicates if a repository gets exposed in the [W3C group pages](https://www.w3.org/groups/). By default, all public repositories will get exposed (`exposed:true`) and all private repositories will not get exposed (`exposed:false`).