Merge branch 'master' of https://github.com/apache/incubator
# Conflicts:
# pages/policy/incubation.ad
diff --git a/pages/guides/roles_and_responsibilities.ad b/pages/guides/roles_and_responsibilities.ad
index 348af26..b893523 100644
--- a/pages/guides/roles_and_responsibilities.ad
+++ b/pages/guides/roles_and_responsibilities.ad
@@ -1,7 +1,7 @@
= Roles and Responsibilities
Apache Incubator PMC
2002-10-16
-:jbake-type: policy
+:jbake-type: guide
:jbake-status: published
:idprefix:
:toc:
diff --git a/pages/policy/incubation.ad b/pages/policy/incubation.ad
index ea0bf4b..c45ee8d 100644
--- a/pages/policy/incubation.ad
+++ b/pages/policy/incubation.ad
@@ -7,7 +7,19 @@
:toc:
:imagesdir: ../images/
-In October 2002 the Board of Directors of the Apache Software Foundation passed a resolution creating the Apache Incubator PMC (referred to as the "Incubator PMC") charged with "accepting new products into the Foundation, providing guidance and support to help each new product engender their own collaborative community, educating new developers in the philosophy and guidelines for collaborative development as defined by the members of the Foundation, and proposing to the board the promotion of such products to independent PMC status once their community has reached maturity".
+In October 2002 the Board of Directors of the Apache Software Foundation passed
+a resolution to establish the Apache Incubator PMC. Quoting the
+link:https://www.apache.org/foundation/records/minutes/2002/board_minutes_2002_10_16.txt[October 16th, 2002 Board Minutes]:
+
+[quote, ASF Board Meeting, October 16th 2002]
+...establish a Project Management Committee charged with
+ accepting **new products** into the Foundation, providing **guidance
+ and support** to help each new product engender their own
+ collaborative community, **educating new developers in the
+ philosophy and guidelines** for collaborative development as
+ defined by the members of the Foundation, and proposing to the
+ board **the promotion of such products to independent PMC
+ status** once their community has reached maturity.
See the October 2002 link:https://www.apache.org/foundation/board/calendar-1999-2004.html#2002 [Board report] for the resolution.
@@ -25,6 +37,9 @@
The document makes use of the terms MUST, MUST NOT, REQUIRED, SHALL, SHALL NOT, SHOULD, SHOULD NOT, RECOMMENDED, MAY and OPTIONAL. Where capitalized, these terms are used as defined in link:http://www.ietf.org/rfc/rfc2119.txt[RFC 2119].
+Like many policy documents this is not the most fun thing to read. Our link:/cookbook[Cookbook]
+provides more concrete information on the incubation process.
+
== Scope
This document contains the minimum requirements and processes that MUST be met by Podlings undergoing incubation.
