From: William A. Rowe Jr Date: Mon, 6 Dec 2004 20:07:31 +0000 (+0000) Subject: Clean up indention and propogate the required notices for H.S.'s regex X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e93552e0760c3eb5063cdb2540b72165a140772e;p=thirdparty%2Fapache%2Fhttpd.git Clean up indention and propogate the required notices for H.S.'s regex and expat-lite to NOTICE. Leaves me a question; this is in httpd-1.3 LICENSE; For the expat xml parser library component: Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper Grepping the entire tree, I find no reference to Thai OSSC/C. Cooper, does this even belong here? git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@110015 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/LICENSE b/LICENSE index 34be3b43c7d..db4f2c627b1 100644 --- a/LICENSE +++ b/LICENSE @@ -287,33 +287,33 @@ For the MD5 Message-Digest library component: For the expat-lite library component: -Copyright (c) 1998, 1999 James Clark. Expat is subject to the Mozilla Public -License Version 1.1. Alternatively you may use expat under the GNU General -Public License instead. + Copyright (c) 1998, 1999 James Clark. Expat is subject to the Mozilla Public + License Version 1.1. Alternatively you may use expat under the GNU General + Public License instead. For the regex library component: -Copyright 1992, 1993, 1994 Henry Spencer. All rights reserved. -This software is not subject to any license of the American Telephone -and Telegraph Company or of the Regents of the University of California. + Copyright 1992, 1993, 1994 Henry Spencer. All rights reserved. + This software is not subject to any license of the American Telephone + and Telegraph Company or of the Regents of the University of California. -Permission is granted to anyone to use this software for any purpose on -any computer system, and to alter it and redistribute it, subject -to the following restrictions: + Permission is granted to anyone to use this software for any purpose on + any computer system, and to alter it and redistribute it, subject + to the following restrictions: -1. The author is not responsible for the consequences of use of this - software, no matter how awful, even if they arise from flaws in it. + 1. The author is not responsible for the consequences of use of this + software, no matter how awful, even if they arise from flaws in it. -2. The origin of this software must not be misrepresented, either by - explicit claim or by omission. Since few users ever read sources, - credits must appear in the documentation. + 2. The origin of this software must not be misrepresented, either by + explicit claim or by omission. Since few users ever read sources, + credits must appear in the documentation. -3. Altered versions must be plainly marked as such, and must not be - misrepresented as being the original software. Since few users - ever read sources, credits must appear in the documentation. + 3. Altered versions must be plainly marked as such, and must not be + misrepresented as being the original software. Since few users + ever read sources, credits must appear in the documentation. -4. This notice may not be removed or altered. + 4. This notice may not be removed or altered. For the expat xml parser library component: diff --git a/NOTICE b/NOTICE index 6a5638595db..75bfe82ad9f 100644 --- a/NOTICE +++ b/NOTICE @@ -10,3 +10,9 @@ Inc. MD5 Message-Digest Algorithm, including various modifications by Spyglass Inc., Carnegie Mellon University, and Bell Communications Research, Inc (Bellcore). +This work includes the Expat xml parsing library Copyright (c) +1998, 1999 James Clark, distributed under and subject to the +Mozilla Public License Version 1.1. + +This work includes the regex library Copyright 1992, 1993, 1994 +Henry Spencer, all rights reserved.