update license header text

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

diff --git a/docs/manual/configuring.xml.de b/docs/manual/configuring.xml.de
index 526fd7ee98ade09c28fa385ff260173445eea11e..b47156f8502f38dc6645be0cfc920f94715c4540 100644 (file)
--- a/docs/manual/configuring.xml.de
+++ b/docs/manual/configuring.xml.de
@@ -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/howto/htaccess.xml.pt-br b/docs/manual/howto/htaccess.xml.pt-br
index df2951851d913306a3f116cf97041fe6b0931882..15f43794d578420e22bcc74d1ef3bcd97807840b 100644 (file)
--- a/docs/manual/howto/htaccess.xml.pt-br
+++ b/docs/manual/howto/htaccess.xml.pt-br
@@ -4,12 +4,12 @@
 <!-- English Revision: 151408 $ -->
 
 <!--
- 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/index.xml.pt-br b/docs/manual/index.xml.pt-br
index 94c4df6fe90c6e4b0171451cc985412e7d024e77..2bcdf99539d8e4d2e9c17425bd58f19916235d18 100644 (file)
--- a/docs/manual/index.xml.pt-br
+++ b/docs/manual/index.xml.pt-br
@@ -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/new_features_2_0.xml.pt-br b/docs/manual/new_features_2_0.xml.pt-br
index cf55e84c2c6133cfdcca72faf00a5e6cf8182c93..7d897e6f1971d4c40da169f195555208368d9546 100644 (file)
--- a/docs/manual/new_features_2_0.xml.pt-br
+++ b/docs/manual/new_features_2_0.xml.pt-br
@@ -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/new_features_2_2.xml.pt-br b/docs/manual/new_features_2_2.xml.pt-br
index 9c7f7f148919fbb97285a15418edbaefcad4b7a2..a3e9805137a9fc7e2c29d4026bfc3eaef9f5aa03 100644 (file)
--- a/docs/manual/new_features_2_2.xml.pt-br
+++ b/docs/manual/new_features_2_2.xml.pt-br
@@ -4,12 +4,12 @@
 <!-- English Revision: 151408:395228 (outdated) -->
 
 <!--
- 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/lang/pt-br.xml b/docs/manual/style/lang/pt-br.xml
index 43afbfa82abf731723029585f0f3a1c2d961f2a9..3fc6836f1dcfae09da666e3d3d8b75807b8e1982 100644 (file)
--- a/docs/manual/style/lang/pt-br.xml
+++ b/docs/manual/style/lang/pt-br.xml
@@ -3,12 +3,12 @@
 <!-- English Revision: 333005 -->
 
 <!--
- 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/latex/common.xsl b/docs/manual/style/latex/common.xsl
index d7d9bc4031eae5cc72cf1b544c4973fabb048db4..a0f10cbb87c3d9bcc74e429b90004364954d2ab6 100644 (file)
--- a/docs/manual/style/latex/common.xsl
+++ b/docs/manual/style/latex/common.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/latex/directiveindex.xsl b/docs/manual/style/latex/directiveindex.xsl
index 2ec1ad675df33c6a00af7125055e0710754d4a0a..b97c346a436b13d806aa33925ac0340b5f5e7ae5 100644 (file)
--- a/docs/manual/style/latex/directiveindex.xsl
+++ b/docs/manual/style/latex/directiveindex.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/latex/faq.xsl b/docs/manual/style/latex/faq.xsl
index c1432776c9168bea55b21d4cc0fba2d6a1bab129..5c00e7f2d202a7c6e2448053e1b1c5f98510e5bb 100644 (file)
--- a/docs/manual/style/latex/faq.xsl
+++ b/docs/manual/style/latex/faq.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/latex/html.xsl b/docs/manual/style/latex/html.xsl
index db9172ea465f169406a9c8616aea59cc53e3152a..c77f1ec3a92936e877a0881c98a3f16b7d1dba97 100644 (file)
--- a/docs/manual/style/latex/html.xsl
+++ b/docs/manual/style/latex/html.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/latex/latex.xsl b/docs/manual/style/latex/latex.xsl
index ecbeb1b228b39fb7c5c572432a8997d20cb7bfbf..76faf4a99f7776ff40e6363f0fde38eed9c84657 100644 (file)
--- a/docs/manual/style/latex/latex.xsl
+++ b/docs/manual/style/latex/latex.xsl
@@ -5,12 +5,12 @@
 ]>
 
 <!--
