Update license description for PCRE inclusion

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

diff --git a/LICENSE b/LICENSE
index 0a0cb955d0c7443318dbc893c8e573628344bc0b..265a3c900d63d526194f5bf556910ca39fd7f6ea 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -425,15 +425,18 @@ For the srclib\pcre\install-sh component:
 
 For the pcre component:
 
-/*
 PCRE LICENCE
 ------------
+
 PCRE is a library of functions to support regular expressions whose syntax
 and semantics are as close as possible to those of the Perl 5 language.
+
 Written by: Philip Hazel <ph10@cam.ac.uk>
+
 University of Cambridge Computing Service,
 Cambridge, England. Phone: +44 1223 334714.
-Copyright (c) 1997-2000 University of Cambridge
+
+Copyright (c) 1997-2001 University of Cambridge
 
 Permission is granted to anyone to use this software for any purpose on any
 computer system, and to redistribute it freely, subject to the following
@@ -444,29 +447,34 @@ restrictions:
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 2. The origin of this software must not be misrepresented, either by
-   explicit claim or by omission. In practice, this means you must put
-   a sentence like this
+   explicit claim or by omission. In practice, this means that if you use
+   PCRE in software which you distribute to others, commercially or
+   otherwise, you must put a sentence like this
 
      Regular expression support is provided by the PCRE library package,
-     which is open source software, copyright by the University of
-     Cambridge.
+     which is open source software, written by Philip Hazel, and copyright
+     by the University of Cambridge, England.
 
    somewhere reasonably visible in your documentation and in any relevant
-   files. A reference to the ftp site for the source should also be given
+   files or online help data or similar. A reference to the ftp site for
+   the source, that is, to
+
+     ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
 
-   ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
-   in the documentation.
+   should also be given in the documentation.
 
 3. Altered versions must be plainly marked as such, and must not be
    misrepresented as being the original software.
 
 4. If PCRE is embedded in any software that is released under the GNU
-   General Purpose Licence (GPL), then the terms of that licence shall
-   supersede any condition above with which it is incompatible.
+   General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL),
+   then the terms of that licence shall supersede any condition above with
+   which it is incompatible.
 
-End
-*/
+The documentation for PCRE, supplied in the "doc" directory, is distributed
+under the same terms as the software itself.
 
+End PCRE LICENCE
 
 
 For the test\zb.c component:

diff --git a/README b/README
index a227de12c5483c16e3fc87967f6f3c03c62fd626..bcda0b9c7e12a2cd637ca5de1f5ae2c6ff30d854 100644 (file)
--- a/README
+++ b/README
@@ -80,9 +80,9 @@
   modifications by Spyglass Inc., Carnegie Mellon University, and
   Bell Communications Research, Inc (Bellcore).
 
-  Regular expression support is provided by the PCRE library package,
-  which is open source software, copyright by the University of Cambridge
-  and authored by Philip Hazel.  The original software is available from
+  Regular expression support is provided by the PCRE library package, which
+  is open source software, written by Philip Hazel, and copyright by the
+  University of Cambridge, England.  The original software is available from
      ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
 
   Apache 2.0 relies heavily on the use of autoconf and libtool to provide