poky.ent: Added YOCTO_DOCS_OM_URL entity

The variabe for the "getting-started" manual goes away and is
replaced by this one for the new "overview-manual."

(From yocto-docs rev: 45fc9beac6db4c40c3660fc9e54cc11e9c1f96c4)

Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Rifenbark
2018-04-12 10:52:45 -07:00
committed by Richard Purdie
parent 4fd8b39b24
commit c555881ac8
37 changed files with 26 additions and 26 deletions

View File

@@ -99,10 +99,10 @@ STYLESHEET = $(DOC)/*.css
endif
ifeq ($(DOC),getting-started)
ifeq ($(DOC),overview-manual)
XSLTOPTS = --xinclude
ALLPREQ = html eclipse tarball
TARFILES = getting-started-style.css getting-started.html figures/getting-started-title.png \
TARFILES = overview-manual-style.css overview-manual.html figures/overview-manual-title.png \
figures/git-workflow.png figures/source-repos.png figures/index-downloads.png \
figures/yp-download.png figures/YP-flow-diagram.png figures/key-dev-elements.png \
figures/poky-reference-distribution.png \
@@ -269,7 +269,7 @@ TARFILES = mega-manual.html mega-style.css \
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/bypqs-title.png \
figures/getting-started-title.png
figures/overview-manual-title.png
endif
MANUALS = $(DOC)/$(DOC).html
@@ -418,11 +418,11 @@ eclipse: eclipse-generate eclipse-resolve-links
.PHONY : eclipse-generate eclipse-resolve-links
eclipse-generate:
ifeq ($(filter $(DOC), getting-started sdk-manual bsp-guide dev-manual kernel-dev profile-manual ref-manual brief-yoctoprojectqs),)
ifeq ($(filter $(DOC), overview-manual sdk-manual bsp-guide dev-manual kernel-dev profile-manual ref-manual brief-yoctoprojectqs),)
@echo " "
@echo "ERROR: You can only create eclipse documentation"
@echo " of the following documentation parts:"
@echo " - getting-started"
@echo " - overview-manual"
@echo " - sdk-manual"
@echo " - bsp-guide"
@echo " - dev-manual"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View File

@@ -141,23 +141,23 @@
<xi:include
xmlns:xi="http://www.w3.org/2003/XInclude" href="../brief-yoctoprojectqs/brief-yoctoprojectqs.xml"/>
<!-- Includes getting-started title image and then getting-started chapters -->
<!-- Includes overview-manual title image and then overview-manual chapters -->
<para>
<imagedata fileref="figures/getting-started-title.png" width="100%" align="left" scalefit="1" />
<imagedata fileref="figures/overview-manual-title.png" width="100%" align="left" scalefit="1" />
</para>
<xi:include
xmlns:xi="http://www.w3.org/2003/XInclude" href="../getting-started/getting-started-intro.xml"/>
xmlns:xi="http://www.w3.org/2003/XInclude" href="../overview-manual/overview-manual-intro.xml"/>
<xi:include
xmlns:xi="http://www.w3.org/2003/XInclude" href="../getting-started/getting-started-yp-intro.xml"/>
xmlns:xi="http://www.w3.org/2003/XInclude" href="../overview-manual/overview-manual-yp-intro.xml"/>
<xi:include
xmlns:xi="http://www.w3.org/2003/XInclude" href="../getting-started/getting-started-development-environment.xml"/>
xmlns:xi="http://www.w3.org/2003/XInclude" href="../overview-manual/overview-manual-development-environment.xml"/>
<xi:include
xmlns:xi="http://www.w3.org/2003/XInclude" href="../getting-started/getting-started-concepts.xml"/>
xmlns:xi="http://www.w3.org/2003/XInclude" href="../overview-manual/overview-manual-concepts.xml"/>
<!-- Includes dev-manual title image and then dev-manual chapters -->

View File

Before

Width:  |  Height:  |  Size: 186 KiB

After

Width:  |  Height:  |  Size: 186 KiB

View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 110 KiB

View File

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View File

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

View File

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 113 KiB

View File

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 66 KiB

View File

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

View File

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View File

Before

Width:  |  Height:  |  Size: 292 KiB

After

Width:  |  Height:  |  Size: 292 KiB

View File

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 72 KiB

View File

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 81 KiB

View File

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 81 KiB

View File

@@ -2,7 +2,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
<chapter id=' getting-started-concepts'>
<chapter id=' overview-manual-concepts'>
<title>Yocto Project Concepts</title>
<section id='yocto-project-components'>

View File

@@ -17,7 +17,7 @@
<xsl:include href="../template/division.title.xsl"/>
<xsl:include href="../template/formal.object.heading.xsl"/>
<xsl:param name="html.stylesheet" select="'getting-started-style.css'" />
<xsl:param name="html.stylesheet" select="'overview-manual-style.css'" />
<xsl:param name="chapter.autolabel" select="1" />
<xsl:param name="appendix.autolabel" select="A" />
<xsl:param name="section.autolabel" select="1" />

View File

@@ -22,7 +22,7 @@
<xsl:param name="chunk.section.depth" select="10"/>
<xsl:param name="use.id.as.filename" select="1"/>
<xsl:param name="ulink.target" select="'_self'" />
<xsl:param name="base.dir" select="'html/getting-started/'"/>
<xsl:param name="base.dir" select="'html/overview-manual/'"/>
<xsl:param name="html.stylesheet" select="'../book.css'"/>
<xsl:param name="eclipse.manifest" select="0"/>
<xsl:param name="create.plugin.xml" select="0"/>

View File

@@ -5,7 +5,7 @@
<chapter id='overview-manual-intro'>
<title>The Yocto Project Overview and Concepts Manual</title>
<section id='getting-started-welcome'>
<section id='overview-manual-welcome'>
<title>Welcome</title>
<para>
@@ -80,7 +80,7 @@
</para>
</section>
<section id='getting-started-overview-other-information'>
<section id='overview-manual-other-information'>
<title>Other Information</title>
<para>

View File

@@ -118,7 +118,7 @@ h6 {
background-color: transparent;
background-repeat: no-repeat;
padding-top: 256px;
background-image: url("figures/getting-started-title.png");
background-image: url("figures/overview-manual-title.png");
background-position: left top;
margin-top: -256px;
padding-right: 50px;

View File

@@ -2,7 +2,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
<book id='getting-started-manual' lang='en'
<book id='overview-manual' lang='en'
xmlns:xi="http://www.w3.org/2003/XInclude"
xmlns="http://docbook.org/ns/docbook"
>
@@ -10,7 +10,7 @@
<mediaobject>
<imageobject>
<imagedata fileref='figures/getting-started-title.png'
<imagedata fileref='figures/overview-manual-title.png'
format='SVG'
align='left' scalefit='1' width='100%'/>
</imageobject>
@@ -94,13 +94,13 @@
</bookinfo>
<xi:include href="getting-started-intro.xml"/>
<xi:include href="overview-manual-intro.xml"/>
<xi:include href="getting-started-yp-intro.xml"/>
<xi:include href="overview-manual-yp-intro.xml"/>
<xi:include href="getting-started-development-environment.xml"/>
<xi:include href="overview-manual-development-environment.xml"/>
<xi:include href="getting-started-concepts.xml" />
<xi:include href="overview-manual-concepts.xml" />
</book>
<!--

View File

@@ -62,7 +62,7 @@
<!ENTITY YOCTO_DOCS_BB_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/bitbake-user-manual/bitbake-user-manual.html">
<!ENTITY YOCTO_DOCS_TOAST_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/toaster-manual/toaster-manual.html">
<!ENTITY YOCTO_DOCS_SDK_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/sdk-manual/sdk-manual.html">
<!ENTITY YOCTO_DOCS_GS_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/getting-started/getting-started.html">
<!ENTITY YOCTO_DOCS_OM_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/overview-manual/overview-manual.html">
<!ENTITY YOCTO_DOCS_BRIEF_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/brief-yoctoprojectqs/brief-yoctoprojectqs.html">
<!ENTITY YOCTO_ADTPATH_DIR "/opt/poky/&DISTRO;">
<!ENTITY YOCTO_POKY_TARBALL "&YOCTO_POKY;.tar.bz2">

View File

@@ -16,7 +16,7 @@ s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/poky-ref-manual\/poky-
s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/sdk-manual\/sdk-manual.html#/"link" href="#/g
s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/bsp-guide\/bsp-guide.html#/"link" href="#/g
s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/dev-manual\/dev-manual.html#/"link" href="#/g
s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/getting-started\/getting-started.html#/"link" href="#/g
s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/overview-manual\/overview-manual.html#/"link" href="#/g
s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/brief-yoctoprojectqs\/brief-yoctoprojectqs.html#/"link" href="#/g
s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/kernel-dev\/kernel-dev.html#/"link" href="#/g
s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/profile-manual\/profile-manual.html#/"link" href="#/g
@@ -27,7 +27,7 @@ s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/toaster-manual\/toaste
s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/brief-yoctoprojectqs\/brief-yoctoprojectqs.html" target="_top">Yocto Project Quick Build<\/a>/Yocto Project Quick Build/g
s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/yocto-project-qs\/yocto-project-qs.html" target="_top">Yocto Project Quick Start<\/a>/Yocto Project Quick Start/g
s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/dev-manual\/dev-manual.html" target="_top">Yocto Project Development Tasks Manual<\/a>/Yocto Project Development Tasks Manual/g
s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/getting-started\/getting-started.html" target="_top">Yocto Project Overview and Concepts Manual<\/a>/Yocto project Overview and Concepts Manual/g
s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/overview-manual\/overview-manual.html" target="_top">Yocto Project Overview and Concepts Manual<\/a>/Yocto project Overview and Concepts Manual/g
s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/sdk-manual\/sdk-manual.html" target="_top">Yocto Project Application Development and the Extensible Software Development Kit (eSDK)<\/a>/Yocto Project Application Development and the Extensible Software Development Kit (eSDK)/g
s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/bsp-guide\/bsp-guide.html" target="_top">Yocto Project Board Support Package (BSP) Developer's Guide<\/a>/Yocto Project Board Support Package (BSP) Developer's Guide/g
s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/profile-manual\/profile-manual.html" target="_top">Yocto Project Profiling and Tracing Manual<\/a>/Yocto Project Profiling and Tracing Manual/g