From 768da1ab4788130d62848b2db172503fa5b37e02 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Sat, 20 Aug 2016 21:17:34 -0400 Subject: Fixes rpmbuilding for doc structure change Change-Id: I2ac2910eaecab1fc4fb9634b6af9bc7f454ff77a Signed-off-by: Tim Rozet --- build/rpm_specs/opnfv-apex-common.spec | 6 +++--- docs/configguide/installerconfig.rst | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index 6b86bf87..39bcd289 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -22,7 +22,7 @@ https://wiki.opnfv.org/apex %setup -q %build -rst2html docs/installation-instructions/index.rst docs/installation-instructions.html +rst2html docs/installationprocedure/index.rst docs/installation-instructions.html rst2html docs/release-notes/release-notes.rst docs/release-notes.html %global __python %{__python3} @@ -131,11 +131,11 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog -* Thu Aug 1 2016 Tim Rozet - 3.0-11 +* Mon Aug 1 2016 Tim Rozet - 3.0-11 - Add nosdn fdio scenarios. * Tue Jul 5 2016 Dan Radez - 3.0-10 - Adding functions.sh files -* Thu Jun 15 2016 Tim Rozet - 3.0-9 +* Wed Jun 15 2016 Tim Rozet - 3.0-9 - Add fdio scenarios. * Tue Jun 14 2016 Feng Pan - 3.0-8 - Add network_settings_v6.yaml diff --git a/docs/configguide/installerconfig.rst b/docs/configguide/installerconfig.rst index 8f35905c..0cbb00f6 100644 --- a/docs/configguide/installerconfig.rst +++ b/docs/configguide/installerconfig.rst @@ -7,5 +7,5 @@ Apex configuration ================== -.. include:: ../installation-instructions/introduction.rst -.. include:: ../installation-instructions/baremetal.rst +.. include:: ../installationprocedure/introduction.rst +.. include:: ../installationprocedure/baremetal.rst -- cgit 1.2.3-korg