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 2e62e1f53e488c85f184011118e4d52bfa013bcc..5a589449103f45d91a2654eb70c65794746743a9 100644 (file)
--- 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 50472cb1f9d6cbe3176f70b0a9eebdb7840bef02..89c998138309c879d4ac3701216722e19801049b 100644 (file)
--- 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 9434499d47795e60d85b5d309d15f76dc806b644..80c4236045766b0a9c15d83e7776779af8f85ef0 100644 (file)
--- 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 fb2fe5a4238c01d93cc5bbc606f6928b5c984a33..9ddedea5610455082d23d70f077b1e304c05c58a 100644 (file)
--- 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 64dd73a7f3507ff116d41c90f51f623dbf97fd15..8bc6de73c649c3d71002863bbbc9be26ae8f617e 100644 (file)
--- 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 d132d7597a07cc9f39267896a6330fe063eee7af..9af4f113de4ea8244fab8da2053279f39dec7ce8 100644 (file)
--- 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 f117e8d9bf0087e984be2b80da73091096124ea1..422313c9af1b8e4a2424eb768aee631e251e41b2 100644 (file)
--- 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 de5b47e80416be158bbc6fa5debf3ae260d2c69d..0b1667ad276e933c0cfb34ecf1d66d9a2b5ef417 100644 (file)
--- 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 10906d7f74886dfafdf9b99041829c6674a78399..c3d88747520be8aa00310c50d54e346aa43ca450 100644 (file)
--- 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 b83af2515527a71c1aaa7234ef39077b3b23341a..e25c97035dbcd5b7968ae5e4b757a7c332b0cbe8 100644 (file)
--- 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 d6d6afa2f8471bbc470147c784a790e8d1fd87f9..0a6444153e897727dd9c2cdda5570db765df2387 100644 (file)
--- 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 fe91f0eadf10aa8e7fa45a5fa8d0c20e7612ce0c..239141b26fb5af8fb93474a4e52cb572541f8424 100644 (file)
--- 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 c5c855f58d529c6c6235898b51e7817e2b9769f7..b4e69d92191892395df25bc9d18b51bd6aa4e756 100644 (file)
--- 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 117edca7a461def263a71ff5249129fc528201d5..a6be5add420e572c5634b4235711b6b191b4126e 100644 (file)
--- 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 497639214fc46e07535c59b05c6d20303dc9ba39..53adbad960c0f9e46b916d45e729c2a484e21b67 100644 (file)
--- 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 fa150b9bbe46c40ec8a66f8f027322bf32739ff9..17742548fb0fe0beb3dd5606f6bab163d3fb7dac 100644 (file)
--- 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 9772fce4f4e4bc2f89ab6d3c174064bfb2009653..14f947a591de489cbba76c6e9c59b579b7783434 100644 (file)
--- 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 95bee014eb6dbe953cee1d5ed5cdc4eabb4e3b21..e47e8a9db13079c3b465d7462981d2a35f58c18d 100644 (file)
--- 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 5af87be70d355b3ce1914bf47f8997c318e25193..0807f030f6c45a15bb667db5200388165095296a 100644 (file)
--- 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 4cd7d7932e0512ae092dcbce2d8092d5154f9242..993e301d484e67b0ca346940125bf5105b4738e5 100644 (file)
--- 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 a7ad6904293032849b97e42e76e8108f3022327f..da4444fe495c8905dcb1ea368298d8d6844404d4 100644 (file)
--- 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 4e6634df7c4bd70373e58af9b722eb76ab9d120c..8ef0b4a0487fc7a9a999bf62abbec898745fbc8b 100644 (file)
--- 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