summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ABOUT_APACHE7
-rw-r--r--README2
2 files changed, 8 insertions, 1 deletions
diff --git a/ABOUT_APACHE b/ABOUT_APACHE
index c44a648383..e39d0a5250 100644
--- a/ABOUT_APACHE
+++ b/ABOUT_APACHE
@@ -101,6 +101,7 @@ Current Apache Group in alphabetical order as of 20 August 2001:
Wilfredo Sanchez Apple Computer, California
Cliff Skolnick California
Marc Slemko Canada
+ Joshua Slive Canada
Greg Stein California
Bill Stoddard IBM Corporation, Research Triangle Park, NC
Paul Sutton Seattle
@@ -153,9 +154,15 @@ 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
diff --git a/README b/README
index a7fb2390b6..dc0a787187 100644
--- a/README
+++ b/README
@@ -61,7 +61,7 @@
http://httpd.apache.org/bug_report.html
o If you want to participate in actively developing Apache please
- subscribe to the `new-httpd' mailing list as described at
+ subscribe to the `dev@httpd.apache.org' mailing list as described at
http://www.apache.org/foundation/mailinglists.html#http
Acknowledgments