From a97c05bd3a2a201e32154675816733db2c2eede9 Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Fri, 6 Apr 2018 10:14:18 -0700 Subject: documentation: Added brief-yoctoprojectqs to mega-manual The original QS (yocto-project-qs) has been retired for the YP sumo (2.5) release. The manual has been replaced with the brief, two-page quick build document (brief-yoctoprojectqs). I needed to create a new title figure for the manual to include as part of the mega-manual (bypqs-title.png). The figure was added to the figures folder of both the bried-yoctoprojectqs and mega-manual book folders. I also removed the old ypqs-title.png file that was used for the original QS. Updated the stylesheet doc for the brief build to include a style using the new title .PNG file. Updated the mega-manual.xml file to include the brief doc and exclude the original QS. (From yocto-docs rev: aadec4a70fa89e4dcd233c337d8971c8353ee26d) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/Makefile | 20 ++------------------ .../brief-yoctoprojectqs-style.css | 2 +- .../brief-yoctoprojectqs/figures/bypqs-title.png | Bin 0 -> 14312 bytes .../brief-yoctoprojectqs/figures/ypqs-title.png | Bin 11700 -> 0 bytes documentation/mega-manual/figures/bypqs-title.png | Bin 0 -> 14312 bytes documentation/mega-manual/figures/ypqs-title.png | Bin 12900 -> 0 bytes documentation/mega-manual/mega-manual.xml | 6 +++--- 7 files changed, 6 insertions(+), 22 deletions(-) create mode 100644 documentation/brief-yoctoprojectqs/figures/bypqs-title.png delete mode 100644 documentation/brief-yoctoprojectqs/figures/ypqs-title.png create mode 100644 documentation/mega-manual/figures/bypqs-title.png delete mode 100644 documentation/mega-manual/figures/ypqs-title.png diff --git a/documentation/Makefile b/documentation/Makefile index 6e2308ff29..ad30439bc8 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -91,7 +91,7 @@ XSLTOPTS = --stringparam html.stylesheet brief-yoctoprojectqs-style.css \ --stringparam section.label.includes.component.label 0 \ --xinclude ALLPREQ = html tarball -TARFILES = brief-yoctoprojectqs-style.css brief-yoctoprojectqs.html figures/ypqs-title.png \ +TARFILES = brief-yoctoprojectqs-style.css brief-yoctoprojectqs.html figures/bypqs-title.png \ figures/yocto-project-transp.png MANUALS = $(DOC)/$(DOC).html $(DOC)/eclipse FIGURES = figures @@ -186,22 +186,6 @@ STYLESHEET = $(DOC)/*.css endif -ifeq ($(DOC),yocto-project-qs) -XSLTOPTS = --stringparam html.stylesheet qs-style.css \ - --stringparam chapter.autolabel 1 \ - --stringparam section.autolabel 1 \ - --stringparam section.label.includes.component.label 1 \ - --xinclude -ALLPREQ = html eclipse tarball - -TARFILES = yocto-project-qs.html qs-style.css \ - figures/yocto-project-transp.png figures/ypqs-title.png \ - eclipse -MANUALS = $(DOC)/$(DOC).html $(DOC)/eclipse -FIGURES = figures -STYLESHEET = $(DOC)/*.css -endif - ifeq ($(DOC),mega-manual) XSLTOPTS = --stringparam html.stylesheet mega-style.css \ --stringparam chapter.autolabel 1 \ @@ -295,7 +279,7 @@ TARFILES = mega-manual.html mega-style.css \ figures/sdk-environment.png figures/sdk-installed-standard-sdk-directory.png \ figures/sdk-devtool-add-flow.png figures/sdk-installed-extensible-sdk-directory.png \ figures/sdk-devtool-modify-flow.png figures/sdk-eclipse-dev-flow.png \ - figures/sdk-devtool-upgrade-flow.png figures/bitbake-build-flow.png figures/ypqs-title.png \ + figures/sdk-devtool-upgrade-flow.png figures/bitbake-build-flow.png figures/bypqs-title.png \ figures/getting-started-title.png figures/concepts-manual-title.png endif diff --git a/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-style.css b/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-style.css index 5085b9d0be..386841debe 100644 --- a/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-style.css +++ b/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-style.css @@ -118,7 +118,7 @@ h6 { background-color: transparent; background-repeat: no-repeat; padding-top: 256px; - background-image: url("figures/ypqs-title.png"); + background-image: url("figures/bypqs-title.png"); background-position: left top; margin-top: -256px; padding-right: 50px; diff --git a/documentation/brief-yoctoprojectqs/figures/bypqs-title.png b/documentation/brief-yoctoprojectqs/figures/bypqs-title.png new file mode 100644 index 0000000000..9e0a5ce52e Binary files /dev/null and b/documentation/brief-yoctoprojectqs/figures/bypqs-title.png differ diff --git a/documentation/brief-yoctoprojectqs/figures/ypqs-title.png b/documentation/brief-yoctoprojectqs/figures/ypqs-title.png deleted file mode 100644 index 0156e261b1..0000000000 Binary files a/documentation/brief-yoctoprojectqs/figures/ypqs-title.png and /dev/null differ diff --git a/documentation/mega-manual/figures/bypqs-title.png b/documentation/mega-manual/figures/bypqs-title.png new file mode 100644 index 0000000000..9e0a5ce52e Binary files /dev/null and b/documentation/mega-manual/figures/bypqs-title.png differ diff --git a/documentation/mega-manual/figures/ypqs-title.png b/documentation/mega-manual/figures/ypqs-title.png deleted file mode 100644 index 25c7a42b99..0000000000 Binary files a/documentation/mega-manual/figures/ypqs-title.png and /dev/null differ diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml index 344634033e..7e63f05171 100644 --- a/documentation/mega-manual/mega-manual.xml +++ b/documentation/mega-manual/mega-manual.xml @@ -132,14 +132,14 @@ - + - + + xmlns:xi="http://www.w3.org/2003/XInclude" href="../brief-yoctoprojectqs/brief-yoctoprojectqs.xml"/> -- cgit v1.2.3-54-g00ecf