From ee6cffd91d21b59f48f8358c815b1379e3d33866 Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Mon, 15 Jan 2007 23:11:09 +0000
Subject: [PATCH] Add standard licence header for src/documentation/content
 directory Add svn properties where not present

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@496536 13f79535-47bb-0310-9956-ffa450edef68
---
 src/documentation/content/xdocs/3rdparty.xml  |  19 +-
 src/documentation/content/xdocs/book.xml      |  19 +-
 .../content/xdocs/casestudies.xml             |  19 +-
 src/documentation/content/xdocs/changes.xml   |  19 +-
 src/documentation/content/xdocs/faq.xml       |  19 +-
 .../content/xdocs/getinvolved/book.xml        |  19 +-
 .../content/xdocs/getinvolved/branching.xml   |  19 +-
 .../content/xdocs/getinvolved/index.xml       |  19 +-
 .../content/xdocs/historyandfuture.xml        |  19 +-
 .../content/xdocs/howtobuild.xml              |  19 +-
 src/documentation/content/xdocs/hpsf/book.xml |  19 +-
 .../content/xdocs/hpsf/how-to.xml             |  19 +-
 .../content/xdocs/hpsf/index.xml              |  19 +-
 .../content/xdocs/hpsf/internals.xml          |  19 +-
 .../content/xdocs/hpsf/thumbnails.xml         |  19 +-
 src/documentation/content/xdocs/hpsf/todo.xml |  19 +-
 src/documentation/content/xdocs/hslf/book.xml |  19 +-
 .../content/xdocs/hslf/how-to-shapes.xml      | 619 +++++++++---------
 .../content/xdocs/hslf/index.xml              |  19 +-
 .../content/xdocs/hslf/ppt-file-format.xml    |  19 +-
 .../content/xdocs/hslf/quick-guide.xml        |  19 +-
 src/documentation/content/xdocs/hssf/book.xml |  19 +-
 .../content/xdocs/hssf/chart.xml              |  19 +-
 .../content/xdocs/hssf/diagram1.xml           |  19 +-
 .../content/xdocs/hssf/diagrams.xml           |  19 +-
 .../content/xdocs/hssf/eval-devguide.xml      |  19 +-
 src/documentation/content/xdocs/hssf/eval.xml |  19 +-
 .../content/xdocs/hssf/formula.xml            |  19 +-
 .../content/xdocs/hssf/hacking-hssf.xml       |  19 +-
 .../content/xdocs/hssf/how-to.xml             |  19 +-
 .../content/xdocs/hssf/index.xml              |  19 +-
 .../content/xdocs/hssf/limitations.xml        |  19 +-
 .../content/xdocs/hssf/quick-guide.xml        |  19 +-
 .../content/xdocs/hssf/record-generator.xml   |  19 +-
 .../content/xdocs/hssf/use-case.xml           |  19 +-
 src/documentation/content/xdocs/hwpf/book.xml |  19 +-
 .../content/xdocs/hwpf/docoverview.xml        |  19 +-
 .../content/xdocs/hwpf/index.xml              |  19 +-
 .../content/xdocs/hwpf/projectplan.xml        |  19 +-
 .../content/xdocs/hwpf/quick-guide.xml        |  19 +-
 src/documentation/content/xdocs/index.xml     |  19 +-
 src/documentation/content/xdocs/legal.xml     |  19 +-
 src/documentation/content/xdocs/mirrors.xml   |  19 +-
 src/documentation/content/xdocs/news.xml      |  19 +-
 src/documentation/content/xdocs/news/book.xml |  19 +-
 .../content/xdocs/news/logocontest.xml        |  19 +-
 src/documentation/content/xdocs/overview.xml  |  19 +-
 src/documentation/content/xdocs/patches.xml   |  19 +-
 .../content/xdocs/plan/POI10Vision.xml        |  19 +-
 .../content/xdocs/plan/POI20Vision.xml        |  19 +-
 src/documentation/content/xdocs/plan/book.xml |  19 +-
 .../content/xdocs/plan/index.xml              |  19 +-
 .../content/xdocs/plan/release.xml            |  19 +-
 src/documentation/content/xdocs/poi-ruby.xml  |  19 +-
 .../content/xdocs/poifs/book.xml              |  19 +-
 .../content/xdocs/poifs/fileformat.xml        |  19 +-
 .../content/xdocs/poifs/how-to.xml            |  19 +-
 .../xdocs/poifs/html/POIFSDesignDocument.html |  19 +-
 .../content/xdocs/poifs/index.xml             |  19 +-
 .../content/xdocs/poifs/usecases.xml          |  19 +-
 .../content/xdocs/references/book.xml         |  19 +-
 .../content/xdocs/references/index.xml        |  19 +-
 .../content/xdocs/resolutions/book.xml        |  19 +-
 .../content/xdocs/resolutions/index.xml       |  19 +-
 .../content/xdocs/resolutions/res001.xml      |  19 +-
 src/documentation/content/xdocs/site.xml      |  19 +-
 src/documentation/content/xdocs/status.xml    |  19 +-
 src/documentation/content/xdocs/tabs.xml      |  19 +-
 src/documentation/content/xdocs/todo.xml      |  19 +-
 .../content/xdocs/trans/book.xml              |  19 +-
 .../content/xdocs/trans/de/book.xml           |  19 +-
 .../content/xdocs/trans/de/index.xml          |  19 +-
 .../content/xdocs/trans/es/3rdparty.xml       |  19 +-
 .../content/xdocs/trans/es/book.xml           |  19 +-
 .../content/xdocs/trans/es/casestudies.xml    |  19 +-
 .../content/xdocs/trans/es/changes.xml        |  19 +-
 .../content/xdocs/trans/es/faq.xml            |  19 +-
 .../xdocs/trans/es/historyandfuture.xml       |  19 +-
 .../content/xdocs/trans/es/hssf/book.xml      |  19 +-
 .../content/xdocs/trans/es/hssf/diagram1.xml  |  19 +-
 .../content/xdocs/trans/es/hssf/diagrams.xml  |  19 +-
 .../content/xdocs/trans/es/hssf/formula.xml   |  19 +-
 .../xdocs/trans/es/hssf/hacking-hssf.xml      |  19 +-
 .../content/xdocs/trans/es/hssf/how-to.xml    |  19 +-
 .../content/xdocs/trans/es/hssf/index.xml     |  19 +-
 .../xdocs/trans/es/hssf/limitations.xml       |  19 +-
 .../xdocs/trans/es/hssf/quick-guide.xml       |  19 +-
 .../xdocs/trans/es/hssf/record-generator.xml  |  19 +-
 .../content/xdocs/trans/es/hssf/use-case.xml  |  19 +-
 .../content/xdocs/trans/es/index.xml          |  19 +-
 .../content/xdocs/trans/es/news.xml           |  19 +-
 .../content/xdocs/trans/es/overview.xml       |  19 +-
 .../content/xdocs/trans/es/patches.xml        |  19 +-
 .../content/xdocs/trans/es/todo.xml           |  19 +-
 .../content/xdocs/trans/es/who.xml            |  19 +-
 .../content/xdocs/trans/guidelines.xml        |  19 +-
 .../content/xdocs/trans/index.xml             |  19 +-
 .../content/xdocs/utils/book.xml              |  19 +-
 .../content/xdocs/utils/index.xml             |  19 +-
 .../content/xdocs/utils/logging.xml           |  19 +-
 src/documentation/content/xdocs/who.xml       |  19 +-
 src/documentation/skinconf.xml                |  19 +-
 102 files changed, 2136 insertions(+), 402 deletions(-)

diff --git a/src/documentation/content/xdocs/3rdparty.xml b/src/documentation/content/xdocs/3rdparty.xml
index 2c957c941d..ada6da4d3c 100644
--- a/src/documentation/content/xdocs/3rdparty.xml
+++ b/src/documentation/content/xdocs/3rdparty.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/book.xml b/src/documentation/content/xdocs/book.xml
index 7da92a6651..7c8fd34eb3 100644
--- a/src/documentation/content/xdocs/book.xml
+++ b/src/documentation/content/xdocs/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "./dtd/book-cocoon-v10.dtd">
 
 <book software="POI"
diff --git a/src/documentation/content/xdocs/casestudies.xml b/src/documentation/content/xdocs/casestudies.xml
index ae1b52545b..7d1c6e4e84 100644
--- a/src/documentation/content/xdocs/casestudies.xml
+++ b/src/documentation/content/xdocs/casestudies.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml
index 898991c235..0f2a57dcff 100644
--- a/src/documentation/content/xdocs/changes.xml
+++ b/src/documentation/content/xdocs/changes.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE changes PUBLIC "-//APACHE//DTD Changes V1.1//EN" "./dtd/changes-v11.dtd">
 
 <changes>
diff --git a/src/documentation/content/xdocs/faq.xml b/src/documentation/content/xdocs/faq.xml
index 79a38ce713..e74b6f0901 100644
--- a/src/documentation/content/xdocs/faq.xml
+++ b/src/documentation/content/xdocs/faq.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE faqs PUBLIC "-//APACHE//DTD FAQ V1.1//EN" "./dtd/faq-v11.dtd">
 
 <faqs title="Frequently Asked Questions">
diff --git a/src/documentation/content/xdocs/getinvolved/book.xml b/src/documentation/content/xdocs/getinvolved/book.xml
index a4c1b9277c..9e9f13771a 100644
--- a/src/documentation/content/xdocs/getinvolved/book.xml
+++ b/src/documentation/content/xdocs/getinvolved/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "./dtd/book-cocoon-v10.dtd">
 
 <book software="POI" 
diff --git a/src/documentation/content/xdocs/getinvolved/branching.xml b/src/documentation/content/xdocs/getinvolved/branching.xml
index 098bc1b4ce..4957505652 100644
--- a/src/documentation/content/xdocs/getinvolved/branching.xml
+++ b/src/documentation/content/xdocs/getinvolved/branching.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/getinvolved/index.xml b/src/documentation/content/xdocs/getinvolved/index.xml
index 0bc5ec0152..9f55aa6db9 100644
--- a/src/documentation/content/xdocs/getinvolved/index.xml
+++ b/src/documentation/content/xdocs/getinvolved/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/historyandfuture.xml b/src/documentation/content/xdocs/historyandfuture.xml
index d15880a102..3473a664f7 100644
--- a/src/documentation/content/xdocs/historyandfuture.xml
+++ b/src/documentation/content/xdocs/historyandfuture.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/howtobuild.xml b/src/documentation/content/xdocs/howtobuild.xml
index 8b738454bf..48d9beb0e4 100644
--- a/src/documentation/content/xdocs/howtobuild.xml
+++ b/src/documentation/content/xdocs/howtobuild.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hpsf/book.xml b/src/documentation/content/xdocs/hpsf/book.xml
index f50c1b507d..165f3209f6 100644
--- a/src/documentation/content/xdocs/hpsf/book.xml
+++ b/src/documentation/content/xdocs/hpsf/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 <!-- $Id$ -->
 <book software="POI Project" 
diff --git a/src/documentation/content/xdocs/hpsf/how-to.xml b/src/documentation/content/xdocs/hpsf/how-to.xml
index 93833430f5..d492c260b6 100644
--- a/src/documentation/content/xdocs/hpsf/how-to.xml
+++ b/src/documentation/content/xdocs/hpsf/how-to.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
 "../dtd/document-v11.dtd">
 <!-- $Id$ -->
diff --git a/src/documentation/content/xdocs/hpsf/index.xml b/src/documentation/content/xdocs/hpsf/index.xml
index dab4086825..9386b7149a 100644
--- a/src/documentation/content/xdocs/hpsf/index.xml
+++ b/src/documentation/content/xdocs/hpsf/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <!-- $Id$ -->
 
diff --git a/src/documentation/content/xdocs/hpsf/internals.xml b/src/documentation/content/xdocs/hpsf/internals.xml
index 3f314752ab..10430201e9 100644
--- a/src/documentation/content/xdocs/hpsf/internals.xml
+++ b/src/documentation/content/xdocs/hpsf/internals.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <!-- $Id$ -->
 
diff --git a/src/documentation/content/xdocs/hpsf/thumbnails.xml b/src/documentation/content/xdocs/hpsf/thumbnails.xml
index fb24ba807a..3b62481eee 100644
--- a/src/documentation/content/xdocs/hpsf/thumbnails.xml
+++ b/src/documentation/content/xdocs/hpsf/thumbnails.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
 "../dtd/document-v11.dtd">
 <!-- $Id$ -->
diff --git a/src/documentation/content/xdocs/hpsf/todo.xml b/src/documentation/content/xdocs/hpsf/todo.xml
index 7b5bffeb99..917a1e158c 100644
--- a/src/documentation/content/xdocs/hpsf/todo.xml
+++ b/src/documentation/content/xdocs/hpsf/todo.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <!-- $Id$ -->
 
diff --git a/src/documentation/content/xdocs/hslf/book.xml b/src/documentation/content/xdocs/hslf/book.xml
index a8e76d7f79..643d17c66d 100644
--- a/src/documentation/content/xdocs/hslf/book.xml
+++ b/src/documentation/content/xdocs/hslf/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2005 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 
 <book software="POI Project"
