You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@incubator.apache.org by jm...@apache.org on 2019/07/25 01:54:28 UTC

[incubator] branch master updated: fix links and spelling, clarify a a couple of things and remove a couple of misleading or unneeded items

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

jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator.git


The following commit(s) were added to refs/heads/master by this push:
     new c395646  fix links and spelling, clarify a a couple of things and remove a couple of misleading or unneeded items
     new 2a68a59  Merge pull request #13 from justinmclean/master
c395646 is described below

commit c39564653652128fada39855efa5ac6e03c236a3
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Jul 25 11:32:13 2019 +1000

    fix links and spelling, clarify a a couple of things and remove a couple of misleading or unneeded items
---
 pages/guides/ppmc.ad                       |  4 +-
 pages/guides/publicity.ad                  |  2 +-
 pages/guides/releasemanagement.ad          |  4 +-
 pages/guides/sites.ad                      | 25 ++++--------
 pages/guides/transferring.ad               |  2 +-
 pages/policy/process.ad                    |  2 +-
 pages/policy/roles_and_responsibilities.ad | 62 +++++++++++-------------------
 pages/whoweare.ad                          |  2 +-
 8 files changed, 39 insertions(+), 64 deletions(-)

diff --git a/pages/guides/ppmc.ad b/pages/guides/ppmc.ad
index 1a43e9c..17767e2 100644
--- a/pages/guides/ppmc.ad
+++ b/pages/guides/ppmc.ad
@@ -95,8 +95,8 @@ It is required for mentors to sign off on podling reports.
 - Mentors must sign off on the podling report.  If there is no mentor sign off, the report from that podling will not be accepted and they will be moved to monthly, expected to report next month.
 
 Podling reports get added to the Incubator wiki
-- All podling reports must be added to the link:http://wiki.apache.org/incubator/[Incubator wiki]
-- Follow the instructions in your monthly reminder, and post on the &lt;Month&gt;&lt;Year&gt; page, with the provided template
+- All podling reports must be added to the link:https://cwiki.apache.org/confluence/display/INCUBATOR/Home[Incubator wiki]
+- Follow the instructions in your report reminder, and post on the &lt;Month&gt;&lt;Year&gt; page, with the provided template
 
 == Project Status Page
 In addition to the quarterly status reports, each Podling has a
diff --git a/pages/guides/publicity.ad b/pages/guides/publicity.ad
index 97950b9..3dcd609 100644
--- a/pages/guides/publicity.ad
+++ b/pages/guides/publicity.ad
@@ -33,7 +33,7 @@ No formal press releases or announcements of any kind are allowed to be dissemin
 
 Apache podlings and their communities are encouraged to actively build awareness of their project through emails, blog posts, tweets, and other means of outreach. Educational opportunities include MeetUps, videos, podcasts, articles, conferences, and related community events.
 
-Whilst speaking with members of the media and analyst community, podlings must be referred to as "Apache _Podling Name_" as per the Branding Guidelines, along with explaining the requisite podling disclaimer(s). Be prepared to answer "who uses you?": as a podling’s known user base grows, PMCs (Project Management Committees) are welcome to promote their users in a "Powered By" page such as  https://wiki.apache.org/hadoop/PoweredBy[Apache Hadoop's Powered By page]. Create and promote podli [...]
+Whilst speaking with members of the media and analyst community, podlings must be referred to as "Apache _Podling Name_" as per the Branding Guidelines, along with explaining the requisite podling disclaimer(s). Be prepared to answer "who uses you?": as a podling’s known user base grows, PMCs (Project Management Committees) are welcome to promote their users in a "Powered By" page such as  https://cwiki.apache.org/hadoop/PoweredBy[Apache Hadoop's Powered By page]. Create and promote podl [...]
 
 Podlings are advised to prepare news announcements and hone their messaging _privately_ within their PMCs (keeping the content confidential to the PMC, and not on dev@, user@ or any other public list or forum) to ensure that the public or press don’t scoop your story before it’s out or publish inaccurate information. At times messaging changes, features are unable to be delivered as intended, testimonials need adjusting, and so on, and it’s best to minimize the chances of your story to g [...]
 
diff --git a/pages/guides/releasemanagement.ad b/pages/guides/releasemanagement.ad
index c049245..0665c2a 100644
--- a/pages/guides/releasemanagement.ad
+++ b/pages/guides/releasemanagement.ad
@@ -27,7 +27,7 @@ fully engaged in the review process.  A podling community should begin to famili
 with the ASF policies for releases.  Those policies can be found at
 link:http://www.apache.org/dev/#releases[http://www.apache.org/dev/#releases].
 
-ASF compliant releases are always produced by an Apache PMC.  For podlings  this is the IPMC.  This is
+ASF compliant releases are always produced by an Apache PMC.  For podlings this is the IPMC.  This is
 why it is mandatory to have at least 3 {plusone} votes from
 link:/incubation/roles_and_responsibilities.html#incubator_project_management_committee_ipmc[IPMC members].
 Usually your link:/incubation/roles_and_responsibilities.html#mentor[mentors] (who are also IPMC members)
@@ -40,7 +40,7 @@ Others issues may be resolved in later releases.  Those voting on the release wi
 on this information.
 
 If you do not understand the feedback you receive, or if you believe that it is misguided,
-please say so!  We are all learning, and discussion is an important part of open source development.
+please say so! We are all learning, and discussion is an important part of open source development.
 
 == Requesting feedback on interim non-ASF releases
 
diff --git a/pages/guides/sites.ad b/pages/guides/sites.ad
index 05d2feb..efaf979 100644
--- a/pages/guides/sites.ad
+++ b/pages/guides/sites.ad
@@ -33,10 +33,8 @@ the Incubator PMC.
 - The published site for each podling must conform to the guidelines in link:/guides/branding.html[Podling Branding/Publicity].
 - Podlings should review link:https://www.apache.org/foundation/marks/linking[Corporate Recognition Best Practices], link:https://www.apache.org/foundation/marks/resources[Apache trademark information], and must aim to be in compliance with link:https://www.apache.org/foundation/marks/pmcs[Apache Project Website Branding Policy]
 - The sources for every podling site sources should be maintained in the podling's site SVN or git directory
-- The published site for each podling should conform to this URL space: #http://podlingname.incubator.apache.org/#
-- The staging site (if using CMS) for each podling should conform to this URL space: #http://podlingname.staging.apache.org/#
-- Every podling should maintain an incubation status file under: #http://incubator.apache.org/projects/podlingname.html#
-- Eventual extra incubation documents should be filed under: #http://incubator.apache.org/projects/podlingname/**#
+- The published site for each podling should conform to this URL space: #http://podlingname.incubator.apache.org/# or #http://podlingname.apache.org/#
+- Every podling should maintain an incubation status file under: #http://incubator.apache.org/projects/podlingname.html# (this is generated)
 
 == Creating the Podling Website
 === Creating A Good Podling Site
@@ -55,9 +53,7 @@ after incubation to a permanent place in the TLP home.
 - Committers: a list of current committers on the project.
 - Mailing Lists: there are several mailing lists that the community might be interested in, and this page contains mailto: links that allow easy subscription (and unsubscription) to any of them.
 - FAQ: frequently asked questions are answered here.
-- Road Map: if the project has a vision of future community or development activities, the road map is published here.
 - Source Code: links to the browsable source repository and git or svn commands to check out the sources.
-- Coding Standards: the coding standards for submitted code by the community, along with a description of how strict the project intends to be.
 - Issue Tracking: links to the JIRA or other issue tracking tool, possibly including frequently used filters for issue lists.
 - Dependencies: other projects that this project depends on.
 - favicon: the project's icon in a format suitable for a browser's address bar. If absent, an Apache Feather will be displayed.
