diff options
-rwxr-xr-x | build-composite.sh | 12 | ||||
-rw-r--r-- | docs/configguide/installer-config.rst | 12 | ||||
-rw-r--r-- | docs/configguide/installerconfig-apex.rst | 11 | ||||
-rw-r--r-- | docs/configguide/installerconfig-fuel.rst | 4 | ||||
-rw-r--r-- | docs/configguide/installerconfig-joid.rst | 4 |
5 files changed, 9 insertions, 34 deletions
diff --git a/build-composite.sh b/build-composite.sh index 574c4ecd9..8e4c75e69 100755 --- a/build-composite.sh +++ b/build-composite.sh @@ -73,10 +73,14 @@ sed -i -e '/^.. figure::/s|images|../projects/promise/configguide/images|' \ echo echo "Creating document links" echo -#for guide in configguide/installer-config.rst configguide/feature-config.rst \ -# configguide/postinatall.rst \ -# userguide/feature-usage.rst userguide/test-usage.rst -for guide in configguide/feature-config.rst +targets=" +configguide/installer-config.rst +configguide/feature-config.rst +" +# configguide/postinatall.rst +# userguide/feature-usage.rst +# userguide/test-usage.rst +for guide in $targets do mainfile="$WORKSPACE/docs/$guide" for repo in $repos diff --git a/docs/configguide/installer-config.rst b/docs/configguide/installer-config.rst index ad10cb4ae..3569d4ed2 100644 --- a/docs/configguide/installer-config.rst +++ b/docs/configguide/installer-config.rst @@ -9,14 +9,4 @@ Installer Configuration The following sections describe the per installer configuration options. Further details for each installer are captured in the referred project documentation. -.. toctree:: - - installerconfig-apex - -.. toctree:: - - installerconfig-fuel - -.. toctree:: - - installerconfig-joid +.. <project>/docs/configguide/installerconfig.rst files will be imported below by the build script. diff --git a/docs/configguide/installerconfig-apex.rst b/docs/configguide/installerconfig-apex.rst deleted file mode 100644 index 272956540..000000000 --- a/docs/configguide/installerconfig-apex.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 - -.. NOTE: this is workaround and has to be fixed in each project repo. - -================== -Apex configuration -================== - -.. include:: ../projects/apex/configguide/introduction.rst -.. include:: ../projects/apex/configguide/baremetalinstall.rst diff --git a/docs/configguide/installerconfig-fuel.rst b/docs/configguide/installerconfig-fuel.rst deleted file mode 100644 index 2a66ea1b0..000000000 --- a/docs/configguide/installerconfig-fuel.rst +++ /dev/null @@ -1,4 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 - -.. include:: ../projects/fuel/configguide/installerconfig.rst diff --git a/docs/configguide/installerconfig-joid.rst b/docs/configguide/installerconfig-joid.rst deleted file mode 100644 index cd4e5e254..000000000 --- a/docs/configguide/installerconfig-joid.rst +++ /dev/null @@ -1,4 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 - -.. include:: ../projects/joid/configguide/installerconfig.rst |