diff --git a/src/documentation/content/xdocs/hslf/how-to-shapes.xml b/src/documentation/content/xdocs/hslf/how-to-shapes.xml
index 9eb8b9df3b..2376938d9c 100644
--- a/src/documentation/content/xdocs/hslf/how-to-shapes.xml
+++ b/src/documentation/content/xdocs/hslf/how-to-shapes.xml
@@ -1,301 +1,318 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
-
-<document>
-    <header>
-        <title>Busy Developers' Guide to HSLF drawing layer</title>
-        <authors>
-            <person email="yegor@dinom.ru" name="Yegor Kozlov" id="CO"/>
-        </authors>
-    </header>
-    <body>
-        <section><title>Busy Developers' Guide to HSLF drawing layer</title>
-             <section><title>Index of Features</title>
-                <ul>
-                    <li><link href="#NewPresentation">How to create a new presentation and add new slides to it</link></li>
-                    <li><link href="#PageSize">How to retrieve or change slide size</link></li>
-                    <li><link href="#GetShapes">How to get shapes contained in a particular slide</link></li>
-                    <li><link href="#Shapes">Drawing a shape on a slide</link></li>
-                    <li><link href="#Pictures">How to work with pictures</link></li>
-                    <li><link href="#SlideTitle">How to set slide title</link></li>
-                    <li><link href="#Fill">How to work with slide/shape background</link></li>
-                </ul>
-            </section>
-            <section><title>Features</title>
-                <anchor id="NewPresentation"/>
-                <section><title>New Presentation</title>
-                  <source>
-    //create a new empty slide show
-    SlideShow ppt = new SlideShow();
-
-    //add first slide
-    Slide s1 = ppt.createSlide();
-
-    //add second slide
-    Slide s2 = ppt.createSlide();
-    
-    //save changes in a file
-    FileOutputStream out = new FileOutputStream("slideshow.ppt");
-    wb.write(out);
-    out.close();
-                 </source>
-                </section>
-                <anchor id="PageSize"/>
-                <section><title>How to retrieve or change slide size</title>
-                    <source>
-    SlideShow ppt = new SlideShow(new HSLFSlideShow("slideshow.ppt"));
-    //retrieve page size. Coordinates are expressed in points (72 dpi)
-    java.awt.Dimension pgsize = ppt.getPageSize();
-    int pgx = pgsize.width; //slide width
-    int pgy = pgsize.height; //slide height
-
-    //set new page size
-    ppt.setPageSize(new java.awt.Dimension(1024, 768));
-    //save changes 
-    FileOutputStream out = new FileOutputStream("slideshow.ppt");
-    wb.write(out);
-    out.close();
-                  </source>
-                </section>
-                <anchor id="GetShapes"/>
-                <section><title>How to get shapes contained in a particular slide</title>
-                  <p>The superclass of all shapes in HSLF is the Shape class - the elemental object that composes a drawing.
-                    The following pictute shows the class tree of HSLF shapes:
-                  </p>
-                  <p>
-			  <img src="images/hslf_shapes.gif" alt="Class Tree of HSLF Shapes" width="611" height="412"/>
-                  </p>
-                  <p>
-                    The following fragment demonstrates how to iterate over shapes for each slide.
-                  </p>
-                    <source>
-  SlideShow ppt = new SlideShow(new HSLFSlideShow("slideshow.ppt"));
-  //get slides 
-  Slide[] slide = ppt.getSlides();
-  for (int i = 0; i &lt; slide.length; i++){
-    Shape[] sh = slide[i].getShapes();
-    for (int j = 0; j &lt; sh.length; j++){
-      //name of the shape
-      String name = sh[j].getShapeName();
-
-      //shapes's anchor which defines the position of this shape in the slide
-      java.awt.Rectangle anchor = sh[j].getAnchor();
-
-      if (sh[j] instanceof Line){
-        Line line = (Line)sh[j];
-        //work with Line
-      } else if (sh[j] instanceof AutoShape){
-        AutoShape shape = (AutoShape)sh[j];
-        //work with AutoShape
-      } else if (sh[j] instanceof TextBox){
-        TextBox shape = (TextBox)sh[j];
-        //work with TextBox
-      } else if (sh[j] instanceof Picture){
-        Picture shape = (Picture)sh[j];
-        //work with Picture
-      }
-    }
-  }
-                  </source>
-                </section>
-                <anchor id="Shapes"/>
-                <section><title>Drawing a shape on a slide</title>
-                   <p>
-                     When you add a shape, you usually specify the dimensions of the shape and the position
-                     of the upper left corner of the bounding box for the shape relative to the upper left
-                     corner of the slide. Distances in the drawing layer are measured in points (72 points = 1 inch).
-                   </p>
-                    <source>
-        SlideShow ppt = new SlideShow();
-
-  Slide slide = ppt.createSlide();
-
-  //Line shape
-  Line line = new Line();
-  line.setAnchor(new java.awt.Rectangle(50, 50, 100, 20));
-  line.setLineColor(new Color(0, 128, 0));
-  line.setLineStyle(Line.LineDashDotSys);
-  slide.addShape(line);
-
-  //TextBox
-  TextBox txt = new TextBox();
-  txt.setText("Hello, World!");
-  txt.setAnchor(new java.awt.Rectangle(300, 100, 300, 50));
-
-  //use RichTextRun to work with the text format
-  RichTextRun rt = txt.getRichTextRuns()[0];
-  rt.setFontSize(32);
-  rt.setFontName("Arial");
-  rt.setBold(true);
-  rt.setItalic(true);
-  rt.setUnderlined(true);
-  rt.setFontColor(Color.red);
-  rt.setAlignment(TextBox.AlignRight);
-
-  slide.addShape(txt);
-
-  //Autoshape
-  //32-point star
-  AutoShape sh1 = new AutoShape(ShapeTypes.Star32);
-  sh1.setAnchor(new java.awt.Rectangle(50, 50, 100, 200));
-  sh1.setFillColor(Color.red);
-  slide.addShape(sh1);
-
-  //Trapezoid
-  AutoShape sh2 = new AutoShape(ShapeTypes.Trapezoid);
-  sh2.setAnchor(new java.awt.Rectangle(150, 150, 100, 200));
-  sh2.setFillColor(Color.blue);
-  slide.addShape(sh2);
-
-  FileOutputStream out = new FileOutputStream("slideshow.ppt");
-        ppt.write(out);
-  out.close();
-                  </source>
-                </section>
-                <anchor id="Pictures"/>
-                <section><title>How to work with pictures</title>
-                 
-  <p>
-  Currently, HSLF API supports the following types of pictures:
-  </p>
-  <ul>
-    <li>Windows Metafiles (WMF)</li>
-    <li>Enhanced Metafiles (EMF)</li>
-    <li>JPEG Interchange Format</li>
-    <li>Portable Network Graphics (PNG)</li>
-    <li>Macintosh PICT</li>
-  </ul>
-
-                    <source>
-  SlideShow ppt = new SlideShow(new HSLFSlideShow("slideshow.ppt"));
-
-  //extract all pictures contained in the presentation
-  PictureData[] pdata = ppt.getPictureData();
-  for (int i = 0; i &lt; pdata.length; i++){
-    PictureData pict = pdata[i];
-
-    // picture data
-    byte[] data = pict.getData();
-
-    int type = pict.getType();
-    String ext;
-    switch (type){
-      case Picture.JPEG: ext=".jpg"; break;
-      case Picture.PNG: ext=".png"; break;
-      case Picture.WMF: ext=".wmf"; break;
-      case Picture.EMF: ext=".emf"; break;
-      case Picture.PICT: ext=".pict"; break;
-      default: continue;
-    }
-    FileOutputStream out = new FileOutputStream("pict_"+i + ext);
-      out.write(data);
-      out.close();
-
-  }
-
-  // add a new picture to this slideshow and insert it in a  new slide
-  int idx = ppt.addPicture(new File("clock.jpg"), Picture.JPEG);
-
-  Picture pict = new Picture(idx);
-
-  //set image position in the slide
-  pict.setAnchor(new java.awt.Rectangle(100, 100, 300, 200));
-
-  Slide slide = ppt.createSlide();
-  slide.addShape(pict);
-
-  //now retrieve pictures containes in the first slide and save them on disk
-  slide = ppt.getSlides()[0];
-  Shape[] sh = slide.getShapes();
-  for (int i = 0; i &lt; sh.length; i++){
-    if (sh[i] instanceof Picture){
-      Picture pict = (Picture)sh[i];
-      PictureData data = pict.getPictureData();
-      byte[] data = pict.getData();
-      int type = pict.getType();
-      if (type == Picture.JPEG){
-        FileOutputStream out = new FileOutputStream("slide0_"+i+".jpg");
-        out.write(data);
-        out.close();
-      } else if (type == Picture.PNG){
-        FileOutputStream out = new FileOutputStream("slide0_"+i+".png");
-        out.write(data);
-        out.close();
-      }
-    }
-  }
-
-  FileOutputStream out = new FileOutputStream("slideshow.ppt");
-  wb.write(out);
-  out.close();
-
-                    </source>
-                </section>
-                <anchor id="SlideTitle"/>
-                <section><title>How to set slide title</title>
-                    <source>
-    SlideShow ppt = new SlideShow();
-    Slide slide = ppt.createSlide();
-    TextBox title = slide.addTitle();
-    title.setText("Hello, World!");
-    
-    //save changes 
-    FileOutputStream out = new FileOutputStream("slideshow.ppt");
-    wb.write(out);
-    out.close();
-                  </source>
-                  <p>
-                    Below is the equivalent code in PowerPoint VBA:
-                  </p>  
-                  <source>
-    Set myDocument = ActivePresentation.Slides(1)
-    myDocument.Shapes.AddTitle.TextFrame.TextRange.Text = "Hello, World!"
-                  </source>
-                </section>
-                <anchor id="Fill"/>
-                <section><title>How to modify background of a slide master</title>
-                    <source>
-        SlideShow ppt = new SlideShow();
-        SlideMaster master = ppt.getSlidesMasters()[0];
-
-        Fill fill = master.getBackground().getFill();
-        int idx = ppt.addPicture(new File("background.png"), Picture.PNG);
-        fill.setFillType(Fill.FILL_PICTURE);
-        fill.setPictureData(idx);
-                  </source>
-                </section>
-                <section><title>How to modify background of a slide</title>
-                    <source>
-        SlideShow ppt = new SlideShow();
-        Slide slide = ppt.createSlide();
-        
-        //This slide has its own background. 
-        //Without this line it will use master's background.
-        slide.setFollowMasterBackground(false);
-        Fill fill = slide.getBackground().getFill();
-        int idx = ppt.addPicture(new File("background.png"), Picture.PNG);
-        fill.setFillType(Fill.FILL_PATTERN);
-        fill.setPictureData(idx);
-                  </source>
-                </section>
-                <section><title>How to modify background of a shape</title>
-                    <source>
-        SlideShow ppt = new SlideShow();
-        Slide slide = ppt.createSlide();
-        
-        Shape shape = new AutoShape(ShapeTypes.Rectangle);
-        shape.setAnchor(new java.awt.Rectangle(100, 100, 200, 200));
-        Fill fill = shape.getFill();
-        fill.setFillType(Fill.FILL_SHADE);
-        fill.setBackgroundColor(Color.red);
-        fill.setForegroundColor(Color.green);
-        
-        slide.addShape(shape);
-                  </source>
-                </section>
-                  
-            </section>
-        </section>
-    </body>
-</document>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
+
+<document>
+    <header>
+        <title>Busy Developers' Guide to HSLF drawing layer</title>
+        <authors>
+            <person email="yegor@dinom.ru" name="Yegor Kozlov" id="CO"/>
+        </authors>
+    </header>
+    <body>
+        <section><title>Busy Developers' Guide to HSLF drawing layer</title>
+             <section><title>Index of Features</title>
+                <ul>
+                    <li><link href="#NewPresentation">How to create a new presentation and add new slides to it</link></li>
+                    <li><link href="#PageSize">How to retrieve or change slide size</link></li>
+                    <li><link href="#GetShapes">How to get shapes contained in a particular slide</link></li>
+                    <li><link href="#Shapes">Drawing a shape on a slide</link></li>
+                    <li><link href="#Pictures">How to work with pictures</link></li>
+                    <li><link href="#SlideTitle">How to set slide title</link></li>
+                    <li><link href="#Fill">How to work with slide/shape background</link></li>
+                </ul>
+            </section>
+            <section><title>Features</title>
+                <anchor id="NewPresentation"/>
+                <section><title>New Presentation</title>
+                  <source>
+    //create a new empty slide show
+    SlideShow ppt = new SlideShow();
+
+    //add first slide
+    Slide s1 = ppt.createSlide();
+
+    //add second slide
+    Slide s2 = ppt.createSlide();
+    
+    //save changes in a file
+    FileOutputStream out = new FileOutputStream("slideshow.ppt");
+    wb.write(out);
+    out.close();
+                 </source>
+                </section>
+                <anchor id="PageSize"/>
+                <section><title>How to retrieve or change slide size</title>
+                    <source>
+    SlideShow ppt = new SlideShow(new HSLFSlideShow("slideshow.ppt"));
+    //retrieve page size. Coordinates are expressed in points (72 dpi)
+    java.awt.Dimension pgsize = ppt.getPageSize();
+    int pgx = pgsize.width; //slide width
+    int pgy = pgsize.height; //slide height
+
+    //set new page size
+    ppt.setPageSize(new java.awt.Dimension(1024, 768));
+    //save changes 
+    FileOutputStream out = new FileOutputStream("slideshow.ppt");
+    wb.write(out);
+    out.close();
+                  </source>
+                </section>
+                <anchor id="GetShapes"/>
+                <section><title>How to get shapes contained in a particular slide</title>
+                  <p>The superclass of all shapes in HSLF is the Shape class - the elemental object that composes a drawing.
+                    The following pictute shows the class tree of HSLF shapes:
+                  </p>
+                  <p>
+			  <img src="images/hslf_shapes.gif" alt="Class Tree of HSLF Shapes" width="611" height="412"/>
+                  </p>
+                  <p>
+                    The following fragment demonstrates how to iterate over shapes for each slide.
+                  </p>
+                    <source>
+  SlideShow ppt = new SlideShow(new HSLFSlideShow("slideshow.ppt"));
+  //get slides 
+  Slide[] slide = ppt.getSlides();
+  for (int i = 0; i &lt; slide.length; i++){
+    Shape[] sh = slide[i].getShapes();
+    for (int j = 0; j &lt; sh.length; j++){
+      //name of the shape
+      String name = sh[j].getShapeName();
+
+      //shapes's anchor which defines the position of this shape in the slide
+      java.awt.Rectangle anchor = sh[j].getAnchor();
+
+      if (sh[j] instanceof Line){
+        Line line = (Line)sh[j];
+        //work with Line
+      } else if (sh[j] instanceof AutoShape){
+        AutoShape shape = (AutoShape)sh[j];
+        //work with AutoShape
+      } else if (sh[j] instanceof TextBox){
+        TextBox shape = (TextBox)sh[j];
+        //work with TextBox
+      } else if (sh[j] instanceof Picture){
+        Picture shape = (Picture)sh[j];
+        //work with Picture
+      }
+    }
+  }
+                  </source>
+                </section>
+                <anchor id="Shapes"/>
+                <section><title>Drawing a shape on a slide</title>
+                   <p>
+                     When you add a shape, you usually specify the dimensions of the shape and the position
+                     of the upper left corner of the bounding box for the shape relative to the upper left
+                     corner of the slide. Distances in the drawing layer are measured in points (72 points = 1 inch).
+                   </p>
+                    <source>
+        SlideShow ppt = new SlideShow();
+
+  Slide slide = ppt.createSlide();
+
+  //Line shape
+  Line line = new Line();
+  line.setAnchor(new java.awt.Rectangle(50, 50, 100, 20));
+  line.setLineColor(new Color(0, 128, 0));
+  line.setLineStyle(Line.LineDashDotSys);
+  slide.addShape(line);
+
+  //TextBox
+  TextBox txt = new TextBox();
+  txt.setText("Hello, World!");
+  txt.setAnchor(new java.awt.Rectangle(300, 100, 300, 50));
+
+  //use RichTextRun to work with the text format
+  RichTextRun rt = txt.getRichTextRuns()[0];
+  rt.setFontSize(32);
+  rt.setFontName("Arial");
+  rt.setBold(true);
+  rt.setItalic(true);
+  rt.setUnderlined(true);
+  rt.setFontColor(Color.red);
+  rt.setAlignment(TextBox.AlignRight);
+
+  slide.addShape(txt);
+
+  //Autoshape
+  //32-point star
+  AutoShape sh1 = new AutoShape(ShapeTypes.Star32);
+  sh1.setAnchor(new java.awt.Rectangle(50, 50, 100, 200));
+  sh1.setFillColor(Color.red);
+  slide.addShape(sh1);
+
+  //Trapezoid
+  AutoShape sh2 = new AutoShape(ShapeTypes.Trapezoid);
+  sh2.setAnchor(new java.awt.Rectangle(150, 150, 100, 200));
+  sh2.setFillColor(Color.blue);
+  slide.addShape(sh2);
+
+  FileOutputStream out = new FileOutputStream("slideshow.ppt");
+        ppt.write(out);
+  out.close();
+                  </source>
+                </section>
+                <anchor id="Pictures"/>
+                <section><title>How to work with pictures</title>
+                 
+  <p>
+  Currently, HSLF API supports the following types of pictures:
+  </p>
+  <ul>
+    <li>Windows Metafiles (WMF)</li>
+    <li>Enhanced Metafiles (EMF)</li>
+    <li>JPEG Interchange Format</li>
+    <li>Portable Network Graphics (PNG)</li>
+    <li>Macintosh PICT</li>
+  </ul>
+
+                    <source>
+  SlideShow ppt = new SlideShow(new HSLFSlideShow("slideshow.ppt"));
+
+  //extract all pictures contained in the presentation
+  PictureData[] pdata = ppt.getPictureData();
+  for (int i = 0; i &lt; pdata.length; i++){
+    PictureData pict = pdata[i];
+
+    // picture data
+    byte[] data = pict.getData();
+
+    int type = pict.getType();
+    String ext;
+    switch (type){
+      case Picture.JPEG: ext=".jpg"; break;
+      case Picture.PNG: ext=".png"; break;
+      case Picture.WMF: ext=".wmf"; break;
+      case Picture.EMF: ext=".emf"; break;
+      case Picture.PICT: ext=".pict"; break;
+      default: continue;
+    }
+    FileOutputStream out = new FileOutputStream("pict_"+i + ext);
+      out.write(data);
+      out.close();
+
+  }
+
+  // add a new picture to this slideshow and insert it in a  new slide
+  int idx = ppt.addPicture(new File("clock.jpg"), Picture.JPEG);
+
+  Picture pict = new Picture(idx);
+
+  //set image position in the slide
+  pict.setAnchor(new java.awt.Rectangle(100, 100, 300, 200));
+
+  Slide slide = ppt.createSlide();
+  slide.addShape(pict);
+
+  //now retrieve pictures containes in the first slide and save them on disk
+  slide = ppt.getSlides()[0];
+  Shape[] sh = slide.getShapes();
+  for (int i = 0; i &lt; sh.length; i++){
+    if (sh[i] instanceof Picture){
+      Picture pict = (Picture)sh[i];
+      PictureData data = pict.getPictureData();
+      byte[] data = pict.getData();
+      int type = pict.getType();
+      if (type == Picture.JPEG){
+        FileOutputStream out = new FileOutputStream("slide0_"+i+".jpg");
+        out.write(data);
+        out.close();
+      } else if (type == Picture.PNG){
+        FileOutputStream out = new FileOutputStream("slide0_"+i+".png");
+        out.write(data);
+        out.close();
+      }
+    }
+  }
+
+  FileOutputStream out = new FileOutputStream("slideshow.ppt");
+  wb.write(out);
+  out.close();
+
+                    </source>
+                </section>
+                <anchor id="SlideTitle"/>
+                <section><title>How to set slide title</title>
+                    <source>
+    SlideShow ppt = new SlideShow();
+    Slide slide = ppt.createSlide();
+    TextBox title = slide.addTitle();
+    title.setText("Hello, World!");
+    
+    //save changes 
+    FileOutputStream out = new FileOutputStream("slideshow.ppt");
+    wb.write(out);
+    out.close();
+                  </source>
+                  <p>
+                    Below is the equivalent code in PowerPoint VBA:
+                  </p>  
+                  <source>
+    Set myDocument = ActivePresentation.Slides(1)
+    myDocument.Shapes.AddTitle.TextFrame.TextRange.Text = "Hello, World!"
+                  </source>
+                </section>
+                <anchor id="Fill"/>
+                <section><title>How to modify background of a slide master</title>
+                    <source>
+        SlideShow ppt = new SlideShow();
+        SlideMaster master = ppt.getSlidesMasters()[0];
+
+        Fill fill = master.getBackground().getFill();
+        int idx = ppt.addPicture(new File("background.png"), Picture.PNG);
+        fill.setFillType(Fill.FILL_PICTURE);
+        fill.setPictureData(idx);
+                  </source>
+                </section>
+                <section><title>How to modify background of a slide</title>
+                    <source>
+        SlideShow ppt = new SlideShow();
+        Slide slide = ppt.createSlide();
+        
+        //This slide has its own background. 
+        //Without this line it will use master's background.
+        slide.setFollowMasterBackground(false);
+        Fill fill = slide.getBackground().getFill();
+        int idx = ppt.addPicture(new File("background.png"), Picture.PNG);
+        fill.setFillType(Fill.FILL_PATTERN);
+        fill.setPictureData(idx);
+                  </source>
+                </section>
+                <section><title>How to modify background of a shape</title>
+                    <source>
+        SlideShow ppt = new SlideShow();
+        Slide slide = ppt.createSlide();
+        
+        Shape shape = new AutoShape(ShapeTypes.Rectangle);
+        shape.setAnchor(new java.awt.Rectangle(100, 100, 200, 200));
+        Fill fill = shape.getFill();
+        fill.setFillType(Fill.FILL_SHADE);
+        fill.setBackgroundColor(Color.red);
+        fill.setForegroundColor(Color.green);
+        
+        slide.addShape(shape);
+                  </source>
+                </section>
+                  
+            </section>
+        </section>
+    </body>
+</document>
diff --git a/src/documentation/content/xdocs/hslf/index.xml b/src/documentation/content/xdocs/hslf/index.xml
index 47ac9001c0..779a279d16 100755
--- a/src/documentation/content/xdocs/hslf/index.xml
+++ b/src/documentation/content/xdocs/hslf/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hslf/ppt-file-format.xml b/src/documentation/content/xdocs/hslf/ppt-file-format.xml
index 7fd8c6a828..d76fd7f543 100644
--- a/src/documentation/content/xdocs/hslf/ppt-file-format.xml
+++ b/src/documentation/content/xdocs/hslf/ppt-file-format.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hslf/quick-guide.xml b/src/documentation/content/xdocs/hslf/quick-guide.xml
index 955e9f9c25..7e6f9ae2e3 100644
--- a/src/documentation/content/xdocs/hslf/quick-guide.xml
+++ b/src/documentation/content/xdocs/hslf/quick-guide.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hssf/book.xml b/src/documentation/content/xdocs/hssf/book.xml
index 116a076b01..ef7a268031 100644
--- a/src/documentation/content/xdocs/hssf/book.xml
+++ b/src/documentation/content/xdocs/hssf/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 
 <book software="POI Project"
diff --git a/src/documentation/content/xdocs/hssf/chart.xml b/src/documentation/content/xdocs/hssf/chart.xml
index d09b98fc76..c947542106 100644
--- a/src/documentation/content/xdocs/hssf/chart.xml
+++ b/src/documentation/content/xdocs/hssf/chart.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hssf/diagram1.xml b/src/documentation/content/xdocs/hssf/diagram1.xml
index df781edac2..fbbe1f66c3 100644
--- a/src/documentation/content/xdocs/hssf/diagram1.xml
+++ b/src/documentation/content/xdocs/hssf/diagram1.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hssf/diagrams.xml b/src/documentation/content/xdocs/hssf/diagrams.xml
index b928d1fdda..1c1f2a76f9 100644
--- a/src/documentation/content/xdocs/hssf/diagrams.xml
+++ b/src/documentation/content/xdocs/hssf/diagrams.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hssf/eval-devguide.xml b/src/documentation/content/xdocs/hssf/eval-devguide.xml
index bd58291fc5..29c33b8a20 100644
--- a/src/documentation/content/xdocs/hssf/eval-devguide.xml
+++ b/src/documentation/content/xdocs/hssf/eval-devguide.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2005 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hssf/eval.xml b/src/documentation/content/xdocs/hssf/eval.xml
index 5132e0c41c..548df78e76 100644
--- a/src/documentation/content/xdocs/hssf/eval.xml
+++ b/src/documentation/content/xdocs/hssf/eval.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2005 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hssf/formula.xml b/src/documentation/content/xdocs/hssf/formula.xml
index e945d8b04f..7684bf076a 100644
--- a/src/documentation/content/xdocs/hssf/formula.xml
+++ b/src/documentation/content/xdocs/hssf/formula.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hssf/hacking-hssf.xml b/src/documentation/content/xdocs/hssf/hacking-hssf.xml
index 4c5c3ef710..940ebab865 100644
--- a/src/documentation/content/xdocs/hssf/hacking-hssf.xml
+++ b/src/documentation/content/xdocs/hssf/hacking-hssf.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hssf/how-to.xml b/src/documentation/content/xdocs/hssf/how-to.xml
index 1570efda1b..43c835282a 100644
--- a/src/documentation/content/xdocs/hssf/how-to.xml
+++ b/src/documentation/content/xdocs/hssf/how-to.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hssf/index.xml b/src/documentation/content/xdocs/hssf/index.xml
index c587853415..e8363fabda 100644
--- a/src/documentation/content/xdocs/hssf/index.xml
+++ b/src/documentation/content/xdocs/hssf/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hssf/limitations.xml b/src/documentation/content/xdocs/hssf/limitations.xml
index 37683e6552..41f1b24187 100644
--- a/src/documentation/content/xdocs/hssf/limitations.xml
+++ b/src/documentation/content/xdocs/hssf/limitations.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hssf/quick-guide.xml b/src/documentation/content/xdocs/hssf/quick-guide.xml
index 8bc58d6ba3..6c3d964d0c 100644
--- a/src/documentation/content/xdocs/hssf/quick-guide.xml
+++ b/src/documentation/content/xdocs/hssf/quick-guide.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hssf/record-generator.xml b/src/documentation/content/xdocs/hssf/record-generator.xml
index 85b282ff5b..281d718247 100644
--- a/src/documentation/content/xdocs/hssf/record-generator.xml
+++ b/src/documentation/content/xdocs/hssf/record-generator.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hssf/use-case.xml b/src/documentation/content/xdocs/hssf/use-case.xml
index 3cfee2e5b2..acd66fc6e1 100644
--- a/src/documentation/content/xdocs/hssf/use-case.xml
+++ b/src/documentation/content/xdocs/hssf/use-case.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd"> 
      
 <document>
