From 8543206431671b4487caa280a02909cf85d133c3 Mon Sep 17 00:00:00 2001
From: "Roy T. Fielding" <fielding@apache.org>
Date: Tue, 11 Jul 2006 23:04:56 +0000
Subject: [PATCH] update license header text

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421020 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/configuring.xml.de             | 12 ++++++------
 docs/manual/howto/htaccess.xml.pt-br       | 12 ++++++------
 docs/manual/index.xml.pt-br                | 12 ++++++------
 docs/manual/new_features_2_0.xml.pt-br     | 12 ++++++------
 docs/manual/new_features_2_2.xml.pt-br     | 12 ++++++------
 docs/manual/style/lang/pt-br.xml           | 12 ++++++------
 docs/manual/style/latex/common.xsl         | 12 ++++++------
 docs/manual/style/latex/directiveindex.xsl | 12 ++++++------
 docs/manual/style/latex/faq.xsl            | 12 ++++++------
 docs/manual/style/latex/html.xsl           | 12 ++++++------
 docs/manual/style/latex/latex.xsl          | 12 ++++++------
 docs/manual/style/latex/manualpage.xsl     | 12 ++++++------
 docs/manual/style/latex/moduleindex.xsl    | 12 ++++++------
 docs/manual/style/latex/quickreference.xsl | 12 ++++++------
 docs/manual/style/latex/synopsis.xsl       | 12 ++++++------
 docs/manual/style/xsl/common.xsl           | 12 ++++++------
 docs/manual/style/xsl/directiveindex.xsl   | 12 ++++++------
 docs/manual/style/xsl/faq.xsl              | 12 ++++++------
 docs/manual/style/xsl/hhc.xsl              | 12 ++++++------
 docs/manual/style/xsl/hhp.xsl              | 12 ++++++------
 docs/manual/style/xsl/indexpage.xsl        | 12 ++++++------
 docs/manual/style/xsl/language.xsl         | 12 ++++++------
 docs/manual/style/xsl/maf.xsl              | 12 ++++++------
 docs/manual/style/xsl/manualpage.xsl       | 12 ++++++------
 docs/manual/style/xsl/moduleindex.xsl      | 12 ++++++------
 docs/manual/style/xsl/nroff.xsl            | 12 ++++++------
 docs/manual/style/xsl/quickreference.xsl   | 12 ++++++------
 docs/manual/style/xsl/sitemap.xsl          | 12 ++++++------
 docs/manual/style/xsl/synopsis.xsl         | 12 ++++++------
 docs/manual/style/xsl/typemap.xsl          | 12 ++++++------
 docs/manual/style/xsl/util/modtrans.xsl    | 12 ++++++------
 docs/manual/upgrading.xml.pt-br            | 12 ++++++------
 modules/ssl/config.m4                      |  1 +
 support/win32/ApacheMonitor.rc             | 12 ++++++------
 34 files changed, 199 insertions(+), 198 deletions(-)

diff --git a/docs/manual/configuring.xml.de b/docs/manual/configuring.xml.de
index 526fd7ee98..b47156f850 100644
--- 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 df2951851d..15f43794d5 100644
--- 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 94c4df6fe9..2bcdf99539 100644
--- 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 cf55e84c2c..7d897e6f19 100644
--- 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 9c7f7f1489..a3e9805137 100644
--- 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 43afbfa82a..3fc6836f1d 100644
--- 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 d7d9bc4031..a0f10cbb87 100644
--- 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 2ec1ad675d..b97c346a43 100644
--- 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 c1432776c9..5c00e7f2d2 100644
--- 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 db9172ea46..c77f1ec3a9 100644
--- 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 ecbeb1b228..76faf4a99f 100644
--- 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 13773b7a52..172e54b741 100644
--- 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 bfb83fb03e..2824d6078f 100644
--- 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 cc8ef773f2..02a27e2ad8 100644
--- 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 e7714583d3..74780ac984 100644
--- 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 68b2a6248d..4cd7d7932e 100644
--- 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 c3e386a064..1e13e7d6db 100644
--- 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 a011eabedb..2cd3d3bb55 100644
--- 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 d64a2564c9..c9fde79837 100644
--- 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 66043bb946..369377e851 100644
--- 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 fbf998d545..d62814bfc1 100644
--- 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 10da5f9bdb..4e6634df7c 100644
--- 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 998bb2bff5..f7718bd64d 100644
--- 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 2de57bbe08..30cc9d100e 100644
--- 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 4c4a5747de..e3651a4588 100644
--- 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 71330fcb96..074d7fcae5 100644
--- 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 58f3c736e8..26c08c64d1 100644
--- 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 3f3c91e8e2..eaa2c413c6 100644
--- 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 5b558547e6..dbda9d0710 100644
--- 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 e31b973dcc..4429e7ab2c 100644
--- 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 7136deced7..291f49bafa 100644
--- 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 d2878caf17..6caa58bd5b 100644
--- 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 5652943a04..c26f604a1f 100644
--- 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 af5808d75b..4e44a2939b 100644
--- 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
  *
-- 
2.40.0