Author: crossley
Date: Wed Mar 22 18:45:54 2006
New Revision: 388006

URL: http://svn.apache.org/viewcvs?rev=388006&view=rev
Log:
Various comments on different ASF mailing lists indicate that calling
it "The Apache Way" is not a good idea.

Modified:
    forrest/trunk/site-author/content/xdocs/guidelines.xml

Modified: forrest/trunk/site-author/content/xdocs/guidelines.xml
URL: 
http://svn.apache.org/viewcvs/forrest/trunk/site-author/content/xdocs/guidelines.xml?rev=388006&r1=388005&r2=388006&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/guidelines.xml (original)
+++ forrest/trunk/site-author/content/xdocs/guidelines.xml Wed Mar 22 18:45:54 
2006
@@ -26,7 +26,7 @@
    This document provides the guidelines under which the Apache Forrest
    project operates. It defines the roles and responsibilities, who may vote,
    how voting works, how conflicts are resolved, etc.
-   Apache Forrest is a project of the Apache Software Foundation
+   Apache Forrest is a project of The Apache Software Foundation
    (<link href="http://www.apache.org/foundation/";>ASF</link>) which is a
    non-profit corporation. As with all such organisations there are some
    procedures to be followed.
@@ -46,10 +46,10 @@
   </section>
 
   <section id="way">
-    <title>The Apache Way</title>
+    <title>Open development</title>
     <p>
       Forrest is typical of Apache projects, in that it operates under a set of
-      principles known collectively as the "Apache Way". There is no clear 
definition 
+      principles that encourage open development. There is no clear definition 
       (perhaps that is part of it) and it is ever-evolving. Each ASF project 
is different
       in its own way - there is healthy diversity rather than uniformity 
across all projects.
       The main principles are to facilitate open collaborative development, 
with respect for
@@ -646,7 +646,7 @@
   <section id="contribution">
     <title>Contribution and acknowledgement</title>
     <p>
-      Some <link href="#way">principles</link> of the Apache Way are to ensure 
that each
+      Some <link href="#way">principles</link> of open development at ASF are 
to ensure that each
       contributor is recognised and feels a productive part of the community, 
and to
       encourage diversity, respect, and equality.
       Key to this is the recognition of contributions from individuals