Updated licenses

14 files changed, 210 insertions, 155 deletions

diff --git a/docs/architecture.rst b/docs/architecture.rst
index 9aab7afbf..0000a02dd 100644
--- a/docs/architecture.rst
+++ b/docs/architecture.rst
@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
- 
-      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
- 
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Copyright 2010 Anso Labs, LLC
+
+      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
+
           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.
+      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.
 
 nova System Architecture
 ========================
diff --git a/docs/auth.rst b/docs/auth.rst
index ba001cfec..c906a481f 100644
--- a/docs/auth.rst
+++ b/docs/auth.rst
@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
- 
-      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
- 
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Copyright 2010 Anso Labs, LLC
+
+      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
+
           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.
+      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.
 
 Auth Documentation
 ==================    
diff --git a/docs/binaries.rst b/docs/binaries.rst
index eee089164..fa6127bb7 100644
--- a/docs/binaries.rst
+++ b/docs/binaries.rst
@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
-      
-      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
-      
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Copyright 2010 Anso Labs, LLC
+
+      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
+
           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.
+      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.
 
 Nova Binaries
 ===============
diff --git a/docs/compute.rst b/docs/compute.rst
index e2b32fae0..7b4f82a3b 100644
--- a/docs/compute.rst
+++ b/docs/compute.rst
@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
- 
-      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
- 
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Copyright 2010 Anso Labs, LLC
+
+      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
+
           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.
+      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.
 
 Compute Documentation
 =====================
diff --git a/docs/endpoint.rst b/docs/endpoint.rst
index 86a1a3be0..830c99665 100644
--- a/docs/endpoint.rst
+++ b/docs/endpoint.rst
@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
- 
-      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
- 
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Copyright 2010 Anso Labs, LLC
+
+      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
+
           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.
+      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.
 
 Endpoint Documentation
 ======================
diff --git a/docs/fakes.rst b/docs/fakes.rst
index f105c6b8d..1454ca7b5 100644
--- a/docs/fakes.rst
+++ b/docs/fakes.rst
@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
- 
-      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
- 
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Copyright 2010 Anso Labs, LLC
+
+      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
+
           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.
+      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.
 
 Nova Fakes
 ==========
diff --git a/docs/index.rst b/docs/index.rst
index b86f14324..9a5fa32ae 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,18 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
- 
-      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
- 
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Copyright 2010 Anso Labs, LLC
+
+      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
+
           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.
 
+      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.
 
 Welcome to nova's documentation!
 ================================
diff --git a/docs/modules.rst b/docs/modules.rst
index f927a52d0..11e1eef7d 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
- 
-      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
- 
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Copyright 2010 Anso Labs, LLC
+
+      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
+
           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.
+      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.
 
 Nova Documentation
 ==================
diff --git a/docs/network.rst b/docs/network.rst
index 49e36170d..2787ae458 100644
--- a/docs/network.rst
+++ b/docs/network.rst
@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
- 
-      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
- 
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Copyright 2010 Anso Labs, LLC
+
+      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
+
           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.
+      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.
 
 nova Networking
 ================
diff --git a/docs/nova.rst b/docs/nova.rst
index 7f1feda10..01da34414 100644
--- a/docs/nova.rst
+++ b/docs/nova.rst
@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
- 
-      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
- 
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Copyright 2010 Anso Labs, LLC
+
+      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
+
           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.
+      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.
 
 NOVA Libraries
 ===============
diff --git a/docs/objectstore.rst b/docs/objectstore.rst
index 64122c9b7..70048354a 100644
--- a/docs/objectstore.rst
+++ b/docs/objectstore.rst
@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
- 
-      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
- 
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Copyright 2010 Anso Labs, LLC
+
+      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
+
           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.
+      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.
 
 Objectstore Documentation
 =========================
diff --git a/docs/packages.rst b/docs/packages.rst
index ad1386f19..fb28e850b 100644
--- a/docs/packages.rst
+++ b/docs/packages.rst
@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
- 
-      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
- 
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Copyright 2010 Anso Labs, LLC
+
+      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
+
           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.
+      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.
 
 nova Packages & Dependencies
 ============================
diff --git a/docs/storage.rst b/docs/storage.rst
index 94d7bdeea..f8c98b18d 100644
--- a/docs/storage.rst
+++ b/docs/storage.rst
@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
- 
-      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
- 
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Copyright 2010 Anso Labs, LLC
+
+      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
+
           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.
+      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.
 
 Storage in the Nova Cloud
 =========================
diff --git a/docs/volume.rst b/docs/volume.rst
index 18ce70a3a..3981daf92 100644
--- a/docs/volume.rst
+++ b/docs/volume.rst
@@ -1,17 +1,21 @@
 ..
-      Copyright [2010] [Anso Labs, LLC]
- 
-      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
- 
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Copyright 2010 Anso Labs, LLC
+
+      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
+
           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.
+      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.
 
 Volume Documentation
 ====================