From: Paul Querna Date: Sat, 22 Apr 2006 01:53:06 +0000 (+0000) Subject: Revert r395231 from the 2.2.x branch. This gets us back to the old place with regard... X-Git-Tag: 2.2.2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=786089eef9a5ed532224599acc96e2ca5bb8bc61;p=thirdparty%2Fapache%2Fhttpd.git Revert r395231 from the 2.2.x branch. This gets us back to the old place with regard to the copyright statements. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396056 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc index adef0d755b7..3a44d646f32 100644 --- a/build/NWGNUtail.inc +++ b/build/NWGNUtail.inc @@ -25,7 +25,7 @@ NLM_SCREEN_NAME = DEFAULT endif ifndef NLM_COPYRIGHT -NLM_COPYRIGHT = Copyright 2000-2006 The Apache Software Foundation or its licensors as applicable. Licensed under the Apache License Version 2.0. +NLM_COPYRIGHT = Copyright 2000-2005 The Apache Software Foundation or its licensors as applicable. Licensed under the Apache License Version 2.0. endif # diff --git a/build/binbuild.sh b/build/binbuild.sh index 6f63adce3f3..15ee27ea7a1 100755 --- a/build/binbuild.sh +++ b/build/binbuild.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 1999-2006 The Apache Software Foundation or its licensors, as +# Copyright 1999-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/bsd_makefile b/build/bsd_makefile index 9f389135ac8..d4e81fe7036 100755 --- a/build/bsd_makefile +++ b/build/bsd_makefile @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright 2000-2006 The Apache Software Foundation or its licensors, as +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/build-modules-c.awk b/build/build-modules-c.awk index 7c749f97057..b696a526809 100644 --- a/build/build-modules-c.awk +++ b/build/build-modules-c.awk @@ -1,4 +1,4 @@ -# Copyright 1999-2006 The Apache Software Foundation or its licensors, as +# Copyright 1999-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/buildinfo.sh b/build/buildinfo.sh index e16abf3ac6f..6de75fa476d 100755 --- a/build/buildinfo.sh +++ b/build/buildinfo.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2000-2006 The Apache Software Foundation or its licensors, as +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/fastgen.sh b/build/fastgen.sh index d4301d7ccb3..28c6e57b2e7 100755 --- a/build/fastgen.sh +++ b/build/fastgen.sh @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright 2000-2006 The Apache Software Foundation or its licensors, as +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/get-version.sh b/build/get-version.sh index b83750c2079..e3ba69c513e 100755 --- a/build/get-version.sh +++ b/build/get-version.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2003-2006 The Apache Software Foundation or its licensors, as +# Copyright 2003-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/install-bindist.sh.in b/build/install-bindist.sh.in index 72c0560b720..ca6860417d6 100755 --- a/build/install-bindist.sh.in +++ b/build/install-bindist.sh.in @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2001-2006 The Apache Software Foundation or its licensors, as +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/install.sh b/build/install.sh index 279e6fc97a6..6195768bd67 100755 --- a/build/install.sh +++ b/build/install.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 1999-2006 The Apache Software Foundation or its licensors, as +# Copyright 1999-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/instdso.sh b/build/instdso.sh index 8341d237847..0bc280d5735 100755 --- a/build/instdso.sh +++ b/build/instdso.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2001-2006 The Apache Software Foundation or its licensors, as +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/library.mk b/build/library.mk index 4d79845d072..62e2d4816b6 100644 --- a/build/library.mk +++ b/build/library.mk @@ -1,4 +1,4 @@ -# Copyright 2000-2006 The Apache Software Foundation or its licensors, as +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/ltlib.mk b/build/ltlib.mk index dc50213ca5a..51f5ad2cd13 100644 --- a/build/ltlib.mk +++ b/build/ltlib.mk @@ -1,4 +1,4 @@ -# Copyright 2000-2006 The Apache Software Foundation or its licensors, as +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/make_exports.awk b/build/make_exports.awk index c2352074c23..2b1b1d4ea2c 100644 --- a/build/make_exports.awk +++ b/build/make_exports.awk @@ -1,4 +1,4 @@ -# Copyright 2001-2006 The Apache Software Foundation or its licensors, as +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk index d6a1d83051a..ac7f97323ba 100644 --- a/build/make_nw_export.awk +++ b/build/make_nw_export.awk @@ -1,4 +1,4 @@ -# Copyright 2001-2006 The Apache Software Foundation or its licensors, as +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/make_var_export.awk b/build/make_var_export.awk index 369f8b2d450..374afa381ee 100644 --- a/build/make_var_export.awk +++ b/build/make_var_export.awk @@ -1,4 +1,4 @@ -# Copyright 2001-2006 The Apache Software Foundation or its licensors, as +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk index 7866573609f..9cd93890412 100644 --- a/build/mkconfNW.awk +++ b/build/mkconfNW.awk @@ -1,4 +1,4 @@ -# Copyright 2002-2006 The Apache Software Foundation or its licensors, as +# Copyright 2002-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/mkdir.sh b/build/mkdir.sh index 2ec34886a8b..889667b820f 100755 --- a/build/mkdir.sh +++ b/build/mkdir.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 1999-2006 The Apache Software Foundation or its licensors, as +# Copyright 1999-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/nw_ver.awk b/build/nw_ver.awk index a6e93daf9bb..ba6d298f4c8 100644 --- a/build/nw_ver.awk +++ b/build/nw_ver.awk @@ -1,4 +1,4 @@ -# Copyright 2002-2006 The Apache Software Foundation or its licensors, as +# Copyright 2002-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/pkg/buildpkg.sh b/build/pkg/buildpkg.sh index 2bcd1577dd2..4dd7d81756b 100755 --- a/build/pkg/buildpkg.sh +++ b/build/pkg/buildpkg.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2000-2006 The Apache Software Foundation or its licensors, as +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/program.mk b/build/program.mk index 95e285d803f..af376139ef5 100644 --- a/build/program.mk +++ b/build/program.mk @@ -1,4 +1,4 @@ -# Copyright 2000-2006 The Apache Software Foundation or its licensors, as +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/rpm/httpd.init b/build/rpm/httpd.init index c6190fcc9fa..38f2a92b529 100755 --- a/build/rpm/httpd.init +++ b/build/rpm/httpd.init @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2003-2006 The Apache Software Foundation or its licensors, as +# Copyright 2003-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/rules.mk.in b/build/rules.mk.in index de82572498b..b22d3357c1d 100644 --- a/build/rules.mk.in +++ b/build/rules.mk.in @@ -1,4 +1,4 @@ -# Copyright 2001-2006 The Apache Software Foundation or its licensors, as +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/special.mk b/build/special.mk index 06bc16a43d4..548656a62f0 100644 --- a/build/special.mk +++ b/build/special.mk @@ -1,4 +1,4 @@ -# Copyright 2000-2006 The Apache Software Foundation +# Copyright 2000-2005 The Apache Software Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/sysv_makefile b/build/sysv_makefile index 1c7dc44e5e4..63530755f99 100755 --- a/build/sysv_makefile +++ b/build/sysv_makefile @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright 2000-2006 The Apache Software Foundation or its licensors, as +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build/win32/win32ver.awk b/build/win32/win32ver.awk index 409a832dfc2..0f4f8de24e5 100644 --- a/build/win32/win32ver.awk +++ b/build/win32/win32ver.awk @@ -1,4 +1,4 @@ -# Copyright 2001-2006 The Apache Software Foundation or its licensors, as +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/buildconf b/buildconf index 3e51a09c995..704606480ac 100755 --- a/buildconf +++ b/buildconf @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 1999-2006 The Apache Software Foundation or its licensors, as +# Copyright 1999-2005 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/docs/manual/bind.xml b/docs/manual/bind.xml index 6a36853a00c..a760d07d7aa 100644 --- a/docs/manual/bind.xml +++ b/docs/manual/bind.xml @@ -4,7 +4,7 @@