Update license description for PCRE inclusion

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

1 files changed, 21 insertions, 13 deletions

diff --git a/LICENSE b/LICENSE
index 0a0cb955d0..265a3c900d 100644
--- 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: