From 94031bcc7f5ec9eeda386d7f0daf40d96ddeac74 Mon Sep 17 00:00:00 2001
From: Sebastian Bazley <sebb@apache.org>
Date: Sun, 7 Jan 2007 19:24:53 +0000
Subject: [PATCH] Update license (remove copyright)

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@493819 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: c86bf68f7622949a149c0e5b55c30118dd4110b6
---
 xdocs/extending.xml  | 12 ++++++------
 xdocs/index.xml      | 12 ++++++------
 xdocs/jmeter_irc.xml | 12 ++++++------
 xdocs/known_bugs.xml | 12 ++++++------
 xdocs/license.xml    | 16 ++++++++++++++++
 xdocs/nightly.xml    | 12 ++++++------
 6 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/xdocs/extending.xml b/xdocs/extending.xml
index 87d5ccb4ee..6663d007cf 100644
--- a/xdocs/extending.xml
+++ b/xdocs/extending.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-   $Header$
-   Copyright 2001-2004 The Apache Software Foundation
- 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
  
        http://www.apache.org/licenses/LICENSE-2.0
  
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 58d54ac327..0b50d0ac6a 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-   $Header$
-   Copyright 2001-2004 The Apache Software Foundation
- 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
  
        http://www.apache.org/licenses/LICENSE-2.0
  
diff --git a/xdocs/jmeter_irc.xml b/xdocs/jmeter_irc.xml
index b46170a728..de742cef83 100644
--- a/xdocs/jmeter_irc.xml
+++ b/xdocs/jmeter_irc.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?> 
 <!--
-   $Header$
-   Copyright 2001-2004 The Apache Software Foundation
- 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
  
        http://www.apache.org/licenses/LICENSE-2.0
  
diff --git a/xdocs/known_bugs.xml b/xdocs/known_bugs.xml
index 9f37860c1e..590e538262 100644
--- a/xdocs/known_bugs.xml
+++ b/xdocs/known_bugs.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-   $Header$
-   Copyright 2001-2004 The Apache Software Foundation
- 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
  
        http://www.apache.org/licenses/LICENSE-2.0
  
diff --git a/xdocs/license.xml b/xdocs/license.xml
index 177ada4875..c9fb19e8a4 100644
--- a/xdocs/license.xml
+++ b/xdocs/license.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0"?>
+<!--
+   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.
+-->
 <document>
   <properties>
 	 <author email="mstover1@apache.org">Michael Stover, Brendan Burns, et al.</author>
diff --git a/xdocs/nightly.xml b/xdocs/nightly.xml
index 9ea33d4215..cba8926d70 100644
--- a/xdocs/nightly.xml
+++ b/xdocs/nightly.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?> 
 <!--
-   $Header$
-   Copyright 2001-2004 The Apache Software Foundation
- 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
  
        http://www.apache.org/licenses/LICENSE-2.0