@@ -70,25 +66,20 @@ with, you can continue to use it. If you do not, consider using
 the Jekyll based link:http://www.apache.org/dev/cmsref.html[Apache website template].
 
 Regardless of which tool you use, the web site should be maintained
-in the svn/git repository, and include the site generation tool as a binary
-file. This simplifies the process of site generation and enables changes
+in the svn/git repository, and include the site generation tool.
+This simplifies the process of site generation and enables changes
 to the site to be made by any committer. The generated site should also
-be checked into svn/git. This allows the generated site to be relocated
-to any part of the Apache site after incubation is complete.
-
-Since the site is independent of the code, it should exist high in
-the svn/git repository, e.g. parallel to the trunk of the source tree.
+be checked into svn/git.
 
 === Publishing Your Website
 
-Managing a podling's website is now the same as a top-level project.  Review the link:http://www.apache.org/dev/project-site.html[Infra Documentation on Project Websites]
+Managing a podling's website is the same as a top-level project.
+Review the link:http://www.apache.org/dev/project-site.html[Infra Documentation on Project Websites]
 
 === Using A Wiki To Create Documentation
 
 Podlings may use a wiki to create documentation (including the website) providing that follow the
-link:http://cwiki.apache.org/[guidelines]. In particular, care must be taken to
-ensure that access to the wiki used to create documentation that may be included in the project
-release is restricted to only those with filed link:http://www.apache.org/licenses/[individual CLAs].  The PPMC MUST review all changes and ensure that trust is not abused.
+link:http://cwiki.apache.org/[guidelines].
 
 === Web Site Transition
 
diff --git a/pages/guides/transferring.ad b/pages/guides/transferring.ad
index ced4eac..37cf5ad 100644
--- a/pages/guides/transferring.ad
+++ b/pages/guides/transferring.ad
@@ -82,7 +82,7 @@ Users with member or pmc-chairs karma can do this.
 - Review appropriate documentation:
 ** link:http://www.apache.org/dev/pmc.html#chair[PMC Chair Duties]
 ** PMC link:http://www.apache.org/dev/#pmc[documentation]
-** Jakarta link:http://wiki.apache.org/jakarta/RoleOfChair[Chair guide]
+** Jakarta link:http://cwiki.apache.org/jakarta/RoleOfChair[Chair guide]
 ** Incubator link:http://incubator.apache.org/guides/chair.html[Chair guide]
 ** Reporting link:http://www.apache.org/foundation/board/calendar.html[calendar]
 - Work out a reporting schedule with the link:/policy/roles_and_responsibilities.html#board[Board]. For
diff --git a/pages/policy/process.ad b/pages/policy/process.ad
index 614cc2b..f2cde5e 100644
--- a/pages/policy/process.ad
+++ b/pages/policy/process.ad
@@ -11,7 +11,7 @@ Apache Incubator PMC
 This document is an overview of the process. Read it in conjunction with the "Incubation Policy" and the various guides. Also review the Roles and Responsibilities for a description of the various parties involved in the Incubation process.
 
 == The Process of Incubation
-The incubation process covers the establishment of a candidate, acceptance (or rejection) of a candidate leading to the potential establishment of a Podling and associated incubation process, which ultimately leads to the establishment or a new Apache Top-Level-Project (TLP) or sub-project within an existing Apache Project.
+The incubation process covers the establishment of a candidate, acceptance (or rejection) of a candidate leading to the potential establishment of a Podling and associated incubation process, which ultimately leads to the establishment of a new Apache Top-Level-Project (TLP) or sub-project within an existing Apache Project.
 
 image::incubation-process.png[]
 
diff --git a/pages/policy/roles_and_responsibilities.ad b/pages/policy/roles_and_responsibilities.ad
index 8c93b50..348af26 100644
--- a/pages/policy/roles_and_responsibilities.ad
+++ b/pages/policy/roles_and_responsibilities.ad
@@ -13,8 +13,7 @@ This document describes the roles (including Sponsor, Contributor, Mentor) and p
 
 The link:http://www.apache.org/foundation/board/[Board Of Directors] of the
 link:http://www.apache.org/foundation/[Apache Software Foundation]
