From 129983418ead2f1352fa1998d4b74d19b40c484d Mon Sep 17 00:00:00 2001 From: ChristopherPrice Date: Tue, 12 Jan 2016 03:01:18 +0100 Subject: Restructured the installation-instruction file into indexed sub files Take-two of this patch, originally merged: f479b77c4f7c0d11196e3902bb7e60ff8e34a1fe reverted: bffb8e0e27f21934a4bbb1138427f2adda6c583d Created a section based structure for the installation-instruction. It should show on the html artifact as a structured web page. We may want to move some sections to other directories to incorporate them into the release configguide. Left that for step 2... Now includes updates to the rpm spec so as not to break the build. Change-Id: I7c0d46467de668883fcd29ae7deaa20151bacdb2 Signed-off-by: ChristopherPrice Signed-off-by: Dan Radez --- build/opnfv-apex-common.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'build/opnfv-apex-common.spec') diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 9aaf088d..9378b231 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -20,7 +20,7 @@ https://wiki.opnfv.org/apex %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 @@ -41,7 +41,6 @@ install lib/common-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ 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/ @@ -60,7 +59,6 @@ install config/deploy/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv %{_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 @@ -68,5 +66,7 @@ install config/deploy/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv %doc %{_docdir}/opnfv/network_settings.yaml.example %changelog +* Wed Jan 20 2016 Dan Radez - 2.1-3 +- Updating the installation instructions * Thu Jan 14 2016 Dan Radez - 2.1-2 - Package Split -- cgit 1.2.3-korg