Merge pull request #65 from justinmclean/master
fix link and bold some text
diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000..77017e6
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,7 @@
+github:
+ description: "Apache Incubator Website"
+ homepage: "https://incubator.apache.org/"
+ labels:
+ - incubator
+ - website
+ - jbake
diff --git a/README.md b/README.md
index df5bd42..3b43625 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +13,12 @@
## Automated publishing - Website and Clutch data
Commits to the `master` branch are automatically checked out and built using `build_site.sh` by the
-[Incubator GIT Site - part 2](https://builds.apache.org/view/H-L/view/Incubator/job/Incubator%20GIT%20Site%20-%20part%202/)
+[Incubator GIT Site - part 2](https://ci-builds.apache.org/job/Incubator/job/Incubator-GIT-Site-part-2/)
Jenkins job. The results are pushed to the [`content` folder of the `asf-site` branch](https://github.com/apache/incubator/tree/asf-site/content)
which is in turn published automatically to http://incubator.apache.org/ by the ASF's `gitwcsub` mechanism.
The data for http://incubator.apache.org/clutch/ takes longer to build so it is handled by a separate
-[SVN Clutch Analysis - part 1](https://builds.apache.org/view/H-L/view/Incubator/job/Incubator%20SVN%20Clutch%20Analysis%20-%20part%201/)
+[SVN Clutch Analysis - part 1](https://ci-builds.apache.org/job/Incubator/job/Incubator-SVN-Clutch-Analysis-part-1/)
Jenkins job that runs the `build_clutch.sh` script that's scheduled to run regularly. The results are stored in the
[`reserve` folder of the `asf-site` branch](https://github.com/apache/incubator/tree/asf-site/reserve)
diff --git a/assets/css/base.css b/assets/css/base.css
index d0e56f2..a8a7fe2 100644
--- a/assets/css/base.css
+++ b/assets/css/base.css
@@ -5,6 +5,7 @@
body {
height: 100%;
/* The html and body elements cannot have any padding or margin. */
+ font-size: 14pt;
}
/* Wrapper for page content to push down footer */
@@ -50,4 +51,4 @@
/*code {
font-size: 80%;
-}*/
\ No newline at end of file
+}*/
diff --git a/bake.sh b/bake.sh
index 2c844b4..b781bc6 100755
--- a/bake.sh
+++ b/bake.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [[ -z ${JBAKE_HOME} ]]
+if [ -z ${JBAKE_HOME} ]
then
echo "Missing JBAKE_HOME variable" >&2
exit 1
diff --git a/pages/cookbook/index.ad b/pages/cookbook/index.ad
index c12363e..d71cabf 100644
--- a/pages/cookbook/index.ad
+++ b/pages/cookbook/index.ad
@@ -144,16 +144,32 @@
== Podling Releases
-A podling is expected to make several software releases during incubation, that gradually progress towards being fully conformant to the link:http://www.apache.org/legal/release-policy.html[ASF Release Policy].
+A podling is expected to make **several software releases** during incubation, that gradually progress towards being fully conformant to the link:http://www.apache.org/legal/release-policy.html[ASF Release Policy]. Fully conformant releases are a condition for graduation.
-In addition to following that policy, podling releases must include the word "incubating" in any release file names and a link:https://incubator.apache.org/policy/incubation.html#disclaimers[DISCLAIMER] to avoid any confusion as to the project's status. As podlings are not "real" ASFprojects yet, it is crucial to set expectations right.
+Podling releases must also include the word "incubating" in any release file names and include a DISCLAIMER or DISCLAIMER-WIP as per the
+https://incubator.apache.org/guides/releasemanagement.html#choice_of_disclaimers[Incubator Releases Guide],
+to prevent any confusion as to the project’s status. As podlings are not yet "real" ASF projects, it is important to set expectations right.
-Also, voting on podling releases happens in two phases:
+Note that Apache Releases consist of source code only. However it is common for our projects to also distribute
+link:http://www.apache.org/legal/release-policy.html#compiled-packages[compiled packages] along with their releases. The focus is on the actual
+source code releases and all distributed compiled packages are based on those "official" releases.
- * First, the podling votes on the release on their dev mailing list, with PPMC members votes being "binding" and others being welcome to cast consultative votes. The main goal of this vote is for the podling community to practice and learn how to vote on releases.
- * Then, if that first vote is successful, an Incubator PMC vote is held on the Incubator general mailing list. This vote is required to make the release an Act of the Foundation.
-
-Incubation mentors can optionally indicate that their votes in the first phase can be carried on to the Incubator PMC vote. If three mentors have voted this means the "three +1 votes" requirement is already fulfilled when that second vote starts, which can speed up things.
+== Two-phase vote on Podling Releases
+
+Voting on podling releases happens in two phases:
+
+ * First, the podling votes on the release on their dev mailing list. The main goal of this vote is for the podling community
+ to practice and learn voting on releases. The vote is successful if there are at least three +1 votes from PPMC members,
+ and more +1 than -1 votes from PPMC members.
+ * Then, if that first vote is successful, an Incubator PMC vote is held on the Incubator General mailing list. This is required
+ to make the vote an Act of the Foundation, as for all ASF releases.
+
+Votes from the podling dev list should be carried over to the Incubator PMC vote, by explicitly mentioning the podling vote result
+and including a link:http://lists.apache.org[lists.apache.org] link to the podling vote tally, in the Incubator PMC [VOTE] message. This
+allows votes from mentors and other Incubator PMC members to be binding in the Incubator PMC vote, without people having to vote twice.
+
+Both the podling and Incubator votes follow the standard link:https://www.apache.org/foundation/voting[ASF voting principles]: they
+are majority votes that last at least 72 hours and if people vote several times only their last vote counts.
== Podling, Top-level Project, what are the differences?
@@ -168,6 +184,7 @@
* The decision to elect people as committers or PPMC members, or both, is similar to TLPs. A podling can decide that candidates are elected to the PPMC directly, or make them committers first and wait a bit to "promote" the as PPMC members. Committers, on the other hand, have no formal decision power, so a two-stage process is often preferred, but it's not a requirement. Read link:https://www.apache.org/foundation/how-it-works.html[How the ASF works] for more information about this.
* TLPs report link:https://www.apache.org/foundation/board/reporting[to the ASF Board of Directors], whereas podlings report link:https://cwiki.apache.org/confluence/display/INCUBATOR/Reports[to the Incubator PMC]. Both report monthly initially, then quarterly.
* Each TLP has a link:https://apache.org/dev/pmc.html[PMC Chair] who acts as a liaison between the TLP and the Board. PMC Chairs are _not_ project leaders. It's an administrative role even though they get a VP title due to the ASF's organization. Podlings do not have this role, incubation mentors are volunteer community members act as the liaison between the podling and the Incubator PMC.
+ * Podling releases require a two-phase vote as described elsewhere in this cookbook.
The ASF strongly encourages projects to grow and renew their roster regularly, to foster project sustainability. Both podlings and TLPs should be actively looking to elect new committers and PMC members by keeping an eye on who's active in their communities.
@@ -194,7 +211,8 @@
Once the discussion dies down on the graduation proposal, a [VOTE] is started on the Incubator general mailing list, in which Incubator PMC Members cast their votes to accept recommending graduation to the ASF's Board of Directors.
-This vote follows the standard link:https://www.apache.org/foundation/voting[ASF voting principles], it's a majority vote that lasts at least 72 hours.
+This vote follows the standard link:https://www.apache.org/foundation/voting[ASF voting principles], it's a majority vote that lasts at least 72 hours and if people
+vote several times only their last vote counts.
== ASF Board Resolution
diff --git a/pages/guides/chair.ad b/pages/guides/chair.ad
index 7469c45..59f4d32 100644
--- a/pages/guides/chair.ad
+++ b/pages/guides/chair.ad
@@ -18,6 +18,10 @@
:toc:
:imagesdir: ../images/
+== This guide is for the Incubator Chair and PMC
+
+This page is guidance for the Incubator Chair and PMC. Guidance for podlings is found at link:/guides/ppmc.html[Podling Guide].
+
== Adding New Incubator PMC Members
For a new PMC member being voted in, follow the link:http://www.apache.org/dev/pmc.html#newpmc[standard procedure].
diff --git a/pages/guides/graduation.ad b/pages/guides/graduation.ad
index e424c3a..4f9c069 100644
--- a/pages/guides/graduation.ad
+++ b/pages/guides/graduation.ad
@@ -294,11 +294,7 @@
Committers can access the podling template for
resolutions in the
link:https://svn.apache.org/repos/private/committers/board/templates/podling-tlp-resolution.txt[committers svn repository]. Your link:https://whimsy.apache.org/roster/ppmc/[whimsy roster] also includes a feature to draft a resolution. Also, resolutions are included in the Board minutes, which are posted publicly
-link:http://www.apache.org/foundation/board/calendar.html[here ] . These contain numerous examples. Good examples include:
-
-- Harmony (see section *E. Establish the Apache Harmony project* in the link:http://www.apache.org/foundation/records/minutes/2006/board_minutes_2006_10_25.txt[October 2006 Board minutes])
-- OFBiz (see section *B. Establish Apache Open for Business Project* in the link:http://www.apache.org/foundation/records/minutes/2006/board_minutes_2006_12_20.txt[December 2006 Board minutes])
-- Cayenne (see section *C. Establish Apache Cayenne Project* in the link:http://www.apache.org/foundation/records/minutes/2006/board_minutes_2006_12_20.txt[December 2006 Board minutes])
+link:http://www.apache.org/foundation/board/calendar.html[here ] . These contain numerous examples.
The original proposal and the status document should
be consulted when creating this document. Projects
diff --git a/pages/guides/names.ad b/pages/guides/names.ad
index cefd024..9e56bac 100644
--- a/pages/guides/names.ad
+++ b/pages/guides/names.ad
@@ -36,9 +36,9 @@
link:http://www.apache.org/foundation/[V.P., Brand Management] (and
link:http://www.apache.org/foundation/marks/#whoweare[team]). Please start by reading:
--the link:http://www.apache.org/foundation/marks/[Apache Trademark Policy] (which introduces trademarks and outlines our policy);
--the link:http://www.apache.org/foundation/marks/faq/[Apache Trademark FAQs] (which answers questions asked by downstream consumers); and
--the link:http://www.apache.org/foundation/marks/pmcs.html[Apache Project Branding Requirements] (which guides PMCs).
+- the link:http://www.apache.org/foundation/marks/[Apache Trademark Policy] (which introduces trademarks and outlines our policy);
+- the link:http://www.apache.org/foundation/marks/faq/[Apache Trademark FAQs] (which answers questions asked by downstream consumers); and
+- the link:http://www.apache.org/foundation/marks/pmcs.html[Apache Project Branding Requirements] (which guides PMCs).
For podlings in the Incubator, naming issues are managed co-operatively by the Brand and Incubator communities.
Rules for podlings include all branding requirements for PMCs, plus a few extras.
@@ -260,7 +260,11 @@
Registration of trademark is not required. Rights may also be obtained by use of a mark in commerce.
Use a variety of web search engines (for example, link:http://www.bing.com[bing], link:http://www.google.com[google]
-and link:http://search.yahoo.com[yahoo]) to survey usage on the world wide web.
--The results returned by a search for the name itself may provide evidence of well known usages of the term.
--The results returned by searching for the name and _software_ may provide evidence of existing use in trade. You may also want to search for the name and key functionality the software provides
-and name and _open source_
+and link:http://search.yahoo.com[yahoo]) to survey usage on the world wide web.
+
+Search for:
+
+- The name itself (e.g., `Cassandra`). The results returned by a search for the name itself may provide evidence of well known usages of the term.
+- The name, plus `software`. The results returned by searching for `Cassandra software` may provide evidence of existing use in trade.
+- The name, plus key functionality the software provides: e.g., `Cassandra "big data"`.
+- The name, plus `open source`: e.g., `Cassandra open source`.
diff --git a/pages/guides/website.ad b/pages/guides/website.ad
index a28346d..985172b 100644
--- a/pages/guides/website.ad
+++ b/pages/guides/website.ad
@@ -35,8 +35,8 @@
== Building
-The website metadata is built by this link:https://builds.apache.org/job/Incubator%20SVN%20Clutch%20Analysis%20-%20part%201/[Clutch Jenkins job],
-where the website is built by this link:https://builds.apache.org/view/All/job/Incubator%20GIT%20Site%20-%20part%202//[Website Jenkins job],
+The website metadata is built by this link:https://ci-builds.apache.org/job/Incubator/job/Incubator-SVN-Clutch-Analysis-part-1/[Clutch Jenkins job],
+where the website is built by this link:https://ci-builds.apache.org/job/Incubator/job/Incubator-GIT-Site-part-2/[Website Jenkins job],
if you have karma you can trigger a build yourself.
Commits to the git repo trigger builds automatically, and the website builds daily for other changes after midnight UTC.
diff --git a/pages/index.ad b/pages/index.ad
index 074e182..2439233 100644
--- a/pages/index.ad
+++ b/pages/index.ad
@@ -12,11 +12,11 @@
It helps those incoming projects (called "podlings") adopt the Apache link:http://apache.org/theapacheway/[style of governance and operation] and guides them to the ASF services available to our projects so they can become top-level ASF projects ("TLPs").
-The Incubator delegates a few mentors for each podling, as "on the ground" agents to act as liaisons with the various ASF teams: link:http://incubator.apache.org[Incubator PMC], link:https://selfserve.apache.org/[Infrastructure team], etc., and facilitates the podling's growth and operations.
+The Incubator delegates a few mentors for each podling, as "on the ground" agents to act as liaisons with the various ASF teams: link:http://incubator.apache.org/whoweare.html#the_incubator_project_management_commitee_pmc[Incubator PMC], link:https://selfserve.apache.org/[Infrastructure team], etc., and facilitate the podling's growth and operations.
=== Incubator History
-The Incubator was created way back in 2002. Since then (as of Novemeber 2019) has been involved in helping 315 podlings, of which more than 200 have graduated. They have been guided and supported by more than 300 mentors. There are around 45 to 50 podlings in incubation at any one time, and incubation typically takes 1 1/2 years.
+The Incubator was created link:https://www.apache.org/foundation/records/minutes/2002/board_minutes_2002_10_16.txt[way back in 2002]. Since then, as of November 2019 it has been involved in helping 315 podlings, of which more than 200 have graduated. They have been guided and supported by more than 300 mentors. There are around 45 to 50 podlings in incubation at any one time, and incubation typically takes 1 1/2 years.
=== Incubator Cookbook
diff --git a/pages/policy/incubation.ad b/pages/policy/incubation.ad
index b72a8b1..3af3f48 100644
--- a/pages/policy/incubation.ad
+++ b/pages/policy/incubation.ad
@@ -24,9 +24,9 @@
See the October 2002 link:https://www.apache.org/foundation/board/calendar-1999-2004.html#2002 [Board report] for the resolution.
The Incubator has the following responsibilities:
+
- Welcoming new Podlings to become part of the Apache Software Foundation (ASF).
- Guiding Podlings to govern and grow their communities according to *link:https://www.apache.org/theapacheway/[the Apache Way]*, the ASF's philosophy and guidelines for collaborative development.
-
- Reporting monthly to the board on the progress of Podlings.
- Graduating Podlings to top level Apache Software Foundation projects.
- Retiring Podlings when needed.