-manages
-the organizational affairs of the Foundation.
+manages the organizational affairs of the Foundation.
 The board is elected by the
 link:http://www.apache.org/foundation/members.html[Apache Members].
 
@@ -22,8 +21,7 @@ The Board delegates responsibility for incubation to the
 link:#Incubator+Project+Management+Committee+%28PMC%29[IPMC].
 
 link:http://www.apache.org/foundation/board/[Directors]
-are often active in the
-Incubator.
+are often active in the Incubator.
 link:http://www.apache.org/foundation/how-it-works.html#hats[Conventionally],
 unless indicated otherwise, individuals speak personally. So, a Director speaking
 without their Board hat is not stating policy but expressing a personal opinion.
@@ -35,7 +33,7 @@ See also: link:http://www.apache.org/foundation/how-it-works.html#management[How
 The Incubator PMC [link:https://whimsy.apache.org/board/minutes/Incubator.html#minutes_2002_10_16[resolution]] is responsible for:
 
 * acceptance and oversight of candidate projects submitted or proposed to become part of the Foundation;
-* providing guidance and ensuring that sub-projects under it's purview develop products according to the Foundation's philosophy and guidelines for collaborative development;
+* providing guidance and ensuring that podlings under it's purview develop products according to the Foundation's philosophy and guidelines for collaborative development;
 * providing a repository for the storage of incubation history and information;
 * assisting a Podling's Mentor in discharging her/his duties;
 * regularly evaluating projects under its purview for the purposes of recommending to the Sponsor whether the project should:
@@ -56,15 +54,12 @@ role of reviewing the status of a project under incubation.
 Finally, the Incubator PMC is the ASF body with the greatest level of
 expertise and experience in the Incubation process. They provide a
 store of knowledge that can be called on by the Mentor or a Podling
-during (or even after) the incubation process. In cases where an
-Incubation is particularly large, or where the Incubator PMC
-otherwise feels the Mentor needs additional assistance, the Incubator
-PMC may choose to provide an experienced Mentor to assist the main
-Mentor in discharging their duty.
+during (or even after) the incubation process.
 
 Individuals may be nominated to join the IPMC after a vote which
-passes with more than 3/4 of those voting. Additionally, any Member of the
-Apache Software Foundation may join the IPMC by request.
+passes.
+Additionally, any Member of the Apache Software Foundation may join
+the IPMC by request.
 
 See also: link:http://www.apache.org/foundation/how-it-works.html#management[How Apache Works]
 
@@ -93,9 +88,8 @@ by the Champion to the Sponsor for acceptance as a Podling.
 Acceptance of a candidate shall be subject to the formal voting
 method of the Sponsor. Should that vote be accepted, the Sponsor will
 request that the Incubator PMC accept the candidate as a Podling
-under incubation. The Sponsor shall assign a Mentor, who shall be
-granted membership of the Incubator PMC for the duration of the
-incubation process.
+under incubation. The Sponsor shall assign several Mentors, who must
+Incubator PMC members.
 
 == Champion
 
@@ -128,15 +122,15 @@ process.
 
 A Sponsor will be one of:
 
-* A Top Level Project within the ASF. In this case, the project in question has agreed that the candidate is a good fit for their project, and will take on the candidate as a sub-project upon successful completion of Incubation.
+* A Top Level Project within the ASF. In this case, the project in question has agreed that the
+candidate is a good fit for their project, and will take on the candidate as a sub-project upon
+successful completion of Incubation.
 * The Incubator PMC. In this case, the Incubator PMC agrees that the
 project in question will make a good addition to the ASF, but there
 is no clear "owner" of the candidate should it successfully complete
-incubation. An incubation exit requirement for such candidates will
-be the identification (and successfully lobbying) of an "owner" entity
-* either the link:#board[Board] (and the candidate will be a TLP) or another
-project. In most cases, the Incubator PMC is the correct Sponsor (Candidates should discuss this
-with their Champion).
+incubation.
+In most cases, the Incubator PMC is the correct Sponsor (Candidates should
+discuss this with their Champion).
 
 [NOTE]
 ====
@@ -161,7 +155,7 @@ expected to remedy the situation.
 ====
 
 == Responsibilities of the Sponsor
-- to provide initial approval for a Canidate to be accepted as a Podling
+- to provide initial approval for a Candidate to be accepted as a Podling
 - to nominate Mentors for the incubation process
 
 == Mentor
@@ -180,33 +174,29 @@ a timely manner and ensure that decisions or resolutions affecting
 the Podling are communicated promptly and expeditiously;
 - to represent the interests of the Podling on the Incubator PMC;
 - to liaise between the ASF Secretary and the Podling on matters
-concerning CLA submission and acknowledgments;
+concerning CLA submission and acknowledgements;
 - to liaise between the ASF Infrastructure team and the Podling on
-matters concerning infrastructure support (mailing lists, CVS
+matters concerning infrastructure support (mailing lists, version control
 establishment, account establishment, etc.);
 - to assist the Podling on matters concerning the resolution of license
 transfers, copyright assignments, and/or software grants where
 applicable; and
 - to provide where and as appropriate, guidance on matters concerning
-Apache policies and practices - including the establishment of its
-internal steering committee.
+Apache policies and practices.
 
 === Responsibilities toward the Incubator PMC
 
 - monitoring the Podling through the incubation process;
-- evaluating the compliance of the Podling with Incubator PMC policies
+- evaluating the compliance of the Podling with Incubator and ASF policies
 and procedures;
 - assessment of the Podling status with respect to continuation/exit
 strategy;
-- to notify the Incubator PMC and Sponsor of the completion of
-administrative actions; and
 - to provide updates to the Incubator PMC and Sponsor on the status of
 license grants (where and as appropriate) and other relevant legal
 information pertaining to the Podling.
 
 === Responsibilities toward the Sponsor
-- provide status to the Sponsor as to the progress
-of the podling
+- provide status to the Sponsor as to the progress of the podling
 
 == Committers
 
@@ -215,11 +205,7 @@ All committers on podlings should be familiar with link:http://www.apache.org/de
 The candidate shall declare an initial set of committers. On
 acceptance of a candidate project, the assigned Mentors shall be given
 access to the Podling's repository for the duration of the
-incubation process. This is to allow the Mentors to perform their
-incubation duties, and is for administrative purposes only. To be
-given full committer privileges, such as the right to add new code to
-the repository, the Mentors must earn them as would any other
-potential new committer. In some cases, the Mentors may be part of the
+incubation process. In some cases, the Mentors may be part of the
 initial set of declared committers, but this is not a requirement of
 the Incubation process.
 
@@ -248,8 +234,6 @@ During the incubation, the committers will be expected to show how,
 as a group, they are upholding the ideals of the Apache community. In
 particular, as the Podling evolves it is anticipated that the Podling
 will establish procedures for the introduction of new committers
-through a process consistent with established Apache practices. If
-you are aiming for TLP status you may also want to start on drafting
-the policy and procedures you aim to put in place once accepted.
+through a process consistent with established Apache practices.
 
 
diff --git a/pages/whoweare.ad b/pages/whoweare.ad
index 679e913..7de09b5 100644
--- a/pages/whoweare.ad
+++ b/pages/whoweare.ad
@@ -22,7 +22,7 @@ learn from common mistakes and as a community we all grow together.
 == The Incubator Project Management Commitee (PMC)
 The Incubator PMC is responsible to the link:http://www.apache.org/foundation/board/[Board]
 for the management of the Incubator Project. Only votes cast by members of the incubator PMC
-are binding upon Apache. The work that this project is charged with overseeing differs from 
+are binding upon Apache incubator releases. The work that this project is charged with overseeing differs from 
 other projects and so functions a little differently. 
 For more details read the link:/guides/pmc.html[Incubator PMC guide].
 


---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org