From: Roy T. Fielding <fielding@apache.org>
Date: Wed, 12 Jul 2006 01:54:21 +0000 (+0000)
Subject: update license header text
X-Git-Tag: 2.3.0~2268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=891555dc16fc24756c6412aa00641f425945c506;p=thirdparty%2Fapache%2Fhttpd.git

update license header text

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

diff --git a/docs/error/README b/docs/error/README
index 2e62e1f53e4..5a589449103 100644
--- a/docs/error/README
+++ b/docs/error/README
@@ -34,5 +34,3 @@
   (Please see http://httpd.apache.org/docs-project/ if you would
    like to contribute the pages in an additional language.)
 
-
- Copyright (c) 2001-2006 The Apache Software Foundation. All rights reserved.
diff --git a/docs/manual/custom-error.xml.es b/docs/manual/custom-error.xml.es
index 50472cb1f9d..89c99813830 100644
--- a/docs/manual/custom-error.xml.es
+++ b/docs/manual/custom-error.xml.es
@@ -4,12 +4,12 @@
 <!-- English Revision: 395228 -->
 
 <!--
- Copyright 2005 The Apache Software Foundation or its licensors,
-                as applicable
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/mod/mod_aspdotnet.xml b/docs/manual/mod/mod_aspdotnet.xml
index 9434499d477..80c42360457 100644
--- a/docs/manual/mod/mod_aspdotnet.xml
+++ b/docs/manual/mod/mod_aspdotnet.xml
@@ -4,11 +4,12 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2004 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.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/mod/mod_authz_owner.xml.ja b/docs/manual/mod/mod_authz_owner.xml.ja
index fb2fe5a4238..9ddedea5610 100644
--- a/docs/manual/mod/mod_authz_owner.xml.ja
+++ b/docs/manual/mod/mod_authz_owner.xml.ja
@@ -4,12 +4,12 @@
 <!-- English Revision: 151408:395228 (outdated) -->
 
 <!--
- Copyright 2005 The Apache Software Foundation as
- applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/common.dtd b/docs/manual/style/common.dtd
index 64dd73a7f35..8bc6de73c64 100644
--- a/docs/manual/style/common.dtd
+++ b/docs/manual/style/common.dtd
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
 <!--
- Copyright 2002-2006 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/faq.dtd b/docs/manual/style/faq.dtd
index d132d7597a0..9af4f113de4 100644
--- a/docs/manual/style/faq.dtd
+++ b/docs/manual/style/faq.dtd
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
 <!--
- Copyright 2003-2006 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/lang.dtd b/docs/manual/style/lang.dtd
index f117e8d9bf0..422313c9af1 100644
--- a/docs/manual/style/lang.dtd
+++ b/docs/manual/style/lang.dtd
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
 <!--
- Copyright 2005 The Apache Software Foundation or its licensors,
-                as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/manual.de.xsl b/docs/manual/style/manual.de.xsl
index de5b47e8041..0b1667ad276 100644
--- a/docs/manual/style/manual.de.xsl
+++ b/docs/manual/style/manual.de.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2006 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/manual.en.xsl b/docs/manual/style/manual.en.xsl
index 10906d7f748..c3d88747520 100644
--- a/docs/manual/style/manual.en.xsl
+++ b/docs/manual/style/manual.en.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2006 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/manual.es.xsl b/docs/manual/style/manual.es.xsl
index b83af251552..e25c97035db 100644
--- a/docs/manual/style/manual.es.xsl
+++ b/docs/manual/style/manual.es.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2006 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/manual.fr.xsl b/docs/manual/style/manual.fr.xsl
index d6d6afa2f84..0a6444153e8 100644
--- a/docs/manual/style/manual.fr.xsl
+++ b/docs/manual/style/manual.fr.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2006 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/manual.ja.xsl b/docs/manual/style/manual.ja.xsl
index fe91f0eadf1..239141b26fb 100644
--- a/docs/manual/style/manual.ja.xsl
+++ b/docs/manual/style/manual.ja.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2006 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/manual.ko.xsl b/docs/manual/style/manual.ko.xsl
index c5c855f58d5..b4e69d92191 100644
--- a/docs/manual/style/manual.ko.xsl
+++ b/docs/manual/style/manual.ko.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2006 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/manual.pt-br.xsl b/docs/manual/style/manual.pt-br.xsl
index 117edca7a46..a6be5add420 100644
--- a/docs/manual/style/manual.pt-br.xsl
+++ b/docs/manual/style/manual.pt-br.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2006 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/manual.ru.xsl b/docs/manual/style/manual.ru.xsl
index 497639214fc..53adbad960c 100644
--- a/docs/manual/style/manual.ru.xsl
+++ b/docs/manual/style/manual.ru.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2006 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/manualpage.dtd b/docs/manual/style/manualpage.dtd
index fa150b9bbe4..17742548fb0 100644
--- a/docs/manual/style/manualpage.dtd
+++ b/docs/manual/style/manualpage.dtd
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
 <!--
- Copyright 2002-2006 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/modulesynopsis.dtd b/docs/manual/style/modulesynopsis.dtd
index 9772fce4f4e..14f947a591d 100644
--- a/docs/manual/style/modulesynopsis.dtd
+++ b/docs/manual/style/modulesynopsis.dtd
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
 <!--
- Copyright 2002-2006 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/sitemap.dtd b/docs/manual/style/sitemap.dtd
index 95bee014eb6..e47e8a9db13 100644
--- a/docs/manual/style/sitemap.dtd
+++ b/docs/manual/style/sitemap.dtd
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
 <!--
- Copyright 2002-2006 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index 5af87be70d3..0807f030f6c 100644
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
 <!--
- Copyright 2005 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index 4cd7d7932e0..993e301d484 100644
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -277,7 +277,7 @@
 
 <div id="footer">&lf;
     <p class="apache">
-        <xsl:text>Copyright 1995-2006 The Apache Software Foundation or its licensors, as applicable.</xsl:text><br />
+        <xsl:text>Copyright 2006 The Apache Software Foundation.</xsl:text><br />
         <xsl:value-of select="$message[@id='licensed']"/>
         <xsl:text> </xsl:text>
 
diff --git a/docs/manual/style/xsl/convmap.xsl b/docs/manual/style/xsl/convmap.xsl
index a7ad6904293..da4444fe495 100644
--- a/docs/manual/style/xsl/convmap.xsl
+++ b/docs/manual/style/xsl/convmap.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2005 The Apache Software Foundation or its licensors, as
- applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0
 
diff --git a/docs/manual/style/xsl/language.xsl b/docs/manual/style/xsl/language.xsl
index 4e6634df7c4..8ef0b4a0487 100644
--- a/docs/manual/style/xsl/language.xsl
+++ b/docs/manual/style/xsl/language.xsl
@@ -606,12 +606,12 @@ Some targets have additional requirements:
 <xsl:template name="copyright">
 &lf;
 <xsl:comment><xsl:text>
- Copyright 2002-2006 The Apache Software Foundation or its licensors,
-                     as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
 
      http://www.apache.org/licenses/LICENSE-2.0