Merge pull request #57 from justinmclean/master
fix discussion thread list
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 1fe92e4..a28346d 100644
--- a/pages/guides/website.ad
+++ b/pages/guides/website.ad
@@ -35,7 +35,9 @@
== Building
-The website is built on link:https://builds.apache.org/view/H-L/view/Incubator/job/Incubator%20Site/[Jenkins], if you have karma you can trigger a build yourself.
+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],
+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.
== Help Wanted!
diff --git a/pages/index.ad b/pages/index.ad
index 074e182..5a8adc0 100644
--- a/pages/index.ad
+++ b/pages/index.ad
@@ -12,7 +12,7 @@
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 facilitates the podling's growth and operations.
=== Incubator History
