Merge "Restructured the installation-instruction file into indexed sub files"

diff --combined build/opnfv-apex-common.spec
index 4d3c450,9378b23..15838c0
--- 1/build/opnfv-apex-common.spec
--- 2/build/opnfv-apex-common.spec
+++ b/build/opnfv-apex-common.spec
@@@ -20,7 -20,7 +20,7 @@@ https://wiki.opnfv.org/ape
  %setup -q
  
  %build
- rst2html docs/installation-instructions/installation-instructions.rst docs/installation-instructions.html
+ rst2html docs/installation-instructions/index.rst docs/installation-instructions.html
  rst2html docs/release-notes/release-notes.rst docs/release-notes.html
  
  %install
@@@ -38,12 -38,9 +38,11 @@@ install config/deploy/network/network_s
  
  mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/
  install lib/common-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/
 +mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/
 +install lib/installer/onos/onos_gw_mac_update.sh %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/
  
  mkdir -p %{buildroot}%{_docdir}/opnfv/
  install LICENSE.rst %{buildroot}%{_docdir}/opnfv/
- install docs/installation-instructions/index.rst %{buildroot}%{_docdir}/opnfv/installation-instructions.rst
  install docs/installation-instructions.html %{buildroot}%{_docdir}/opnfv/
  install docs/release-notes/index.rst %{buildroot}%{_docdir}/opnfv/release-notes.rst
  install docs/release-notes.html %{buildroot}%{_docdir}/opnfv/
@@@ -55,7 -52,6 +54,7 @@@ install config/deploy/network/network_s
  %attr(755,root,root) %{_bindir}/opnfv-deploy
  %attr(755,root,root) %{_bindir}/opnfv-clean
  %{_var}/opt/opnfv/lib/common-functions.sh
 +%{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh
  %{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml
  %{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-ha.yaml
  %{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml
@@@ -63,7 -59,6 +62,6 @@@
  %{_sysconfdir}/opnfv-apex/os-opencontrail-nofeature-ha.yaml
  %{_sysconfdir}/opnfv-apex/network_settings.yaml
  %doc %{_docdir}/opnfv/LICENSE.rst
- %doc %{_docdir}/opnfv/installation-instructions.rst
  %doc %{_docdir}/opnfv/installation-instructions.html
  %doc %{_docdir}/opnfv/release-notes.rst
  %doc %{_docdir}/opnfv/release-notes.html
@@@ -71,5 -66,7 +69,7 @@@
  %doc %{_docdir}/opnfv/network_settings.yaml.example
  
  %changelog
+ * Wed Jan 20 2016 Dan Radez <dradez@redhat.com> - 2.1-3
+ - Updating the installation instructions
  * Thu Jan 14 2016 Dan Radez <dradez@redhat.com> - 2.1-2
  - Package Split