change so that it doesn't rely on the structure of the apr_table's elt internal

[apache] / ABOUT_APACHE

diff --git a/ABOUT_APACHE b/ABOUT_APACHE
index e39d0a525020dbbaaedd2b972c5cd392cd7167bb..3e46e9881379df914e23fe385b469280fa84ab63 100644 (file)
--- a/ABOUT_APACHE
+++ b/ABOUT_APACHE
@@ -70,14 +70,14 @@ is today more widely used than all other web servers combined.
 
  ============================================================================
 
-Current Apache Group in alphabetical order as of 20 August 2001:
+Current Apache Group in alphabetical order as of 2 October 2001:
 
    Brian Behlendorf       Collab.Net, California 
    Ryan Bloom             Covalent Technologies, California 
    Ken Coar               IBM Corporation, Research Triangle Park, NC, USA
    Mark J. Cox            Red Hat, England
-   Lars Eilebrecht        CyberSolutions, Munich, Germany 
-   Ralf S. Engelschall    Munich, Germany.
+   Lars Eilebrecht        Parc Technologies, Munich, Germany 
+   Ralf S. Engelschall    Cable & Wireless Deutschland, Munich, Germany
    Justin Erenkrantz      eBuilt, California
    Roy T. Fielding        eBuilt, California 
    Tony Finch             Covalent Technologies, California
@@ -106,6 +106,7 @@ Current Apache Group in alphabetical order as of 20 August 2001:
    Bill Stoddard          IBM Corporation, Research Triangle Park, NC
    Paul Sutton            Seattle
    Randy Terbush          Covalent Technologies, California 
+   Jeff Trawick           IBM Corporation, Research Triangle Park, NC
    Cliff Woolley          University of Virginia
 
 Apache Emeritus (old group members now off doing other things)
@@ -154,15 +155,9 @@ If you'd like to become an active contributor to the Apache project (the
 group of volunteers who vote on changes to the distributed server), then
 you need to start by subscribing to the dev@httpd.apache.org mailing list.
 One warning though: traffic is high, 1000 to 1500 messages/month.
-<<<<<<< ABOUT_APACHE
 To subscribe to the list, send an email to dev-subscribe@httpd.apache.org.
 We recommend reading the list for a while before trying to jump in to 
 development.
-=======
-To subscribe to the list, send "subscribe dev" in the body of
-a message to <dev-subscribe@httpd.apache.org>.  We recommend reading the 
-list for a while before trying to jump in to development.
->>>>>>> 1.6
 
    NOTE: The developer mailing list (dev@httpd.apache.org) is not
    a user support forum; it is for people actively working on development