summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Brockners <fbrockne@cisco.com>2016-02-11 21:33:25 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-11 21:33:25 +0000
commit49ba71a53a776491ac68bf6bbe14f3941d89cdd6 (patch)
tree8d619266200b291e5e8dc2b93b7f383811034372
parent343608601742d88baa0a7987d5febd1f5ad7bda7 (diff)
parentd85aad406fc04752916e963faf4bfbfb7eb2c19d (diff)
Merge "License information update"
-rw-r--r--docs/sources/artifacts-location.rst14
-rw-r--r--docs/sources/system-requirements.rst14
-rw-r--r--docs/sources/ux-requirements.rst20
3 files changed, 9 insertions, 39 deletions
diff --git a/docs/sources/artifacts-location.rst b/docs/sources/artifacts-location.rst
index c711b97..942bf06 100644
--- a/docs/sources/artifacts-location.rst
+++ b/docs/sources/artifacts-location.rst
@@ -1,16 +1,8 @@
.. Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
-.. 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.
+.. This work is licensed under the
+.. Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
.. -----------------------------------------------------------------------
diff --git a/docs/sources/system-requirements.rst b/docs/sources/system-requirements.rst
index bcb5cd6..9dc08f1 100644
--- a/docs/sources/system-requirements.rst
+++ b/docs/sources/system-requirements.rst
@@ -1,16 +1,8 @@
.. Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
-.. 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.
+.. This work is licensed under the
+.. Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
.. -----------------------------------------------------------------------
diff --git a/docs/sources/ux-requirements.rst b/docs/sources/ux-requirements.rst
index a41995e..ec63d01 100644
--- a/docs/sources/ux-requirements.rst
+++ b/docs/sources/ux-requirements.rst
@@ -1,22 +1,8 @@
.. Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
-.. 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.
-
-.. -----------------------------------------------------------------------
-
-.. Document to list the requirements for a common user experience
- created by the different installers.
- Please add a bullet each for every requirement added.
+.. This work is licensed under the
+.. Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
===============
UX requirements