summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2015-02-03 11:44:08 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-17 15:16:58 +0000
commitdd62d577be567f5dc587835956ecd40e7659a9a1 (patch)
treefdcacf7faad4935e89a14a78cd966afafca7133b /documentation
parentab2007dc4eb6496449abbc1997165bb6b6b3d22d (diff)
downloadast2050-yocto-poky-dd62d577be567f5dc587835956ecd40e7659a9a1.zip
ast2050-yocto-poky-dd62d577be567f5dc587835956ecd40e7659a9a1.tar.gz
mega-manual: Added toaster-title.png and code to include toaster-manual
Fixes [YOCTO #6901] Added the toaster-title.png file to the mega-manual/figures folder so the Toaster title would show up in the mega-manual. Added lines so that the mega-manual would include the Toaster manual file to the mega-manual. (From yocto-docs rev: 5a4a67e4f140802da133b7bcb480c84b4a8edb63) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/mega-manual/figures/toaster-title.pngbin0 -> 9277 bytes
-rw-r--r--documentation/mega-manual/mega-manual.xml5
2 files changed, 5 insertions, 0 deletions
diff --git a/documentation/mega-manual/figures/toaster-title.png b/documentation/mega-manual/figures/toaster-title.png
new file mode 100644
index 0000000..b7ea39c
--- /dev/null
+++ b/documentation/mega-manual/figures/toaster-title.png
Binary files differ
diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml
index 405dfd8..2035bed 100644
--- a/documentation/mega-manual/mega-manual.xml
+++ b/documentation/mega-manual/mega-manual.xml
@@ -101,6 +101,11 @@
<xi:include
xmlns:xi="http://www.w3.org/2003/XInclude" href="../ref-manual/ref-manual.xml"/>
+<para><imagedata fileref="figures/toaster-title.png" width="100%" align="left" scalefit="1" /></para>
+
+ <xi:include
+ xmlns:xi="http://www.w3.org/2003/XInclude" href="../toaster-manual/toaster-manual.xml"/>
+
<!-- <index id='index'>
<title>Index</title>
</index>
OpenPOWER on IntegriCloud