- 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/latex/manualpage.xsl b/docs/manual/style/latex/manualpage.xsl
index 13773b7a521ea90157e2ca877424186c47c2f0ad..172e54b741168f01552c6936ed59c3967ba66f53 100644 (file)
--- a/docs/manual/style/latex/manualpage.xsl
+++ b/docs/manual/style/latex/manualpage.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/latex/moduleindex.xsl b/docs/manual/style/latex/moduleindex.xsl
index bfb83fb03e9ce271d46a6b239b214d8bb43a8576..2824d6078fc38ad9138a4a0576d7ab86db1e6145 100644 (file)
--- a/docs/manual/style/latex/moduleindex.xsl
+++ b/docs/manual/style/latex/moduleindex.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/latex/quickreference.xsl b/docs/manual/style/latex/quickreference.xsl
index cc8ef773f23bb766d064a388f37b49e064dbf9e6..02a27e2ad804472d427df4993a6c25b3b238b89e 100644 (file)
--- a/docs/manual/style/latex/quickreference.xsl
+++ b/docs/manual/style/latex/quickreference.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/latex/synopsis.xsl b/docs/manual/style/latex/synopsis.xsl
index e7714583d3a4a3812cf18627470ee4d5d4d29a39..74780ac984bf60a3af187cb8edc6eb34c2608122 100644 (file)
--- a/docs/manual/style/latex/synopsis.xsl
+++ b/docs/manual/style/latex/synopsis.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index 68b2a6248d6cb4a16ba2ca4a7930ef9f7d13d217..4cd7d7932e0512ae092dcbce2d8092d5154f9242 100644 (file)
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/xsl/directiveindex.xsl b/docs/manual/style/xsl/directiveindex.xsl
index c3e386a064ec77e2a599082733478c6ecb9e00a5..1e13e7d6dbf8392f00bcceb90c0164db22ec870d 100644 (file)
--- a/docs/manual/style/xsl/directiveindex.xsl
+++ b/docs/manual/style/xsl/directiveindex.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/xsl/faq.xsl b/docs/manual/style/xsl/faq.xsl
index a011eabedbad0c9d0c15af44c9d5beda72f3e27f..2cd3d3bb551b3748b8c760d9823634ed2d27a7e7 100644 (file)
--- a/docs/manual/style/xsl/faq.xsl
+++ b/docs/manual/style/xsl/faq.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/xsl/hhc.xsl b/docs/manual/style/xsl/hhc.xsl
index d64a2564c958f686cf2e62d9086ed879d0e742a6..c9fde79837ae949d40d1d298cdcf53ab73504a64 100644 (file)
--- a/docs/manual/style/xsl/hhc.xsl
+++ b/docs/manual/style/xsl/hhc.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/xsl/hhp.xsl b/docs/manual/style/xsl/hhp.xsl
index 66043bb946d99bc2261468118288ff0616cf15ef..369377e85157218cb1f800ea2c7d4a83f8a16cd1 100644 (file)
--- a/docs/manual/style/xsl/hhp.xsl
+++ b/docs/manual/style/xsl/hhp.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/xsl/indexpage.xsl b/docs/manual/style/xsl/indexpage.xsl
index fbf998d54530467f378587e09f9d088bcefa5112..d62814bfc1cb98bb1bf720d6df64364ce7293105 100644 (file)
--- a/docs/manual/style/xsl/indexpage.xsl
+++ b/docs/manual/style/xsl/indexpage.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/xsl/language.xsl b/docs/manual/style/xsl/language.xsl
index 10da5f9bdbe30f9ec173efbddf3419fcd6d00672..4e6634df7c4bd70373e58af9b722eb76ab9d120c 100644 (file)
--- a/docs/manual/style/xsl/language.xsl
+++ b/docs/manual/style/xsl/language.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2004-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/xsl/maf.xsl b/docs/manual/style/xsl/maf.xsl
index 998bb2bff58709de59cac90f2db893cd47977fa9..f7718bd64d1d925f6c429c0a0f381e0b1297c3a2 100644 (file)
--- a/docs/manual/style/xsl/maf.xsl
+++ b/docs/manual/style/xsl/maf.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2004-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/xsl/manualpage.xsl b/docs/manual/style/xsl/manualpage.xsl
index 2de57bbe08265cb1eebedba45823267d27caf59d..30cc9d100e71537380b8d6e687e8de86330cdbc4 100644 (file)
--- a/docs/manual/style/xsl/manualpage.xsl
+++ b/docs/manual/style/xsl/manualpage.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/xsl/moduleindex.xsl b/docs/manual/style/xsl/moduleindex.xsl
index 4c4a5747de5bf6ac27e6ba8c1e1fd546425f82d0..e3651a4588dcb9ffa465da08b4a4b728223c5933 100644 (file)
--- a/docs/manual/style/xsl/moduleindex.xsl
+++ b/docs/manual/style/xsl/moduleindex.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/xsl/nroff.xsl b/docs/manual/style/xsl/nroff.xsl
index 71330fcb966329780fbbb963a01cd122b4a11a0c..074d7fcae588a1a5f40221b27d93bbd5973ea04d 100644 (file)
--- a/docs/manual/style/xsl/nroff.xsl
+++ b/docs/manual/style/xsl/nroff.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/xsl/quickreference.xsl b/docs/manual/style/xsl/quickreference.xsl
index 58f3c736e82c4e979dc8277c25782194264714f5..26c08c64d181cbc7da5dedaadd379521945146d1 100644 (file)
--- a/docs/manual/style/xsl/quickreference.xsl
+++ b/docs/manual/style/xsl/quickreference.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/xsl/sitemap.xsl b/docs/manual/style/xsl/sitemap.xsl
index 3f3c91e8e29e40de0520117783a3d4822bfd43b6..eaa2c413c6799e3db3077beb1b0c602acfe28030 100644 (file)
--- a/docs/manual/style/xsl/sitemap.xsl
+++ b/docs/manual/style/xsl/sitemap.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/xsl/synopsis.xsl b/docs/manual/style/xsl/synopsis.xsl
index 5b558547e64c4e3de8f5d6ab28b41a6027279ee3..dbda9d0710b5c37e7d137c317194f5fee704b494 100644 (file)
--- a/docs/manual/style/xsl/synopsis.xsl
+++ b/docs/manual/style/xsl/synopsis.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/xsl/typemap.xsl b/docs/manual/style/xsl/typemap.xsl
index e31b973dcc8ba55fe843358ee3098c95c70f5a86..4429e7ab2c25f82eacd6b9d83ad98c146e38e113 100644 (file)
--- a/docs/manual/style/xsl/typemap.xsl
+++ b/docs/manual/style/xsl/typemap.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/xsl/util/modtrans.xsl b/docs/manual/style/xsl/util/modtrans.xsl
index 7136deced7536c4e6cadb6c43a83a341977c9b8d..291f49bafa1f05a834f5d8e7a086ec0b6f8b80f2 100644 (file)
--- a/docs/manual/style/xsl/util/modtrans.xsl
+++ b/docs/manual/style/xsl/util/modtrans.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
- 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/upgrading.xml.pt-br b/docs/manual/upgrading.xml.pt-br
index d2878caf17a6a3a551df2c9021f4c6c4a1c32c02..6caa58bd5b42c44c8ef369b2d86e52949f978ee4 100644 (file)
--- a/docs/manual/upgrading.xml.pt-br
+++ b/docs/manual/upgrading.xml.pt-br
@@ -4,12 +4,12 @@
 <!-- English Revision: 151408:395228 (outdated) -->
 
 <!--
- 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/modules/ssl/config.m4 b/modules/ssl/config.m4
index 5652943a04b67138a2441df111baeb784bfe7076..c26f604a1f6e96acedd355a62e77feb2cd7c4750 100644 (file)
--- a/modules/ssl/config.m4
+++ b/modules/ssl/config.m4
@@ -1,5 +1,6 @@
 dnl  Copyright 2001-2006 The Apache Software Foundation or its licensors, as
 dnl  applicable.
+dnl
 dnl  Licensed under the Apache License, Version 2.0 (the "License");
 dnl  you may not use this file except in compliance with the License.
 dnl  You may obtain a copy of the License at

diff --git a/support/win32/ApacheMonitor.rc b/support/win32/ApacheMonitor.rc
index af5808d75bc8266a8824a22d99ac230b39b6e04e..4e44a2939bad02d74840dac9cb5a8d853dfcf382 100644 (file)
--- a/support/win32/ApacheMonitor.rc
+++ b/support/win32/ApacheMonitor.rc
@@ -1,9 +1,9 @@
-/* Copyright 2001-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
  *