diff --git a/doc/apidocs.xml b/doc/apidocs.xml
index 8870ce677a2294b415c9ab09f6d04f4b172ef1e0..b020c2bef19e5c1c7f5556086c56f93bb5452ba0 100644
--- a/doc/apidocs.xml
+++ b/doc/apidocs.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/bug-report.xml b/doc/bug-report.xml
index 3cde8b3cb4319a47af7835ee7c22d360f9610c89..c5f7aedfc0b37207cb36d579907fdc33afd6cfb9 100644
--- a/doc/bug-report.xml
+++ b/doc/bug-report.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/build-misc.xml b/doc/build-misc.xml
index 5c54f4323a1242a9dc27b21355b7662b8f894ad3..a65ecb9db1efd1c94113d2dbbc018c904873d21c 100644
--- a/doc/build-misc.xml
+++ b/doc/build-misc.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/build-other.xml b/doc/build-other.xml
index f443e7d9d096ecdea9956285a706a89d6751e3a0..af63a69459ca3b557bbd096be246aa954793f972 100644
--- a/doc/build-other.xml
+++ b/doc/build-other.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/build-winunix.xml b/doc/build-winunix.xml
index d29f1c6d13eee1ce7d16ac0293bef82f51bc5d89..61fa43b2913a5641e88e233be6616252ddc52954 100644
--- a/doc/build-winunix.xml
+++ b/doc/build-winunix.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/build.xml b/doc/build.xml
index 2fe0cc8e0e1d28144a48d502a76734a1f6c0019d..c6c8228bdb00bb5f2b1d19085ba70f6b2e46bd7b 100644
--- a/doc/build.xml
+++ b/doc/build.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/charter.xml b/doc/charter.xml
index 74ba47d2248c6c14ddef2fc454d26a689e254e14..7b04e17445a208c5e601bd8b5aa5400c807d6071 100644
--- a/doc/charter.xml
+++ b/doc/charter.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/createdoc.xml b/doc/createdoc.xml
index a20043666bbe6cf91044542388f9769c956dd172..d3771d63a29e38058e71653afaa135b3b22b1737 100644
--- a/doc/createdoc.xml
+++ b/doc/createdoc.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/dom3.xml b/doc/dom3.xml
index 9ddcefb6b7d070bb62544734a3601d7fd2647bb5..d7b6ed8d931b7369f8cf377c01fa9bf137670ad1 100644
--- a/doc/dom3.xml
+++ b/doc/dom3.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/domcount.xml b/doc/domcount.xml
index 5c321d0b1e3fbe45f5b937ed0c239bb7973bb45a..c9d67f085ae4bcc250966d026fadd878bcef3a84 100644
--- a/doc/domcount.xml
+++ b/doc/domcount.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/domprint.xml b/doc/domprint.xml
index 215ec3e5107e08bddb592c6733490cd31f369fc7..c5c283f30588cf1c0576ca6dd08bceb38d89cb0c 100644
--- a/doc/domprint.xml
+++ b/doc/domprint.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/enumval.xml b/doc/enumval.xml
index c34bd9e2ffce17ea71134da8ef9ae84d4b4d9451..1512cda0a12895ac65a531a92831c236925779c3 100644
--- a/doc/enumval.xml
+++ b/doc/enumval.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/faq-build.xml b/doc/faq-build.xml
index e2c942cd60a3532381af8b2b10017094613e7ce3..035c159a619774d62deb79783c42538ed1320824 100644
--- a/doc/faq-build.xml
+++ b/doc/faq-build.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding = "iso-8859-1" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/faq-contributing.xml b/doc/faq-contributing.xml
index e85e92f51257976d234affaf194c10e7971ffa6d..0dd418ec5250ba2de2b280215392e4305bb19f27 100644
--- a/doc/faq-contributing.xml
+++ b/doc/faq-contributing.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding = "iso-8859-1" standalone="no"?>
 <!--
