diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/documentation/mega-manual/mega-manual.xml | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/documentation/mega-manual/mega-manual.xml')
-rw-r--r-- | poky/documentation/mega-manual/mega-manual.xml | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/poky/documentation/mega-manual/mega-manual.xml b/poky/documentation/mega-manual/mega-manual.xml index 7a4199198b..2c518f9511 100644 --- a/poky/documentation/mega-manual/mega-manual.xml +++ b/poky/documentation/mega-manual/mega-manual.xml @@ -12,9 +12,11 @@ <abstract> The Yocto Project Mega-Manual is a concatenation of the published - Yocto Project HTML manuals for the given release. - The manual exists to help users efficiently search for strings - across the entire Yocto Project documentation set. + Yocto Project HTML manuals along with the corresponding BitBake + User Manual for the given release. + The Mega-Manual exists to help users efficiently search for strings + across the entire Yocto Project documentation set inclusive of + the BitBake User Manual. </abstract> <mediaobject> @@ -81,9 +83,9 @@ <revremark>Released with the Yocto Project 2.6 Release.</revremark> </revision> <revision> - <revnumber>2.6.1</revnumber> + <revnumber>2.7</revnumber> <date>&REL_MONTH_YEAR;</date> - <revremark>Released with the Yocto Project 2.6.1 Release.</revremark> + <revremark>Released with the Yocto Project 2.7 Release.</revremark> </revision> </revhistory> @@ -322,6 +324,30 @@ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../toaster-manual/toaster-manual-reference.xml"/> +<!-- Includes bitbake-user-manual title image and then bitbake-user-manual chapters --> + + <para> + <imagedata fileref="figures/bitbake-title.png" width="100%" align="left" scalefit="1" /> + </para> + + <xi:include + xmlns:xi="http://www.w3.org/2003/XInclude" href="../../../bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml"/> + + <xi:include + xmlns:xi="http://www.w3.org/2003/XInclude" href="../../../bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml"/> + + <xi:include + xmlns:xi="http://www.w3.org/2003/XInclude" href="../../../bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml"/> + + <xi:include + xmlns:xi="http://www.w3.org/2003/XInclude" href="../../../bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml"/> + + <xi:include + xmlns:xi="http://www.w3.org/2003/XInclude" href="../../../bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml"/> + + <xi:include + xmlns:xi="http://www.w3.org/2003/XInclude" href="../../../bitbake/doc/bitbake-user-manual/bitbake-user-manual-hello.xml"/> + </book> <!-- |