incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johndam...@apache.org
Subject incubator git commit: Fix mentor guide bullets. Added FAQ to header, fixed HTML left overs.
Date Sat, 24 Jun 2017 14:46:47 GMT
Repository: incubator
Updated Branches:
  refs/heads/jbake-site ddf2f8e73 -> d5b78877c


Fix mentor guide bullets.  Added FAQ to header, fixed HTML left overs.


Project: http://git-wip-us.apache.org/repos/asf/incubator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator/commit/d5b78877
Tree: http://git-wip-us.apache.org/repos/asf/incubator/tree/d5b78877
Diff: http://git-wip-us.apache.org/repos/asf/incubator/diff/d5b78877

Branch: refs/heads/jbake-site
Commit: d5b78877ce3ec36250e5443c90ace9bd8185c813
Parents: ddf2f8e
Author: John D. Ament <johndament@apache.org>
Authored: Sat Jun 24 10:46:41 2017 -0400
Committer: John D. Ament <johndament@apache.org>
Committed: Sat Jun 24 10:46:41 2017 -0400

----------------------------------------------------------------------
 pages/faq.ad           | 20 +++++++++-----------
 pages/guides/mentor.ad |  4 ++--
 templates/menu.gsp     |  2 ++
 3 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator/blob/d5b78877/pages/faq.ad
----------------------------------------------------------------------
diff --git a/pages/faq.ad b/pages/faq.ad
index 0b1d19f..5ce890c 100644
--- a/pages/faq.ad
+++ b/pages/faq.ad
@@ -7,9 +7,9 @@ Apache Incubator PMC
 :toc:
 :imagesdir: /images/
 
-== Questions</title>
+== Questions
 
-=== 1. Incubation</title>
+=== 1. Incubation
 
 ==== 1.1. Does the X Project really have to go in the Incubator to get to Apache?
 Yes.
@@ -68,9 +68,7 @@ ask that PMC to sponsor you.  After that vote, you will
 automatically be under the Incubator, and incubation will
 start.
 
-==== 1.4. Someone has proposed that their code/project be donated
-to project X within the ASF for continued development. What
-do we need to do to accept the code?</title>
+==== 1.4. Someone has proposed that their code/project be donated to project X within the
ASF for continued development. What do we need to do to accept the code?
 The Incubator will only accept code for incubation if a PMC
 has voted to accept it. So when a proposal for the donation of
 code occurs, the project in question should discuss the proposal
@@ -98,9 +96,9 @@ subject to communal will.
 without existing codebases, are free to contribute, or to
 propose additional related projects.
 
-=== 2. Participation</title>
+=== 2. Participation
 
-==== 2.1. How can I update the site?</title>
+==== 2.1. How can I update the site?
 Refer to link:guides/website.html[our guide to updating the website].
 If you are not a committer on the Incubator project,
 then you can still send patches for the source documents.
@@ -111,7 +109,7 @@ about maintaining your project entry in the podlings summary file
 and your project status page.
 
 
-==== 2.3. Why don't we use an issue tracking system to track incubation process?</title>
+==== 2.3. Why don't we use an issue tracking system to track incubation process?
 
 Issue trackers do not meet the long-term archival and tracking
 requirements for our legal purposes and they do not authenticate
@@ -123,7 +121,7 @@ for those issues, our normal issue trackers can be used.
 Nevertheless, SVN is our only authoritative and formal tracking
 system for incubation status.
 
-==== 2.4. How do I update the site of an incubating project?</title>
+==== 2.4. How do I update the site of an incubating project?
 First of all, read our link:/policy/incubation.html[Incubation Policy].
 Refer to the link:guides/sites.html[Website Guide].
 
@@ -147,9 +145,9 @@ existing Apache committer.
 
 See link:facilities.html[Facilities for Incubator management].
 
-=== 3 Infrastructure</title>
+=== 3 Infrastructure
 
-==== 3.1 How does our project request resources?</title>
+==== 3.1 How does our project request resources?
 
 Co-ordinate via your project's dev list and PPMC. Often someone
 there will know what is necessary.

http://git-wip-us.apache.org/repos/asf/incubator/blob/d5b78877/pages/guides/mentor.ad
----------------------------------------------------------------------
diff --git a/pages/guides/mentor.ad b/pages/guides/mentor.ad
index c137956..bb49eec 100644
--- a/pages/guides/mentor.ad
+++ b/pages/guides/mentor.ad
@@ -220,8 +220,8 @@ Remember to post an email announcing that the issue tracker is available.
 
 *NOTE* This section is a DRAFT under development.
 
-Following podling creation, it needs to be bootstrapped. Here are some of
-the tasks:
+Following podling creation, it needs to be bootstrapped. Here are some of the tasks:
+
 - Ensure link:#mentors-ipmc[Mentors are on the IPMC][*Mentors*]
 - Add podling to link:#Sending+in+an+Incubation+Report[reporting schedule] [*IPMC member*]
 - link:#Initialize+Podling+Status+Page[Initialize project status page] [*IPMC member*]

http://git-wip-us.apache.org/repos/asf/incubator/blob/d5b78877/templates/menu.gsp
----------------------------------------------------------------------
diff --git a/templates/menu.gsp b/templates/menu.gsp
index d5dbe01..04a0275 100644
--- a/templates/menu.gsp
+++ b/templates/menu.gsp
@@ -50,11 +50,13 @@
               <ul class="dropdown-menu">
                 <li><a href="http://www.apache.org/foundation/how-it-works.html">How
Apache Works</a></li>
                 <li><a href="http://www.apache.org/dev/">Developer Documentation</a></li>
+                <li><a href="http://www.apache.org/legal/">Legal</a></li>
                 <li><a href="http://www.apache.org/foundation/">Foundation</a></li>
                 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsor
Apache</a></li>
                 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
               </ul>
             </li>
+            <li><a href="${config.site_host}/faq.html">FAQs</a></li>
           </ul>
         </div><!--/.nav-collapse -->
       </div>


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


Mime
View raw message