summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2018-04-06 10:14:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-24 17:16:07 +0100
commita97c05bd3a2a201e32154675816733db2c2eede9 (patch)
treec93a3507a184015a7799c3468465c2091450481b
parent63168f74d33762f9add78a53dfbb164e73fef8c9 (diff)
downloadpoky-a97c05bd3a2a201e32154675816733db2c2eede9.tar.gz
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 <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/Makefile20
-rw-r--r--documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-style.css2
-rw-r--r--documentation/brief-yoctoprojectqs/figures/bypqs-title.pngbin0 -> 14312 bytes
-rw-r--r--documentation/brief-yoctoprojectqs/figures/ypqs-title.pngbin11700 -> 0 bytes
-rw-r--r--documentation/mega-manual/figures/bypqs-title.pngbin0 -> 14312 bytes
-rw-r--r--documentation/mega-manual/figures/ypqs-title.pngbin12900 -> 0 bytes
-rw-r--r--documentation/mega-manual/mega-manual.xml6
7 files changed, 6 insertions, 22 deletions
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 \
91 --stringparam section.label.includes.component.label 0 \ 91 --stringparam section.label.includes.component.label 0 \
92 --xinclude 92 --xinclude
93ALLPREQ = html tarball 93ALLPREQ = html tarball
94TARFILES = brief-yoctoprojectqs-style.css brief-yoctoprojectqs.html figures/ypqs-title.png \ 94TARFILES = brief-yoctoprojectqs-style.css brief-yoctoprojectqs.html figures/bypqs-title.png \
95 figures/yocto-project-transp.png 95 figures/yocto-project-transp.png
96MANUALS = $(DOC)/$(DOC).html $(DOC)/eclipse 96MANUALS = $(DOC)/$(DOC).html $(DOC)/eclipse
97FIGURES = figures 97FIGURES = figures
@@ -186,22 +186,6 @@ STYLESHEET = $(DOC)/*.css
186 186
187endif 187endif
188 188
189ifeq ($(DOC),yocto-project-qs)
190XSLTOPTS = --stringparam html.stylesheet qs-style.css \
191 --stringparam chapter.autolabel 1 \
192 --stringparam section.autolabel 1 \
193 --stringparam section.label.includes.component.label 1 \
194 --xinclude
195ALLPREQ = html eclipse tarball
196
197TARFILES = yocto-project-qs.html qs-style.css \
198 figures/yocto-project-transp.png figures/ypqs-title.png \
199 eclipse
200MANUALS = $(DOC)/$(DOC).html $(DOC)/eclipse
201FIGURES = figures
202STYLESHEET = $(DOC)/*.css
203endif
204
205ifeq ($(DOC),mega-manual) 189ifeq ($(DOC),mega-manual)
206XSLTOPTS = --stringparam html.stylesheet mega-style.css \ 190XSLTOPTS = --stringparam html.stylesheet mega-style.css \
207 --stringparam chapter.autolabel 1 \ 191 --stringparam chapter.autolabel 1 \
@@ -295,7 +279,7 @@ TARFILES = mega-manual.html mega-style.css \
295 figures/sdk-environment.png figures/sdk-installed-standard-sdk-directory.png \ 279 figures/sdk-environment.png figures/sdk-installed-standard-sdk-directory.png \
296 figures/sdk-devtool-add-flow.png figures/sdk-installed-extensible-sdk-directory.png \ 280 figures/sdk-devtool-add-flow.png figures/sdk-installed-extensible-sdk-directory.png \
297 figures/sdk-devtool-modify-flow.png figures/sdk-eclipse-dev-flow.png \ 281 figures/sdk-devtool-modify-flow.png figures/sdk-eclipse-dev-flow.png \
298 figures/sdk-devtool-upgrade-flow.png figures/bitbake-build-flow.png figures/ypqs-title.png \ 282 figures/sdk-devtool-upgrade-flow.png figures/bitbake-build-flow.png figures/bypqs-title.png \
299 figures/getting-started-title.png figures/concepts-manual-title.png 283 figures/getting-started-title.png figures/concepts-manual-title.png
300 endif 284 endif
301 285
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 {
118 background-color: transparent; 118 background-color: transparent;
119 background-repeat: no-repeat; 119 background-repeat: no-repeat;
120 padding-top: 256px; 120 padding-top: 256px;
121 background-image: url("figures/ypqs-title.png"); 121 background-image: url("figures/bypqs-title.png");
122 background-position: left top; 122 background-position: left top;
123 margin-top: -256px; 123 margin-top: -256px;
124 padding-right: 50px; 124 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
--- /dev/null
+++ b/documentation/brief-yoctoprojectqs/figures/bypqs-title.png
Binary files 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
--- a/documentation/brief-yoctoprojectqs/figures/ypqs-title.png
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/documentation/mega-manual/figures/bypqs-title.png
Binary files 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
--- a/documentation/mega-manual/figures/ypqs-title.png
+++ /dev/null
Binary files 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 @@
132 132
133 </bookinfo> 133 </bookinfo>
134 134
135<!-- Includes yocto-project-qs --> 135<!-- Includes brief-yoctoprojectqs -->
136 136
137 <para> 137 <para>
138 <imagedata fileref="figures/ypqs-title.png" width="100%" align="left" scalefit="1" /> 138 <imagedata fileref="figures/bypqs-title.png" width="100%" align="left" scalefit="1" />
139 </para> 139 </para>
140 140
141 <xi:include 141 <xi:include
142 xmlns:xi="http://www.w3.org/2003/XInclude" href="../yocto-project-qs/qs.xml"/> 142 xmlns:xi="http://www.w3.org/2003/XInclude" href="../brief-yoctoprojectqs/brief-yoctoprojectqs.xml"/>
143 143
144<!-- Includes getting-started title image and then getting-started chapters --> 144<!-- Includes getting-started title image and then getting-started chapters -->
145 145