- * Copyright 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/doc/faq-distrib.xml b/doc/faq-distrib.xml
index 5e3ea244dc556a2bf412f99ae2d987abe9e0e45b..c01216dd7aaa5cc663c19754a188b443c0a8baec 100644
--- a/doc/faq-distrib.xml
+++ b/doc/faq-distrib.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" ?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/faq-other.xml b/doc/faq-other.xml
index d1a039d9a860643c19eecb12a0d66aa91198b5fb..c6d194055bf2a56996be3d1fda408c7f47954122 100644
--- a/doc/faq-other.xml
+++ b/doc/faq-other.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/faq-parse.xml b/doc/faq-parse.xml
index b6fa8dab4ef9d78116f9da2fb7fbc4502bdae138..c4c5c1c6ed449b1454a7ee640e91a7da3d68e593 100644
--- a/doc/faq-parse.xml
+++ b/doc/faq-parse.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding = "iso-8859-1" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/feedback.xml b/doc/feedback.xml
index 3515138026370918c47cd7c1dfcbe591797ea010..d7d81b8de51b74b36307d0069984d17ba26df7ba 100644
--- a/doc/feedback.xml
+++ b/doc/feedback.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"  encoding="iso-8859-1" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/install.xml b/doc/install.xml
index c1b711bb8a764cd2a02c57a462818f3e54f82852..973d151f74055a1ed842b337cce65b5d8c9f8afb 100644
--- a/doc/install.xml
+++ b/doc/install.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/memparse.xml b/doc/memparse.xml
index 9efe6412967626b8292118373cf49433b3e105ea..e6bc5f4db45ac4036c9bd335cc6c88172ab608f3 100644
--- a/doc/memparse.xml
+++ b/doc/memparse.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/migration.xml b/doc/migration.xml
index 2508d8930b1f7156b0b928d0990dae32bda6eb1d..ae0a500e76572d116cc01602b3cb1474514ec0fb 100644
--- a/doc/migration.xml
+++ b/doc/migration.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/migration_archive.xml b/doc/migration_archive.xml
index 84dab6c92c1411b9f4851a324baa52ca204b6237..5ba504713c549f57059b329308b937d2a368e95e 100644
--- a/doc/migration_archive.xml
+++ b/doc/migration_archive.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/pdf-c.xml b/doc/pdf-c.xml
index 14c647ff29dd10732e6e72e4a1ac90fc261d059c..fb9bf6cfb90b81bdcd4cd43d196feea56ed76a26 100644
--- a/doc/pdf-c.xml
+++ b/doc/pdf-c.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/pparse.xml b/doc/pparse.xml
index 9e388769a92a1dbd1364f80f420ad43c85192298..f87c854bcb8dd118dfba5d3baea86ed4b424ae8c 100644
--- a/doc/pparse.xml
+++ b/doc/pparse.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/program-deprecateddom.xml b/doc/program-deprecateddom.xml
index 2e9f507bda1b17b42c0984b518a6ec6e1c09023e..19a388cfa5434123946ea31b672582911f5fc268 100644
--- a/doc/program-deprecateddom.xml
+++ b/doc/program-deprecateddom.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/program-dom.xml b/doc/program-dom.xml
index bc5a0d3821d2380fb9938a1d6b2e4a3238611d97..0e45f1d9be8233e525f4c0272ff82ffabbef57ea 100644
--- a/doc/program-dom.xml
+++ b/doc/program-dom.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/program-others.xml b/doc/program-others.xml
index 2859ad2abbbec76d395ddfcc3a22d9c90557189e..9e7da64bb8a9c729dd6090ffc64266052d33e510 100644
--- a/doc/program-others.xml
+++ b/doc/program-others.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/program-sax.xml b/doc/program-sax.xml
index aaf3d82a7ce0f7847b544369e462e610d6a696df..5a3be71d27cee77a710939a279f873cafece6fab 100644
--- a/doc/program-sax.xml
+++ b/doc/program-sax.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/program-sax2.xml b/doc/program-sax2.xml
index 32adafb9a867f4c4164ac77653e5b811ee53afb8..02437490cca1256adbb658197f41763cbd3decd6 100644
--- a/doc/program-sax2.xml
+++ b/doc/program-sax2.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/program.xml b/doc/program.xml
index 08bf3bd15e3274a9d4471888da4cb91f48507f44..05464f8d34b3c6da2aa6a733e332c06c6d6d5b9e 100644
--- a/doc/program.xml
+++ b/doc/program.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/psviwriter.xml b/doc/psviwriter.xml
index 70c84e60023d4cc824b58cc15836380caecd7e05..3ad6f52f9ed7873f7c5d207f420eda106567c88b 100644
--- a/doc/psviwriter.xml
+++ b/doc/psviwriter.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/readme.xml b/doc/readme.xml
index 68ede45308b1dae73bd912d460a9a2cacb3c97a8..0498b2cb1b05e41cd28d663fdabfd2ba8b62d80e 100644
--- a/doc/readme.xml
+++ b/doc/readme.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/redirect.xml b/doc/redirect.xml
index 547e93747a2c963d12bcec136a7854cb4941bf00..b38e14d767832a3fe281c446960bcecd5a628570 100644
--- a/doc/redirect.xml
+++ b/doc/redirect.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/releases.xml b/doc/releases.xml
index 967a8e49662501ff87832581819c606f71ac79ec..0a7d1b0bf217ef25f644481de5c76a683a3572f3 100644
--- a/doc/releases.xml
+++ b/doc/releases.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"  encoding="iso-8859-1" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/releases_archive.xml b/doc/releases_archive.xml
index 6d3c327b08f35fe8a25413c213726df74893bf33..2dfbf8d29f066dd10a4dd1334cfa77a8e0dfc2c6 100644
--- a/doc/releases_archive.xml
+++ b/doc/releases_archive.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"  encoding="iso-8859-1" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/releases_plan.xml b/doc/releases_plan.xml
index 86e52403843d8a91f4886d21a7c2119b4b486d42..514b6f1dc8be624e89d4894c0edddee0f8793c25 100644
--- a/doc/releases_plan.xml
+++ b/doc/releases_plan.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"  encoding="iso-8859-1" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/samples.xml b/doc/samples.xml
index 7fa6c36c38fe30dea50873065c868407a7b31179..2abbe84542ba56ca7267a20fc9e7bf5c6a432066 100644
--- a/doc/samples.xml
+++ b/doc/samples.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/sax2count.xml b/doc/sax2count.xml
index 8a295bf6d8d2ed030e669ee90f55ae8534cedc41..ec3c72a815362d3a3b7949e0f5136b3d8bbd8a91 100644
--- a/doc/sax2count.xml
+++ b/doc/sax2count.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/sax2print.xml b/doc/sax2print.xml
index 478ce96aa1a6bce1af64ef3a8cea161c65788a9e..706d74519086fdd38804e749115e208bb41c7040 100644
--- a/doc/sax2print.xml
+++ b/doc/sax2print.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/saxcount.xml b/doc/saxcount.xml
index 6ecdc6d65250373618dd3d52613695836eefffb2..b61bc34d6c1844a72b7d725b367c02e9758e6c45 100644
--- a/doc/saxcount.xml
+++ b/doc/saxcount.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/saxprint.xml b/doc/saxprint.xml
index 5a93de70ffe0b70e0607e3df7d0e763ad6a20e74..2ae43b2effb5c492bddfd787998140d0f25dfe4c 100644
--- a/doc/saxprint.xml
+++ b/doc/saxprint.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/schema.xml b/doc/schema.xml
index a88e2df10c03815b5a42af6df1b4536cf59683b7..a4d3462d34c8987401fb59e5f6f5960e82510532 100644
--- a/doc/schema.xml
+++ b/doc/schema.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/scmprint.xml b/doc/scmprint.xml
index 0a12e61042c92a7f92f1d3e43a87b39a9ecc30d3..2732bf1ce92345ae35f3b023184bc1574677b0ca 100644
--- a/doc/scmprint.xml
+++ b/doc/scmprint.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/senumval.xml b/doc/senumval.xml
index 8623f3abdc3bccde575fc010da0a52a4c91e1192..8d13493ec2a67aaa8caaf351a579b7c75c4f1415 100644
--- a/doc/senumval.xml
+++ b/doc/senumval.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/stdinparse.xml b/doc/stdinparse.xml
index 58e9bd05b9190fc2bdc0bbcb6a69d1a74551a9e6..26595548e60a7317bc8ab6f2122cce7817c3af36 100644
--- a/doc/stdinparse.xml
+++ b/doc/stdinparse.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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/doc/xerces-c_book.xml b/doc/xerces-c_book.xml
index ad9412f9a50d885700cddcc1f041b500f5a2c474..d32f5ec462529359045339c14416e0ec7677e6aa 100644
--- a/doc/xerces-c_book.xml
+++ b/doc/xerces-c_book.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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
  *