You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2004/02/01 03:19:55 UTC

svn commit: rev 6394 - in incubator/directory/sitedocs/trunk/sitedocs/xdocs: . community/history community/process community/who doc related

Author: akarasulu
Date: Sat Jan 31 18:19:55 2004
New Revision: 6394

Removed:
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/history/changes.txt
Modified:
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/history/index.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/code-standards.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/mission.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/pmc-votes.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/pmc.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/release.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/who/index.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/articles.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/index.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/wiki.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/download.html
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/license.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/news.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/powered.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/svn.xml
Log:
done until we rework some of the gives - then we can deploy it

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/history/index.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/history/index.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/history/index.xml	Sat Jan 31 18:19:55 2004
@@ -18,10 +18,6 @@
 <p>
     Over time the Java ...
 </p>
-<p>
-    Project changes are documented <a href="changes.txt">here</a>.
-</p>
-
 </section>
 
 </body>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/code-standards.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/code-standards.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/code-standards.xml	Sat Jan 31 18:19:55 2004
@@ -77,8 +77,8 @@
 or whatever, then you should contribute and add it. This will improve the
 project as a whole.</p>
 
-<p>The Jakarta Apache/Avalon License <strong>MUST</strong> be placed at the top
-of each and every file.</p>
+<p>The Jakarta Apache/Directory License <strong>MUST</strong> be placed at the 
+  top of each and every file.</p>
 
 <p>If you contribute to a file (code or documentation), add yourself to the
 top of the file. For .java files the preferred Javadoc format is:</p>
@@ -187,7 +187,7 @@
 
 <p>Thanks for your cooperation.</p>
 
-<p>-The Avalon Team</p>
+<p>-The Directory Project Team</p>
 
 </section>
 

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/mission.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/mission.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/mission.xml	Sat Jan 31 18:19:55 2004
@@ -19,204 +19,6 @@
 MISSION
 =======
 