diff --git a/src/documentation/content/xdocs/hwpf/book.xml b/src/documentation/content/xdocs/hwpf/book.xml
index d2d95fe9c3..c45aa7f48c 100644
--- a/src/documentation/content/xdocs/hwpf/book.xml
+++ b/src/documentation/content/xdocs/hwpf/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 <book software="POI Project" title="HWPF" copyright="@year@ POI Project">
 	<menu label="Jakarta POI">
diff --git a/src/documentation/content/xdocs/hwpf/docoverview.xml b/src/documentation/content/xdocs/hwpf/docoverview.xml
index 468a618bdf..3a58556c18 100644
--- a/src/documentation/content/xdocs/hwpf/docoverview.xml
+++ b/src/documentation/content/xdocs/hwpf/docoverview.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hwpf/index.xml b/src/documentation/content/xdocs/hwpf/index.xml
index 0f824f4d12..bab314fbf6 100644
--- a/src/documentation/content/xdocs/hwpf/index.xml
+++ b/src/documentation/content/xdocs/hwpf/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/hwpf/projectplan.xml b/src/documentation/content/xdocs/hwpf/projectplan.xml
index 7b47465698..e2fb763d70 100644
--- a/src/documentation/content/xdocs/hwpf/projectplan.xml
+++ b/src/documentation/content/xdocs/hwpf/projectplan.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Ryan Ackley (Myself) -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <document>
diff --git a/src/documentation/content/xdocs/hwpf/quick-guide.xml b/src/documentation/content/xdocs/hwpf/quick-guide.xml
index b60b5f1a05..197922f07e 100644
--- a/src/documentation/content/xdocs/hwpf/quick-guide.xml
+++ b/src/documentation/content/xdocs/hwpf/quick-guide.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/index.xml b/src/documentation/content/xdocs/index.xml
index 642689970e..c7d764dbc6 100644
--- a/src/documentation/content/xdocs/index.xml
+++ b/src/documentation/content/xdocs/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/legal.xml b/src/documentation/content/xdocs/legal.xml
index 38706d177d..c7769b27ab 100644
--- a/src/documentation/content/xdocs/legal.xml
+++ b/src/documentation/content/xdocs/legal.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/mirrors.xml b/src/documentation/content/xdocs/mirrors.xml
index 2b4505cbdd..f21ef4ee00 100644
--- a/src/documentation/content/xdocs/mirrors.xml
+++ b/src/documentation/content/xdocs/mirrors.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/news.xml b/src/documentation/content/xdocs/news.xml
index 9a44832669..61f088c380 100644
--- a/src/documentation/content/xdocs/news.xml
+++ b/src/documentation/content/xdocs/news.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/news/book.xml b/src/documentation/content/xdocs/news/book.xml
index 612b113a80..dc26164fe7 100644
--- a/src/documentation/content/xdocs/news/book.xml
+++ b/src/documentation/content/xdocs/news/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 
 <book software="POI Project" 
diff --git a/src/documentation/content/xdocs/news/logocontest.xml b/src/documentation/content/xdocs/news/logocontest.xml
index ff9179613b..85bc9317f1 100644
--- a/src/documentation/content/xdocs/news/logocontest.xml
+++ b/src/documentation/content/xdocs/news/logocontest.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/overview.xml b/src/documentation/content/xdocs/overview.xml
index 987c1868f1..c6c66e6996 100644
--- a/src/documentation/content/xdocs/overview.xml
+++ b/src/documentation/content/xdocs/overview.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/patches.xml b/src/documentation/content/xdocs/patches.xml
index 0079aa3c8a..ad599c9905 100644
--- a/src/documentation/content/xdocs/patches.xml
+++ b/src/documentation/content/xdocs/patches.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 <!-- Is this being used? -->
 
diff --git a/src/documentation/content/xdocs/plan/POI10Vision.xml b/src/documentation/content/xdocs/plan/POI10Vision.xml
index f662d6a692..757401254b 100644
--- a/src/documentation/content/xdocs/plan/POI10Vision.xml
+++ b/src/documentation/content/xdocs/plan/POI10Vision.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/plan/POI20Vision.xml b/src/documentation/content/xdocs/plan/POI20Vision.xml
index 9f9b04b102..3725c81f5d 100644
--- a/src/documentation/content/xdocs/plan/POI20Vision.xml
+++ b/src/documentation/content/xdocs/plan/POI20Vision.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/plan/book.xml b/src/documentation/content/xdocs/plan/book.xml
index 5ee8db53e5..ab6f727b88 100644
--- a/src/documentation/content/xdocs/plan/book.xml
+++ b/src/documentation/content/xdocs/plan/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 
 <book software="POI Project" 
diff --git a/src/documentation/content/xdocs/plan/index.xml b/src/documentation/content/xdocs/plan/index.xml
index 30ada043ee..04ce89dfe3 100644
--- a/src/documentation/content/xdocs/plan/index.xml
+++ b/src/documentation/content/xdocs/plan/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/plan/release.xml b/src/documentation/content/xdocs/plan/release.xml
index d58358a6d7..ddbb2f7fc7 100644
--- a/src/documentation/content/xdocs/plan/release.xml
+++ b/src/documentation/content/xdocs/plan/release.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/poi-ruby.xml b/src/documentation/content/xdocs/poi-ruby.xml
index 11a96b5913..18b723a036 100644
--- a/src/documentation/content/xdocs/poi-ruby.xml
+++ b/src/documentation/content/xdocs/poi-ruby.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2005 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/poifs/book.xml b/src/documentation/content/xdocs/poifs/book.xml
index c613f5073d..1bc7528262 100644
--- a/src/documentation/content/xdocs/poifs/book.xml
+++ b/src/documentation/content/xdocs/poifs/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 
 <book software="POI Project" 
diff --git a/src/documentation/content/xdocs/poifs/fileformat.xml b/src/documentation/content/xdocs/poifs/fileformat.xml
index 645622c3d7..30451e81b5 100644
--- a/src/documentation/content/xdocs/poifs/fileformat.xml
+++ b/src/documentation/content/xdocs/poifs/fileformat.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <document>
   <header>
diff --git a/src/documentation/content/xdocs/poifs/how-to.xml b/src/documentation/content/xdocs/poifs/how-to.xml
index dbb1bb7818..e1bc8c2c61 100644
--- a/src/documentation/content/xdocs/poifs/how-to.xml
+++ b/src/documentation/content/xdocs/poifs/how-to.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <document>
   <header>
diff --git a/src/documentation/content/xdocs/poifs/html/POIFSDesignDocument.html b/src/documentation/content/xdocs/poifs/html/POIFSDesignDocument.html
index 086b39aff9..e4dcdb5046 100644
--- a/src/documentation/content/xdocs/poifs/html/POIFSDesignDocument.html
+++ b/src/documentation/content/xdocs/poifs/html/POIFSDesignDocument.html
@@ -1,4 +1,21 @@
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <HTML>
     <HEAD>
         <TITLE>POIFS Design Document</TITLE>
diff --git a/src/documentation/content/xdocs/poifs/index.xml b/src/documentation/content/xdocs/poifs/index.xml
index c7c6525073..024d95e5a8 100644
--- a/src/documentation/content/xdocs/poifs/index.xml
+++ b/src/documentation/content/xdocs/poifs/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <document>
   <header>
diff --git a/src/documentation/content/xdocs/poifs/usecases.xml b/src/documentation/content/xdocs/poifs/usecases.xml
index 1b68a8ef92..8d2dea3ade 100644
--- a/src/documentation/content/xdocs/poifs/usecases.xml
+++ b/src/documentation/content/xdocs/poifs/usecases.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <document>
   <header>
diff --git a/src/documentation/content/xdocs/references/book.xml b/src/documentation/content/xdocs/references/book.xml
index 0355219f97..c0a3bb3e84 100644
--- a/src/documentation/content/xdocs/references/book.xml
+++ b/src/documentation/content/xdocs/references/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "./dtd/book-cocoon-v10.dtd">
 
 <book software="POI" 
diff --git a/src/documentation/content/xdocs/references/index.xml b/src/documentation/content/xdocs/references/index.xml
index d73d5b42f0..fbc4a6b395 100644
--- a/src/documentation/content/xdocs/references/index.xml
+++ b/src/documentation/content/xdocs/references/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/resolutions/book.xml b/src/documentation/content/xdocs/resolutions/book.xml
index ad32136238..82a55b2a04 100644
--- a/src/documentation/content/xdocs/resolutions/book.xml
+++ b/src/documentation/content/xdocs/resolutions/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 
 <book software="POI Project" 
diff --git a/src/documentation/content/xdocs/resolutions/index.xml b/src/documentation/content/xdocs/resolutions/index.xml
index db3223c0f2..136503c6fb 100644
--- a/src/documentation/content/xdocs/resolutions/index.xml
+++ b/src/documentation/content/xdocs/resolutions/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/resolutions/res001.xml b/src/documentation/content/xdocs/resolutions/res001.xml
index 57187b9503..2a538e6211 100644
--- a/src/documentation/content/xdocs/resolutions/res001.xml
+++ b/src/documentation/content/xdocs/resolutions/res001.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/site.xml b/src/documentation/content/xdocs/site.xml
index 8351fc0dd0..954c4b6f42 100644
--- a/src/documentation/content/xdocs/site.xml
+++ b/src/documentation/content/xdocs/site.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 
 <!--
 Forrest site.xml
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 2c693c94c6..e47661ed2a 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <status>
     <developers>
         <!-- in strict alphabetical order -->
diff --git a/src/documentation/content/xdocs/tabs.xml b/src/documentation/content/xdocs/tabs.xml
index 23d6372924..ca4c5330e6 100644
--- a/src/documentation/content/xdocs/tabs.xml
+++ b/src/documentation/content/xdocs/tabs.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.0//EN" "tab-cocoon-v10.dtd">
 
 <tabs software="POI"
diff --git a/src/documentation/content/xdocs/todo.xml b/src/documentation/content/xdocs/todo.xml
index 3ddd493908..6414c6ef60 100644
--- a/src/documentation/content/xdocs/todo.xml
+++ b/src/documentation/content/xdocs/todo.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 
 <!DOCTYPE todo PUBLIC "-//APACHE//DTD Todo V1.1//EN" "./dtd/todo-v11.dtd">
 
diff --git a/src/documentation/content/xdocs/trans/book.xml b/src/documentation/content/xdocs/trans/book.xml
index 4e6da658be..86ae3a94ad 100644
--- a/src/documentation/content/xdocs/trans/book.xml
+++ b/src/documentation/content/xdocs/trans/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "./dtd/book-cocoon-v10.dtd">
 
 <book software="POI" 
diff --git a/src/documentation/content/xdocs/trans/de/book.xml b/src/documentation/content/xdocs/trans/de/book.xml
index 2d80f70c8a..cd403a6af4 100644
--- a/src/documentation/content/xdocs/trans/de/book.xml
+++ b/src/documentation/content/xdocs/trans/de/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../../dtd/book-cocoon-v10.dtd">
 
 <book software="POI"
diff --git a/src/documentation/content/xdocs/trans/de/index.xml b/src/documentation/content/xdocs/trans/de/index.xml
index 6de1d50ca4..84e4f4341c 100644
--- a/src/documentation/content/xdocs/trans/de/index.xml
+++ b/src/documentation/content/xdocs/trans/de/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/3rdparty.xml b/src/documentation/content/xdocs/trans/es/3rdparty.xml
index e39d01758c..82d3f173d0 100644
--- a/src/documentation/content/xdocs/trans/es/3rdparty.xml
+++ b/src/documentation/content/xdocs/trans/es/3rdparty.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/book.xml b/src/documentation/content/xdocs/trans/es/book.xml
index 3f267feb92..7c463a798a 100644
--- a/src/documentation/content/xdocs/trans/es/book.xml
+++ b/src/documentation/content/xdocs/trans/es/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../../dtd/book-cocoon-v10.dtd">
 
 <book software="POI" 
diff --git a/src/documentation/content/xdocs/trans/es/casestudies.xml b/src/documentation/content/xdocs/trans/es/casestudies.xml
index e41e01a6d2..1a1962fbc3 100644
--- a/src/documentation/content/xdocs/trans/es/casestudies.xml
+++ b/src/documentation/content/xdocs/trans/es/casestudies.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/changes.xml b/src/documentation/content/xdocs/trans/es/changes.xml
index 07b7bbcbed..b7c903fd23 100644
--- a/src/documentation/content/xdocs/trans/es/changes.xml
+++ b/src/documentation/content/xdocs/trans/es/changes.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE changes PUBLIC "-//APACHE//DTD Changes V1.1//EN" "../../dtd/changes-v11.dtd">
 
 <changes>
diff --git a/src/documentation/content/xdocs/trans/es/faq.xml b/src/documentation/content/xdocs/trans/es/faq.xml
index ed67e2b8f9..33076a51e4 100644
--- a/src/documentation/content/xdocs/trans/es/faq.xml
+++ b/src/documentation/content/xdocs/trans/es/faq.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE faqs PUBLIC "-//APACHE//DTD FAQ V1.1//EN" "../../dtd/faq-v11.dtd">
 
 <faqs title="Preguntas M Frecuentes (FAQ)">
