diff --git a/samples/AppletXMLtoHTML/README.html b/samples/AppletXMLtoHTML/README.html
index db6a7cc..2997577 100644
--- a/samples/AppletXMLtoHTML/README.html
+++ b/samples/AppletXMLtoHTML/README.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/AppletXMLtoHTML/appletXMLtoHTML.html b/samples/AppletXMLtoHTML/appletXMLtoHTML.html
index 0d06b7b..c8a6c73 100644
--- a/samples/AppletXMLtoHTML/appletXMLtoHTML.html
+++ b/samples/AppletXMLtoHTML/appletXMLtoHTML.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/AppletXMLtoHTML/client.html b/samples/AppletXMLtoHTML/client.html
index 332b158..2e8b76a 100644
--- a/samples/AppletXMLtoHTML/client.html
+++ b/samples/AppletXMLtoHTML/client.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/AppletXMLtoHTML/target.html b/samples/AppletXMLtoHTML/target.html
index 0933548..f3caa06 100644
--- a/samples/AppletXMLtoHTML/target.html
+++ b/samples/AppletXMLtoHTML/target.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/ApplyXPath/readme.html b/samples/ApplyXPath/readme.html
index 0e8582d..415137e 100644
--- a/samples/ApplyXPath/readme.html
+++ b/samples/ApplyXPath/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/ApplyXPathDOM/readme.html b/samples/ApplyXPathDOM/readme.html
index 0e8582d..415137e 100644
--- a/samples/ApplyXPathDOM/readme.html
+++ b/samples/ApplyXPathDOM/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/CompiledApplet/index.html b/samples/CompiledApplet/index.html
index 5f71de9..4130c3a 100755
--- a/samples/CompiledApplet/index.html
+++ b/samples/CompiledApplet/index.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/CompiledApplet/menu.html b/samples/CompiledApplet/menu.html
index f06ce1b..7567946 100755
--- a/samples/CompiledApplet/menu.html
+++ b/samples/CompiledApplet/menu.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/CompiledApplet/singleTransform.html b/samples/CompiledApplet/singleTransform.html
index 923e3f5..54696bb 100644
--- a/samples/CompiledApplet/singleTransform.html
+++ b/samples/CompiledApplet/singleTransform.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/CompiledEJB/bottom_frame.html b/samples/CompiledEJB/bottom_frame.html
index ba2cec3..3f93e07 100644
--- a/samples/CompiledEJB/bottom_frame.html
+++ b/samples/CompiledEJB/bottom_frame.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/CompiledEJB/index.html b/samples/CompiledEJB/index.html
index c38a5ce..4873698 100644
--- a/samples/CompiledEJB/index.html
+++ b/samples/CompiledEJB/index.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/CompiledEJB/top_frame.html b/samples/CompiledEJB/top_frame.html
index 59a000c..541b1db 100644
--- a/samples/CompiledEJB/top_frame.html
+++ b/samples/CompiledEJB/top_frame.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/DOM2DOM/readme.html b/samples/DOM2DOM/readme.html
index 0e8582d..415137e 100644
--- a/samples/DOM2DOM/readme.html
+++ b/samples/DOM2DOM/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/Pipe/readme.html b/samples/Pipe/readme.html
index 0e8582d..415137e 100644
--- a/samples/Pipe/readme.html
+++ b/samples/Pipe/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/SimpleTransform/readme.html b/samples/SimpleTransform/readme.html
index 0e8582d..415137e 100644
--- a/samples/SimpleTransform/readme.html
+++ b/samples/SimpleTransform/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/UseStylesheetParam/readme.html b/samples/UseStylesheetParam/readme.html
index 0e8582d..415137e 100644
--- a/samples/UseStylesheetParam/readme.html
+++ b/samples/UseStylesheetParam/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/UseXMLFilters/readme.html b/samples/UseXMLFilters/readme.html
index 0e8582d..415137e 100644
--- a/samples/UseXMLFilters/readme.html
+++ b/samples/UseXMLFilters/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/Validate/readme.html b/samples/Validate/readme.html
index 0e8582d..415137e 100644
--- a/samples/Validate/readme.html
+++ b/samples/Validate/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/extensions/readme.html b/samples/extensions/readme.html
index 0e8582d..415137e 100644
--- a/samples/extensions/readme.html
+++ b/samples/extensions/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/extensions/sql/basic-connection/readme.html b/samples/extensions/sql/basic-connection/readme.html
index ada177b..b7b4fb7 100644
--- a/samples/extensions/sql/basic-connection/readme.html
+++ b/samples/extensions/sql/basic-connection/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/extensions/sql/ext-connection/readme.html b/samples/extensions/sql/ext-connection/readme.html
index ada177b..b7b4fb7 100644
--- a/samples/extensions/sql/ext-connection/readme.html
+++ b/samples/extensions/sql/ext-connection/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/extensions/sql/pquery/readme.html b/samples/extensions/sql/pquery/readme.html
index ada177b..b7b4fb7 100644
--- a/samples/extensions/sql/pquery/readme.html
+++ b/samples/extensions/sql/pquery/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/extensions/sql/readme.html b/samples/extensions/sql/readme.html
index af7cfdc..dff6155 100644
--- a/samples/extensions/sql/readme.html
+++ b/samples/extensions/sql/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/extensions/sql/show-error/readme.html b/samples/extensions/sql/show-error/readme.html
index ada177b..b7b4fb7 100644
--- a/samples/extensions/sql/show-error/readme.html
+++ b/samples/extensions/sql/show-error/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/extensions/sql/streamable/readme.html b/samples/extensions/sql/streamable/readme.html
index ada177b..b7b4fb7 100644
--- a/samples/extensions/sql/streamable/readme.html
+++ b/samples/extensions/sql/streamable/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/servlet/readme.html b/samples/servlet/readme.html
index 0e8582d..415137e 100644
--- a/samples/servlet/readme.html
+++ b/samples/servlet/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
diff --git a/samples/translets/readme.html b/samples/translets/readme.html
index 0e8582d..415137e 100644
--- a/samples/translets/readme.html
+++ b/samples/translets/readme.html
@@ -1,7 +1,9 @@
 <!--
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *