Moved all docs to appropriate folder

artifacts-location.rst was still left in the
docs/sources directory. This patch moves it to
the requirements document so that the docs
pipeline can pick it up. The index.rst in
the requirements directory is updated
accordingly.

Change-Id: I736391acd0ccfdfaf3d8a3aa43424d1c85ef0e9a
Signed-off-by: Frank Brockners <fbrockne@cisco.com>
(cherry picked from commit 85edacd2a9df555b90f59d09ea75d99da0ee7c6f)

diff --git a/docs/requirements/README.md b/docs/requirements/README.md
new file mode 100644 (file)
index 0000000..570a90c
--- /dev/null
+++ b/docs/requirements/README.md
@@ -0,0 +1,8 @@
+.. Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
+
+.. This work is licensed under the
+.. Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+
+# Requirements documents
+This directory contains the sources for documents which list requirements which are common across all deployment tools and as such are also met by all deployment tools (a.k.a. "installers").

diff --git a/docs/sources/artifacts-location.rst b/docs/requirements/artifacts-location.rst
similarity index 99%
rename from docs/sources/artifacts-location.rst
rename to docs/requirements/artifacts-location.rst
index 468b9dd..d77dd62 100644 (file)
--- a/docs/sources/artifacts-location.rst
+++ b/docs/requirements/artifacts-location.rst
@@ -18,6 +18,7 @@ VM manager components
 =====================
 
 * OpenStack::
+
   location: `<http://docs.openstack.org/releases/releases/liberty.html>`_
   joid_location: cloud-archive:liberty
   release: Liberty
@@ -26,13 +27,16 @@ Network controller components
 =============================
 
 * OpenDaylight Controller::
+
   location: `https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2/distribution-karaf-0.4.0-Beryllium-RC2.tar.gz'
   release: Beryllium RC2
 
 * OpenDaylight SFC::
+
   location: `<https://www.dropbox.com/s/6w76eo7loltvvb5/openstack.net-virt-sfc-karaf-1.2.1-SNAPSHOT.zip>`_
 
 * ONOS Controller::
+
   location: `<http://downloads.onosproject.org/nightly/onos-1.4.0-rc2.tar.gz>`_
   release: Emu 1.4.0-rc2
 
@@ -40,10 +44,12 @@ vSwitch components
 ==================
 
  * OVS NSH build::
+
   location: `<https://github.com/openvswitch/ovs.git>`_
   commit: 121daded51b9798fe3722824b27a05c16806cbd1
 
  * OVS build::
+
   joid_location: `cloud-archive:liberty`
   release: 1.4.0
 
@@ -51,14 +57,17 @@ JOID components
 ===============
 
  * MAAS::
+
   location: ppa:maas/stable
   release: 1.9.0
 
  * JUJU::
+
   location: ppa:juju/stable
   release: 1.25.3
 
  * CHARM::
+
   location: https://code.launchpad.net/~openstack-charmers
       charm: "cs:trusty/juju-gui"
       charm: "cs:trusty/ubuntu"
@@ -97,4 +106,3 @@ JOID components
       branch: "lp:~wuwenbin2/onosfw/onos-controller"
       branch: "lp:~wuwenbin2/onosfw/neutron-api-onos"
       branch: "lp:~wuwenbin2/onosfw/openvswitch-onos"
-

diff --git a/docs/requirements/index.rst b/docs/requirements/index.rst
index 12f1c2a..9d7e29f 100644 (file)
--- a/docs/requirements/index.rst
+++ b/docs/requirements/index.rst
@@ -11,4 +11,4 @@ OPNFV deployment tools common requirements
    ./userexperience.rst
    ./system.rst
    ./component-support.rst
-
+   ./artifacts-location.rst

diff --git a/docs/sources/README.md b/docs/sources/README.md
deleted file mode 100644 (file)
index f88c3ce..0000000
--- a/docs/sources/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-<!---
-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.
--->
-# Requirements documents
-This directory contains the sources for documents which list requirements which are common across all deployment tools and as such are also met by all deployment tools (a.k.a. "installers").