diff --git a/src/documentation/content/xdocs/trans/es/historyandfuture.xml b/src/documentation/content/xdocs/trans/es/historyandfuture.xml
index fc999294d6..dde8ef956a 100644
--- a/src/documentation/content/xdocs/trans/es/historyandfuture.xml
+++ b/src/documentation/content/xdocs/trans/es/historyandfuture.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/hssf/book.xml b/src/documentation/content/xdocs/trans/es/hssf/book.xml
index 065561c77c..0fe3c5f993 100644
--- a/src/documentation/content/xdocs/trans/es/hssf/book.xml
+++ b/src/documentation/content/xdocs/trans/es/hssf/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 
 <book software="El Proyecto de POI"
diff --git a/src/documentation/content/xdocs/trans/es/hssf/diagram1.xml b/src/documentation/content/xdocs/trans/es/hssf/diagram1.xml
index ead64abdd8..fb3d00c215 100644
--- a/src/documentation/content/xdocs/trans/es/hssf/diagram1.xml
+++ b/src/documentation/content/xdocs/trans/es/hssf/diagram1.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/hssf/diagrams.xml b/src/documentation/content/xdocs/trans/es/hssf/diagrams.xml
index 68a0bb422b..f32b4613ec 100644
--- a/src/documentation/content/xdocs/trans/es/hssf/diagrams.xml
+++ b/src/documentation/content/xdocs/trans/es/hssf/diagrams.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/hssf/formula.xml b/src/documentation/content/xdocs/trans/es/hssf/formula.xml
index a072b5ba60..4de9b8dbe4 100644
--- a/src/documentation/content/xdocs/trans/es/hssf/formula.xml
+++ b/src/documentation/content/xdocs/trans/es/hssf/formula.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/hssf/hacking-hssf.xml b/src/documentation/content/xdocs/trans/es/hssf/hacking-hssf.xml
index a5802c1547..d63411c21a 100644
--- a/src/documentation/content/xdocs/trans/es/hssf/hacking-hssf.xml
+++ b/src/documentation/content/xdocs/trans/es/hssf/hacking-hssf.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/hssf/how-to.xml b/src/documentation/content/xdocs/trans/es/hssf/how-to.xml
index 98e5c05381..43c594e4f6 100644
--- a/src/documentation/content/xdocs/trans/es/hssf/how-to.xml
+++ b/src/documentation/content/xdocs/trans/es/hssf/how-to.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/hssf/index.xml b/src/documentation/content/xdocs/trans/es/hssf/index.xml
index 69859657b9..95016a69f8 100644
--- a/src/documentation/content/xdocs/trans/es/hssf/index.xml
+++ b/src/documentation/content/xdocs/trans/es/hssf/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/hssf/limitations.xml b/src/documentation/content/xdocs/trans/es/hssf/limitations.xml
index e8fda0cb35..304add20d0 100644
--- a/src/documentation/content/xdocs/trans/es/hssf/limitations.xml
+++ b/src/documentation/content/xdocs/trans/es/hssf/limitations.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/hssf/quick-guide.xml b/src/documentation/content/xdocs/trans/es/hssf/quick-guide.xml
index 8aa93a76ae..9392ac3ad8 100644
--- a/src/documentation/content/xdocs/trans/es/hssf/quick-guide.xml
+++ b/src/documentation/content/xdocs/trans/es/hssf/quick-guide.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/hssf/record-generator.xml b/src/documentation/content/xdocs/trans/es/hssf/record-generator.xml
index c5b5d5fe9c..b52d17eb25 100644
--- a/src/documentation/content/xdocs/trans/es/hssf/record-generator.xml
+++ b/src/documentation/content/xdocs/trans/es/hssf/record-generator.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/hssf/use-case.xml b/src/documentation/content/xdocs/trans/es/hssf/use-case.xml
index cba2606555..76248bf939 100644
--- a/src/documentation/content/xdocs/trans/es/hssf/use-case.xml
+++ b/src/documentation/content/xdocs/trans/es/hssf/use-case.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd"> 
      
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/index.xml b/src/documentation/content/xdocs/trans/es/index.xml
index 4395d8a7bb..5eca17f70b 100644
--- a/src/documentation/content/xdocs/trans/es/index.xml
+++ b/src/documentation/content/xdocs/trans/es/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/news.xml b/src/documentation/content/xdocs/trans/es/news.xml
index c6c88746dc..088ff98381 100644
--- a/src/documentation/content/xdocs/trans/es/news.xml
+++ b/src/documentation/content/xdocs/trans/es/news.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/overview.xml b/src/documentation/content/xdocs/trans/es/overview.xml
index 1803e43f39..ba7b3b5a8d 100644
--- a/src/documentation/content/xdocs/trans/es/overview.xml
+++ b/src/documentation/content/xdocs/trans/es/overview.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/patches.xml b/src/documentation/content/xdocs/trans/es/patches.xml
index 4e23e54452..acc1ae011b 100644
--- a/src/documentation/content/xdocs/trans/es/patches.xml
+++ b/src/documentation/content/xdocs/trans/es/patches.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/es/todo.xml b/src/documentation/content/xdocs/trans/es/todo.xml
index b954998459..572ced3b95 100644
--- a/src/documentation/content/xdocs/trans/es/todo.xml
+++ b/src/documentation/content/xdocs/trans/es/todo.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 
 <!DOCTYPE todo PUBLIC "-//APACHE//DTD Todo V1.1//EN" "../../dtd/todo-v11.dtd">
 
diff --git a/src/documentation/content/xdocs/trans/es/who.xml b/src/documentation/content/xdocs/trans/es/who.xml
index 430f2e3dd5..fb0c17b1d6 100644
--- a/src/documentation/content/xdocs/trans/es/who.xml
+++ b/src/documentation/content/xdocs/trans/es/who.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/guidelines.xml b/src/documentation/content/xdocs/trans/guidelines.xml
index 3a350f29a0..26eccaf6b3 100644
--- a/src/documentation/content/xdocs/trans/guidelines.xml
+++ b/src/documentation/content/xdocs/trans/guidelines.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/trans/index.xml b/src/documentation/content/xdocs/trans/index.xml
index c08b7c262e..448f0ea31f 100644
--- a/src/documentation/content/xdocs/trans/index.xml
+++ b/src/documentation/content/xdocs/trans/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/utils/book.xml b/src/documentation/content/xdocs/utils/book.xml
index 0745564cc3..f2c92fbd93 100644
--- a/src/documentation/content/xdocs/utils/book.xml
+++ b/src/documentation/content/xdocs/utils/book.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 
 <book software="POI Project" 
diff --git a/src/documentation/content/xdocs/utils/index.xml b/src/documentation/content/xdocs/utils/index.xml
index 9c8263ff67..749b1fdb0c 100644
--- a/src/documentation/content/xdocs/utils/index.xml
+++ b/src/documentation/content/xdocs/utils/index.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/utils/logging.xml b/src/documentation/content/xdocs/utils/logging.xml
index 19ba76ded2..69b80ae834 100644
--- a/src/documentation/content/xdocs/utils/logging.xml
+++ b/src/documentation/content/xdocs/utils/logging.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/content/xdocs/who.xml b/src/documentation/content/xdocs/who.xml
index 4df6f6cb5b..45029b5e3a 100644
--- a/src/documentation/content/xdocs/who.xml
+++ b/src/documentation/content/xdocs/who.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
diff --git a/src/documentation/skinconf.xml b/src/documentation/skinconf.xml
index 2a3ed0cb47..d9b1a56a51 100644
--- a/src/documentation/skinconf.xml
+++ b/src/documentation/skinconf.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!--
+   ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
 
 <!--
 Skin configuration file. This file contains details of your project, which will
-- 
2.39.5