diff --git a/hyracks/hyracks-documentation/src/books/user-guide/doxia-descriptor.xml b/hyracks/hyracks-documentation/src/books/user-guide/doxia-descriptor.xml
index d3c715b..e2bab67 100644
--- a/hyracks/hyracks-documentation/src/books/user-guide/doxia-descriptor.xml
+++ b/hyracks/hyracks-documentation/src/books/user-guide/doxia-descriptor.xml
@@ -1,17 +1,22 @@
 <!--
- ! Copyright 2009-2013 by The Regents of the University of California
- ! 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 from
- ! 
- !     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.
+ ! 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.
  !-->
+
 <book xmlns="http://maven.apache.org/BOOK/1.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/BOOK/1.0.0 ../../../doxia/doxia-book/target/generated-site/xsd/book-1.0.0.xsd">
diff --git a/hyracks/hyracks-documentation/src/books/user-guide/sec-concepts-applications.apt b/hyracks/hyracks-documentation/src/books/user-guide/sec-concepts-applications.apt
index 0ad95b5..df771f6 100644
--- a/hyracks/hyracks-documentation/src/books/user-guide/sec-concepts-applications.apt
+++ b/hyracks/hyracks-documentation/src/books/user-guide/sec-concepts-applications.apt
@@ -1,15 +1,19 @@
-~~Copyright 2009-2013 by The Regents of the University of California
-~~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 from
-~~
-~~     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.
+ ~~ 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.
 
 Hyracks Applications
 
diff --git a/hyracks/hyracks-documentation/src/books/user-guide/sec-concepts-terminology.apt b/hyracks/hyracks-documentation/src/books/user-guide/sec-concepts-terminology.apt
index 4e3b9cb..93b6a4c 100644
--- a/hyracks/hyracks-documentation/src/books/user-guide/sec-concepts-terminology.apt
+++ b/hyracks/hyracks-documentation/src/books/user-guide/sec-concepts-terminology.apt
@@ -1,15 +1,19 @@
-~~Copyright 2009-2013 by The Regents of the University of California
-~~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 from
-~~
-~~     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.
+ ~~ 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.
 
 Terminology
 
diff --git a/hyracks/hyracks-documentation/src/books/user-guide/sec-hyrackscli-commands.apt b/hyracks/hyracks-documentation/src/books/user-guide/sec-hyrackscli-commands.apt
index 18cfccb..7817835 100644
--- a/hyracks/hyracks-documentation/src/books/user-guide/sec-hyrackscli-commands.apt
+++ b/hyracks/hyracks-documentation/src/books/user-guide/sec-hyrackscli-commands.apt
@@ -1,15 +1,19 @@
-~~Copyright 2009-2013 by The Regents of the University of California
-~~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 from
-~~
-~~     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.
+ ~~ 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.
 
 Hyracks CLI Commands
 
diff --git a/hyracks/hyracks-documentation/src/books/user-guide/sec-hyrackscli-running.apt b/hyracks/hyracks-documentation/src/books/user-guide/sec-hyrackscli-running.apt
index d93dc41..527a0c9 100644
--- a/hyracks/hyracks-documentation/src/books/user-guide/sec-hyrackscli-running.apt
+++ b/hyracks/hyracks-documentation/src/books/user-guide/sec-hyrackscli-running.apt
@@ -1,15 +1,19 @@
-~~Copyright 2009-2013 by The Regents of the University of California
-~~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 from
-~~
-~~     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.
+ ~~ 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.
 
 Running Hyracks CLI
 
diff --git a/hyracks/hyracks-documentation/src/books/user-guide/sec-introduction-overview.apt b/hyracks/hyracks-documentation/src/books/user-guide/sec-introduction-overview.apt
index 9e097a8..4703cc0 100644
--- a/hyracks/hyracks-documentation/src/books/user-guide/sec-introduction-overview.apt
+++ b/hyracks/hyracks-documentation/src/books/user-guide/sec-introduction-overview.apt
@@ -1,15 +1,19 @@
-~~Copyright 2009-2013 by The Regents of the University of California
-~~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 from
-~~
-~~     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.
+ ~~ 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.
 
 Hyracks Overview
 
diff --git a/hyracks/hyracks-documentation/src/books/user-guide/sec-introduction-whatis.apt b/hyracks/hyracks-documentation/src/books/user-guide/sec-introduction-whatis.apt
index 88f5b49..a98f61b 100644
--- a/hyracks/hyracks-documentation/src/books/user-guide/sec-introduction-whatis.apt
+++ b/hyracks/hyracks-documentation/src/books/user-guide/sec-introduction-whatis.apt
@@ -1,15 +1,19 @@
-~~Copyright 2009-2013 by The Regents of the University of California
-~~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 from
-~~
-~~     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.
+ ~~ 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.
 
 What is Hyracks?