From: Ralf S. Engelschall <rse@apache.org>
Date: Thu, 31 Jul 1997 16:28:30 +0000 (+0000)
Subject: Merging in changes from HEAD.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac692b3265cf0e20bf83e17613227ae6a5c87a08;p=thirdparty%2Fapache%2Fhttpd.git

Merging in changes from HEAD.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78834 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/APACHE_1_2_X/KEYS b/APACHE_1_2_X/KEYS
index 1507ca36df0..5c2c7d120d3 100644
--- a/APACHE_1_2_X/KEYS
+++ b/APACHE_1_2_X/KEYS
@@ -169,3 +169,19 @@ tCBDaHVjayBNdXJja28gPGNodWNrQHRvcHNhaWwub3JnPg==
 =vUdL
 -----END PGP PUBLIC KEY BLOCK-----
 
+Type Bits/KeyID    Date       User ID
+pub  1024/26BB437D 1997/04/28 Ralf S. Engelschall <rse@engelschall.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: 2.6.3ia
+
+mQCNAzNko/QAAAEEANZ2kpN/oMkz4tqzxvKPZws/XwsD0Y+E5/y7P2DIw4uHS/4N
+syQbgkdrZhPBlXDv68DQioHXWsb904qyr7iZB1LC5ItK9MgqlK+Z2mvPqsGbHM8J
++oYib8kf2zJ6HvrYrP7NYB0tN9YYum2ICtx+hIi6aKGXdB1ATA5erwYmu0N9AAUR
+tClSYWxmIFMuIEVuZ2Vsc2NoYWxsIDxyc2VAZW5nZWxzY2hhbGwuY29tPokAlQMF
+EDNko/QOXq8GJrtDfQEBKVoD/2K/+4pcwhxok+FkuLwC5Pnuh/1oeOYHiKYwx0Z3
+p09RLvDtNldr6VD+aL9JltxdPTARzZ8M50UqoF9jMr25GifheFYhilww41OVZA3e
+cLXlLgda1+t0vWs3Eg/i2b0arQQDaIq7PeRdjdEDgwnG4xBaqaAqfgxwOXJ+LPWF
+hiXZ
+=K7lL
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/APACHE_1_2_X/README b/APACHE_1_2_X/README
index f8b53dc686a..4757f026d0c 100644
--- a/APACHE_1_2_X/README
+++ b/APACHE_1_2_X/README
@@ -62,12 +62,12 @@ The Latest Version
 
 Details of the latest version are in the apache project page (above).
 
-Licencing
+Licensing
 ---------
 
 Please see the file called LICENSE.
 
-Acknowledgements
+Acknowledgments
 ----------------
 
 We wish to acknowledge the following copyrighted works that make up
@@ -78,8 +78,8 @@ Supercomputing Applications at the University of Illinois at
 Urbana-Champaign.
 
 This software contains code derived from the RSA Data Security Inc. MD5
-Message-Diest Algorithm, including various modifications by Spyglass Inc.,
-Caregie Mellon University, and Bell Communications Research, Inc. 
+Message-Digest Algorithm, including various modifications by Spyglass Inc.,
+Carnegie Mellon University, and Bell Communications Research, Inc. 
 (Bellcore).
 
 This package contains software written and copyrighted by Henry Spencer.