-[here's what Avalon's Mission is: we need our own]
-
-Apache Directory exists to promote and facilitate Component Based Design.
-Component Based Design is a proven practice that helps create systems
-that are loosely coupled and easy to maintain. Component Based Design
-requires a rigid software framework to function properly.
-
-Apache Avalon provides a specification for such a framework, an
-implementation of that specification and a compliance testing suite,
-and tools and components to facilate development using that framework.
-
-The software developed by the Apache Avalon project must be high
-performance, reliable, secure, and easy to use.  The individual software
-components must be part of an underlying architectural orchestration
-that will allow them to work together without major negotiations or
-breakage.
-
-The process followed for the development of Apache Avalon software is
-the same as the process followed by other ASF projects: individuals and
-corporations collaborate on the best possible infrastructure, APIs,
-code, testing, and release cycles.
-
-In order to achieve a coherent architecture between Apache Avalon
-components and other components and applications, standards (formal or
-de facto) will be used as much as possible for both protocols and APIs.
-We will also allow the innovation of new protocols, APIs, and components
-in order to seed new concepts not yet defined by standards.
-
-HISTORY
-=======
-
-[here's what Avalon's is: we need our own]
-
-This project was established under the direction of the Apache Software
-Foundation in November 2002 to facilitate joint open-source development.
-
-Prior to November 2002, Apache Avalon has been a part of the Apache Java
-project and the Apache Jakarta project.
-
-THE PROJECT MANAGEMENT COMMITTEE
-================================
-
-[here's what Avalon's is: we need our own]
-
-The Apache Avalon project is managed by a small, core group of
-contributors known as the Project Management Committee [PMC].  The PMC
-must have at least one ASF Officer, who will also be the PMC Chairperson
-and who will report to the ASF Board.  See
-http://www.apache.org/foundation/bylaws.html for reference.
-
-The PMC has the following responsibilities:
-
-o Facilitating code or other donations by individuals or companies.
-o Resolving license issues and other legal issues.
-o Approving new committers.
-o Ensuring that administrative and infrastructure work is completed.
-o Overseeing Apache Avalon to ensure that the mission defined in
-  this document is being fulfilled.
-o Resolving conflicts within the project.
-
-To become a member of the PMC, an individual must be nominated by a
-contributor, unanimously approved by all PMC members, and approved by a
-two-thirds majority of committers. In most cases, developers will have
-actively contributed to development for at least six months before being
-considered for membership on the PMC.
-
-The PMC is responsible for maintaining and updating this charter.
-Development must follow the process outlined in this charter, so any
-change to the development process necessitates a change to the charter.
-Changes must be unanimously approved by all members of the PMC. A
-contributor may challenge a change to the charter at any time and ask
-for a vote of all committers, in which case a two-thirds majority must
-approve the change.
-
-COMMITTERS
-==========
-
-[here's what Avalon's is: we need our own]
-
-Committers are developers who have read/write access priviledges to the
-source code repository. New committers are added when a developer is 
-nominated by a committer and approved by at least 50 percent of the
-existing committers with no opposing votes.  In most cases, new
-committers will already be participating in the development process by
-submitting suggestions and/or fixes via the bug report page or mailing
-lists.
-
-CONTRIBUTORS
-============
-
-[here's what Avalon's is: we need our own]
-
-Anyone is allowed and encouraged to participate in the development of
-the Apache Avalon software products. Occasional contributors will be
-able to report bugs, participate in the mailing lists, and submit
-patches.
-
-Specific changes to a product proposed for discussion or voting on the
-appropriate development mailing list should be presented in the form of
-patches. When sent to the mailing list, the message should contain a
-subject beginning with [PATCH] and include a clear summary that
-describes the effect of that patch.
-
-Like all Apache projects, the Avalon project is a meritocracy -- the 
-more work you do, the more you are allowed to do.  Developers who make
-regular and substantial contributions may become committers as described
-above.
-
-LICENSING
-=========
-
-[here's what Avalon's is: we need our own]
-
-All contributions to the Apache Avalon project adhere to the "ASF Source
-Code License." All contributions must be made under those terms. All
-contributions must contain the following copyright notice and license:
-
- ============================================================================
-                   The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1997-2003 The Apache Software Foundation.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of  source code must  retain the above copyright  notice,
-    this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
-    include  the following  acknowledgment:  "This product includes  software
-    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
-    Alternately, this  acknowledgment may  appear in the software itself,  if
-    and wherever such third-party acknowledgments normally appear.
-
- 4. The  names   "Apache",   "Avalon",  "Excalibur",  "Fortress",  "Phoenix",
-    "Merlin" and "Apache Software Foundation" must not be used  to endorse or
-    promote  products  derived  from  this  software  without  prior  written
-    permission.  For written permission, please contact apache@apache.org.
-
- 5. Products  derived from this software may not  be called "Apache", nor may
-    "Apache" appear  in their name,  without prior written permission  of the
-    Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
- APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
- ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
- (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation. For more  information on the
- Apache Software Foundation, please see http://www.apache.org/.
-
-THE DEVELOPMENT PROCESS
-=======================
-
-[here's what Avalon's is: we need our own]
-
-The development process is intentionally lightweight and follows the
-same guidelines as other ASF projects. The project committers decide
-which changes may be committed to the repository. Three +1 ('yes' votes)
-with no -1 ('no' votes or vetoes) are needed to approve a code change.
-For efficiency, some code changes from some contributors (e.g. feature
-additions, bug fixes) may be approved in advance, in which case they may
-be committed first and changed as needed, with conflicts resolved by
-majority vote of the committers.
-
-PRODUCT REQUIREMENTS
-====================
-
-[here's what Avalon's is: we need our own]
-
-All software products developed by Apache Avalon must have a set of
-requirments as well as an up-to-date release plan and architecture
-design. All software products developed by Apache Avalon must have a
-test system to verify their correct functioning and are ideally subject
-to continous integration testing, regression testing and unit testing.
-
-RELATIONSHIP TO OTHER APACHE PROJECTS
-=====================================
-
-[here's what Avalon's is: we need our own]
-
-The Apache Avalon project should work closely with other Apache
-projects, such as Jakarta and Apache HTTP Server, to avoid redundancy
-and achieve a coherent architecture among Apache Avalon and these
-projects.      
     </source>
     </section>
   </body>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/pmc-votes.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/pmc-votes.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/pmc-votes.xml	Sat Jan 31 18:19:55 2004
@@ -9,7 +9,8 @@
     <body> 
         <section name="Voting Procedures">
             
-            <p>This document details how the Avalon PMC has agreed to handle voting.</p>
+            <p>This document details how the Directory PMC has agreed to handle 
+              voting.</p>
             
             <subsection name="People Involved in the Voting Process">
                 

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/pmc.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/pmc.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/pmc.xml	Sat Jan 31 18:19:55 2004
@@ -6,6 +6,15 @@
   </properties> 
 
   <body>
+    <section name="">
+      <p>
+        For now because we are within the incubator we do not have a PMC but 
+        the incubator's equivalent of one for a incubated project.  Until we
+        exit the incubator the this PPMC will operate using the PMC guidelines
+        below.
+      </p>
+    </section>
+    
 	  <section name="Informative material only">
 	    <p>These pages exist only to provide some down-to-earth insight
 	    in how things work at the ASF. They're informative only, not
@@ -19,7 +28,7 @@
 	    
 	    <p>A PMC, Project Management Committee, is a group of people
 	    appointed with the task of managing something that fits with the
-	    Apache Software Foundation goals. The Avalon PMC, for example,
+	    Apache Software Foundation goals. The Directory PMC, for example,
 	    is tasked with managing the Apache Directory Project.</p>
 	  </section>
 	  <section name="What, management?! We've already got plenty of those at work!">
@@ -41,12 +50,12 @@
 	    projects".</p>
 	  </section>
 	  <section name="The PMC Chair and Officer of the Foundation">
-	    <p>The position of Avalon PMC chair is an important one; the PMC
+	    <p>The position of Directory PMC chair is an important one; the PMC
 	    chair has special responsibilities and privileges as detailed in
 	    the ASF bylaws.</p>
 	  </section>
         <section name="Project Management Committee">
-        <p>The following people form the current Avalon PMC:</p>
+        <p>The following people form the current Directory PMC:</p>
           <ul>
             <li><a href="../who/mcconnell.html">Stephen McConnell</a></li>
             <li><a href="../who/akarasulu.html">Alex Karasulu</a></li>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/release.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/release.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/release.xml	Sat Jan 31 18:19:55 2004
@@ -39,9 +39,6 @@
 
   Jakarta: http://jakarta.apache.org/site/decisions.html
   Apache HTTPD release policies: http://httpd.apache.org/dev/release.html
-  Avalon bug summary:
-http://nagoya.apache.org/bugzilla/reports.cgi?product=Avalon&amp;output=most_doo
-med&amp;links=1&amp;banner=1&amp;quip=0
   Mirroring: http://cvs.apache.org/~bodewig/mirror.html
 
 [snip]

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/who/index.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/who/index.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/who/index.xml	Sat Jan 31 18:19:55 2004
@@ -13,7 +13,7 @@
     </section>
     <section name="Inactive Committers">
       <p>
-      The current inactive avalon committers (an inactive committer is
+      The current inactive Directory committers (an inactive committer is
       someone who hasn't done a cvs commit in three months, or hasn't
       bothered to move himself from this list to the one above) are:
       none yet.
@@ -22,7 +22,7 @@
     <section name="Emeritus Committers">
       <p>
        The current emeritus committers (an emeritus committer is
-      someone who is not active within the avalon project anymore)
+      someone who is not active within the Directory Project anymore)
       are: none yet.
       </p>
     </section>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/articles.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/articles.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/articles.xml	Sat Jan 31 18:19:55 2004
@@ -1,54 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon: Articles</title>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
+    <title>Apache Directory Project: Articles</title>
   </properties> 
 
   <body>
-    <section name="Avalon Articles">
+    <section name="Directory Articles">
      <p>
-      Avalon need not be as mysterious as its Arthurian counterpart.
-      The following articles will help guide you on your own quest for
-      understanding.
+       Some articals about various naming and directory topics.
      </p>
+
      <subsection name="General Documentation">
       <ul>
         <li>
-	 <a href="http://avalon.apache.org/developing/index.html">Developing With Avalon</a>:
-	 An excellent white paper on the Avalon framework.
-	 Recommended reading!
+          Coming soon ...
         </li>
-	<li>
-	<a href="http://avalon.apache.org/framework/cop/index.html">An Introduction to COP</a>:
-	 An introduction to Component Oriented Programming and the
-	 core Avalon Framework.
-	</li>
-	<li>
-	<a href="http://avalon.apache.org/framework/principals/index.html">COP Development
-	 Principles</a>: A look at design principles to consider when
-	 developing in Avalon and COP in general.
-	</li>
-	<li>
-	 <a href="http://avalon.apache.org/framework/principals/lifecycle.html">The Avalon
-	 Lifecycle</a>: Introduces the standard Avalon lifecycle for components.
-	</li>
-	<li>
-	  <a href="../community/history/need-for-avalon.html">The Need For
-	  Avalon</a>:
-      In this document, Stefano introduces his vision for the Java Apache
-      Server Framework project. He explain why he believes that
-      open-source projects should invest more time in software
-      engineering and why this may be worth while even in very successful
-      and high quality software projects. [HISTOROICAL]
-	</li>
-	<li>
-	  <a href="../community/history/what-is-a-server.html">What Is A
-	  Server</a>: Pierpaolo Fumagalli explains how a
-	  server could be developed using the benefits offered by the 
-	  Java Apache Server Framework (Avalon) and introduces the
-	  reader to the concept of what a <code>Block</code>. [HISTORICAL]
-	</li>
       </ul>
      </subsection>
     </section>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/index.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/index.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/index.xml	Sat Jan 31 18:19:55 2004
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon: Documentation</title>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
+    <title>Apache Directory Project: Documentation</title>
   </properties> 
 
   <body>
-    <section name="Avalon Documentation">
+    <section name="Directory Documentation">
      <p>
-      Avalon need not be as mysterious as its Arthurian counterpart. 
-      The following documentation will help guide you on your own quest for
-      understanding.
+       Coming soon ...
      </p>
      <table>
        <tr>
@@ -19,108 +17,32 @@
        </tr>
        <tr>
          <td>
-    <a href="http://wiki.apache.org/avalon">
-           Wiki</a>
+            <a href="http://wiki.apache.org/directory">Wiki</a>
          </td>
          <td>
-          The Avalon Wiki contains a growing collection of information
-         about Avalon, random thoughts on component models and
-         container solutions, roadmaps, development discussions,
-         general ideas and other inspirational material.  Feel free to
-         contribute!
+          The Directory Wiki contains a growing collection of information
+          about roadmaps, development discussions, general ideas and other 
+          inspirational material.  Feel free to contribute!
          </td>
        </tr>
-       <tr>
-         <td>
-          <a href="http://wiki.apache.org/avalon/AvalonFAQ">
-	   FAQ</a>
-	 </td>
-	 <td>
-	  A community-maintained Frequenty Asked Questions database
-          in our wiki.
-	 </td>
-       </tr>
-       <tr>
-         <td>
-         <a href="http://wiki.apache.org/avalon/AvalonGlossary">
-	   Glossary</a>
-         </td>
-	 <td>Glossary of terms for Avalon technology</td>
-       </tr>
-       <tr>
-         <td><a href="../product/index.html">Product Documentation</a></td>
-	 <td> Each individual product or sub-project has its own section which
-	 includes API documentation (javadocs), usage material, and
-	 often simple tutorials.</td>
-       </tr>
-       <tr>
-         <td><a href="../mailing-lists.html">Mailing Lists</a></td>
-	 <td>The mailing list archives are full of tips, examples,
-         solutions, and explanations about Avalon.</td> 
-       </tr>
      </table>
+
      <subsection name="Articles">
        <table>
          <tr>
-	  <th>Resource</th>
-	  <th>Description</th>
-	 </tr>
+           <th>Resource</th>
+           <th>Description</th>
+         </tr>
+         
          <tr>
-          <td>
-	   <a href="http://avalon.apache.org/developing/index.html">
-           Developing With Avalon</a>
+           <td> 
+             Coming soon ...
           </td>
-          <td> The Avalon Developers Guide. An excellent white paper
-           on the Avalon framework. Recommended reading! </td>
-	</tr>
-	<tr>
-          <td>
-	<a href="http://avalon.apache.org/framework/cop/index.html">An
-         Introduction to COP</a></td>
-           <td>
-	 An introduction to Component Oriented Programming and the
-	 core Avalon Framework.</td>
-	</tr>
-	<tr>
-          <td>
-	   <a href="http://avalon.apache.org/framework/principals/index.html">
-            COP Development Principles</a></td>
-	  <td>
-	   A look at design principles to consider when developing in
-           Avalon and COP in general.
-	 </td>
-	</tr>
-	<tr>
           <td>
-	  <a href="http://avalon.apache.org/framework/principals/lifecycle.html">
-           The Avalon Lifecycle</a>
-           </td> 
-	   <td>Introduces the standard Avalon lifecycle for components.</td>
-	</tr>
-	<tr>
-	  <td>
-	  <a href="../community/history/need-for-avalon.html">
-	  The Need For Avalon</a>
+             Coming soon ...
           </td>
-	  <td>
-      In this document, Stefano introduces his vision for the Java Apache
-      Server Framework project. He explain why he believes that
-      open-source projects should invest more time in software
-      engineering and why this may be worth while even in very successful
-      and high quality software projects. [HISTOROICAL]
-          </td>
-	</tr>
-	<tr>
-         <td>
-	  <a href="../community/history/what-is-a-server.html">What Is A
-	  Server</a></td>
-	 <td> Pierpaolo Fumagalli explains how a
-	  server could be developed using the benefits offered by the 
-	  Java Apache Server Framework (Avalon) and introduces the
-	  reader to the concept of what a
-         <code>Block</code>. [HISTORICAL]
-          </td>
-	</tr>
+        </tr>
+
        </table>
      </subsection>
     </section>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/wiki.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/wiki.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/wiki.xml	Sat Jan 31 18:19:55 2004
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon: Wiki</title>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
+    <title>Apache Directory Project: Wiki</title>
   </properties> 
 
   <body>
-    <section name="Avalon Wiki">
-    <p>The <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AvalonProjectPages">Avalon Wiki</a> contains a growing collection of information about Avalon, random thoughts on component models and container solutions, roadmaps, development discussions, general ideas and other inspirational material.</p>
+    <section name="Directory Wiki">
+      <p>The <a href="http://wiki.apache.org/directory">Directory Wiki</a> 
+        contains a growing collection of information about the Directory 
+        Project, roadmaps, development discussions, general ideas and other 
+        inspirational material.
+      </p>
     </section>
   </body>
 </document>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/download.html
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/download.html	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/download.html	Sat Jan 31 18:19:55 2004
@@ -19,7 +19,7 @@
               <td>
                   <a href="http://incubator.apache.org/directory">
                     <img border="0" alt="The Apache Directory Project" 
-                      src="./images/apache-avalon-logo.png" align="left"></img>
+                      src="./images/apache-Directory-logo.png" align="left"></img>
                   </a>
               </td>
               <td>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/license.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/license.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/license.xml	Sat Jan 31 18:19:55 2004
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="akarasulu@avalon.apache.org">Alex Karasulu</author>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
     <title>Apache Directory License</title>
   </properties> 
 

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/news.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/news.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/news.xml	Sat Jan 31 18:19:55 2004
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="akarasulu@avalon.apache.org">Alex Karasulu</author>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
     <title>Apache Directory Project News</title>
   </properties> 
   

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/powered.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/powered.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/powered.xml	Sat Jan 31 18:19:55 2004
@@ -7,7 +7,7 @@
 
   <body>
     <section name="Related Projects">
-      <subsection name="Powered-By Avalon">
+      <subsection name="Powered-By Directory">
       <p>
         Got a project using Directory code?  Email the 
         <a href="../mailing-lists.html">developers' mailing list</a> and we'll 

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/svn.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/svn.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/svn.xml	Sat Jan 31 18:19:55 2004
@@ -81,15 +81,8 @@
         <p>
           Then, fill out the settings like in the screenshot below, and then 
           click ok.<br/> <img src="images/tortoisecvs-settings.jpg" 
-            alt="screenshot of CVS settings"/>
+            alt="screenshot of SVN settings"/>
         </p>
-        <p>
-          This checks out the avalon CVS module. Repeat this procedure for 
-          all the modules you wish to check out. See above under "CVS data" for 
-          the list of Avalon modules, or use the <a href=
-          "http://cvs.apache.org/viewcvs.cgi/">ViewCVS Webpage</a> for a full
-          list of ASF-hosted CVS modules.
-        </p> 
       </subsection>
       
       <subsection name="Other Tools ... ">