diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2014-12-18 15:36:27 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-19 22:36:14 +0000 |
commit | 4f0fa9224ade617dee573625ea99188ed3f12d07 (patch) | |
tree | 1095904fb3eccbc2ae7eadf21c6b642f15a1c652 /documentation | |
parent | d23e18990eb85b8a6e4f81240b448ed34891dfc0 (diff) | |
download | poky-4f0fa9224ade617dee573625ea99188ed3f12d07.tar.gz |
Revert "yocto-project-qs, mega-manual: Conformed to YP book set"
This reverts commit 914c482bd89071ab34b3381e3bd8065f871cc047.
I had to revert this change because it broke the footnote behavior.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r-- | documentation/Makefile | 4 | ||||
-rw-r--r-- | documentation/mega-manual/figures/yocto-project-qs-title.png | bin | 10156 -> 0 bytes | |||
-rwxr-xr-x | documentation/mega-manual/figures/yocto-project-transp.png | bin | 0 -> 8626 bytes | |||
-rw-r--r-- | documentation/mega-manual/mega-manual.xml | 2 | ||||
-rw-r--r-- | documentation/yocto-project-qs/figures/yocto-project-qs-title.png | bin | 10156 -> 0 bytes | |||
-rwxr-xr-x | documentation/yocto-project-qs/figures/yocto-project-transp.png | bin | 0 -> 8626 bytes | |||
-rw-r--r-- | documentation/yocto-project-qs/qs-style.css | 9 | ||||
-rw-r--r-- | documentation/yocto-project-qs/yocto-project-qs.xml | 42 |
8 files changed, 19 insertions, 38 deletions
diff --git a/documentation/Makefile b/documentation/Makefile index 7ffe649035..3bc9a213ee 100644 --- a/documentation/Makefile +++ b/documentation/Makefile | |||
@@ -130,7 +130,7 @@ XSLTOPTS = --xinclude | |||
130 | ALLPREQ = html eclipse tarball | 130 | ALLPREQ = html eclipse tarball |
131 | TARFILES = yocto-project-qs.html qs-style.css figures/yocto-environment.png \ | 131 | TARFILES = yocto-project-qs.html qs-style.css figures/yocto-environment.png \ |
132 | figures/building-an-image.png figures/using-a-pre-built-image.png \ | 132 | figures/building-an-image.png figures/using-a-pre-built-image.png \ |
133 | figures/yocto-project-qs-title.png \ | 133 | figures/yocto-project-transp.png \ |
134 | eclipse | 134 | eclipse |
135 | MANUALS = $(DOC)/$(DOC).html $(DOC)/eclipse | 135 | MANUALS = $(DOC)/$(DOC).html $(DOC)/eclipse |
136 | FIGURES = figures | 136 | FIGURES = figures |
@@ -201,7 +201,7 @@ TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png figures | |||
201 | figures/package-feeds.png figures/layer-input.png figures/images.png figures/sdk.png \ | 201 | figures/package-feeds.png figures/layer-input.png figures/images.png figures/sdk.png \ |
202 | figures/source-fetching.png figures/patching.png figures/configuration-compile-autoreconf.png \ | 202 | figures/source-fetching.png figures/patching.png figures/configuration-compile-autoreconf.png \ |
203 | figures/analysis-for-package-splitting.png figures/image-generation.png \ | 203 | figures/analysis-for-package-splitting.png figures/image-generation.png \ |
204 | figures/sdk-generation.png figures/recipe-workflow.png figures/yocto-project-qs-title.png | 204 | figures/sdk-generation.png figures/recipe-workflow.png |
205 | endif | 205 | endif |
206 | 206 | ||
207 | MANUALS = $(DOC)/$(DOC).html | 207 | MANUALS = $(DOC)/$(DOC).html |
diff --git a/documentation/mega-manual/figures/yocto-project-qs-title.png b/documentation/mega-manual/figures/yocto-project-qs-title.png deleted file mode 100644 index a410a0d5e8..0000000000 --- a/documentation/mega-manual/figures/yocto-project-qs-title.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/documentation/mega-manual/figures/yocto-project-transp.png b/documentation/mega-manual/figures/yocto-project-transp.png new file mode 100755 index 0000000000..31d2b147fd --- /dev/null +++ b/documentation/mega-manual/figures/yocto-project-transp.png | |||
Binary files differ | |||
diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml index a2ec256445..01af789aed 100644 --- a/documentation/mega-manual/mega-manual.xml +++ b/documentation/mega-manual/mega-manual.xml | |||
@@ -8,8 +8,6 @@ | |||
8 | xmlns="http://docbook.org/ns/docbook" | 8 | xmlns="http://docbook.org/ns/docbook" |
9 | > | 9 | > |
10 | 10 | ||
11 | <para><imagedata fileref="figures/yocto-project-qs-title.png" width="100%" align="left" scalefit="1" /></para> | ||
12 | |||
13 | <xi:include | 11 | <xi:include |
14 | xmlns:xi="http://www.w3.org/2003/XInclude" href="../yocto-project-qs/yocto-project-qs.xml"/> | 12 | xmlns:xi="http://www.w3.org/2003/XInclude" href="../yocto-project-qs/yocto-project-qs.xml"/> |
15 | 13 | ||
diff --git a/documentation/yocto-project-qs/figures/yocto-project-qs-title.png b/documentation/yocto-project-qs/figures/yocto-project-qs-title.png deleted file mode 100644 index a410a0d5e8..0000000000 --- a/documentation/yocto-project-qs/figures/yocto-project-qs-title.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/documentation/yocto-project-qs/figures/yocto-project-transp.png b/documentation/yocto-project-qs/figures/yocto-project-transp.png new file mode 100755 index 0000000000..31d2b147fd --- /dev/null +++ b/documentation/yocto-project-qs/figures/yocto-project-transp.png | |||
Binary files differ | |||
diff --git a/documentation/yocto-project-qs/qs-style.css b/documentation/yocto-project-qs/qs-style.css index a324a4a51d..235c85a1ba 100644 --- a/documentation/yocto-project-qs/qs-style.css +++ b/documentation/yocto-project-qs/qs-style.css | |||
@@ -118,13 +118,12 @@ 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/yocto-project-qs-title.png"); | 121 | background-position: top; |
122 | background-position: left top; | ||
123 | margin-top: -256px; | 122 | margin-top: -256px; |
124 | padding-right: 50px; | 123 | padding-right: 50px; |
125 | margin-left: 0px; | 124 | margin-left: 50px; |
126 | text-align: right; | 125 | text-align: center; |
127 | width: 740px; | 126 | width: 600px; |
128 | } | 127 | } |
129 | 128 | ||
130 | h3.author { | 129 | h3.author { |
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml index 1e2f3670f4..9f1a4fbb36 100644 --- a/documentation/yocto-project-qs/yocto-project-qs.xml +++ b/documentation/yocto-project-qs/yocto-project-qs.xml | |||
@@ -1,33 +1,10 @@ | |||
1 | <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" | 1 | <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" |
2 | "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" | 2 | "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" |
3 | [<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] > | 3 | [<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] > |
4 | 4 | ||
5 | <book id='intro' lang='en' | 5 | <article id='intro'> |
6 | xmlns:xi="http://www.w3.org/2003/XInclude" | 6 | <articleinfo> |
7 | xmlns="http://docbook.org/ns/docbook" | 7 | <title>Yocto Project Quick Start</title> |
8 | > | ||
9 | <bookinfo> | ||
10 | <mediaobject> | ||
11 | <imageobject> | ||
12 | <imagedata fileref='figures/yocto-project-qs-title.png' | ||
13 | format='SVG' | ||
14 | align='left' scalefit='1' width='100%'/> | ||
15 | </imageobject> | ||
16 | </mediaobject> | ||
17 | |||
18 | <title> | ||
19 | Yocto Project Quick Start | ||
20 | </title> | ||
21 | |||
22 | <authorgroup> | ||
23 | <author> | ||
24 | <firstname>Scott</firstname> <surname>Rifenbark</surname> | ||
25 | <affiliation> | ||
26 | <orgname>Intel Corporation</orgname> | ||
27 | </affiliation> | ||
28 | <email>scott.m.rifenbark@intel.com</email> | ||
29 | </author> | ||
30 | </authorgroup> | ||
31 | 8 | ||
32 | <copyright> | 9 | <copyright> |
33 | <year>©RIGHT_YEAR;</year> | 10 | <year>©RIGHT_YEAR;</year> |
@@ -46,7 +23,14 @@ | |||
46 | from the Yocto Project website. | 23 | from the Yocto Project website. |
47 | </note> | 24 | </note> |
48 | </legalnotice> | 25 | </legalnotice> |
49 | </bookinfo> | 26 | |
27 | |||
28 | <abstract> | ||
29 | <imagedata fileref="figures/yocto-project-transp.png" | ||
30 | width="6in" depth="1in" | ||
31 | align="right" scale="25" /> | ||
32 | </abstract> | ||
33 | </articleinfo> | ||
50 | 34 | ||
51 | <section id='welcome'> | 35 | <section id='welcome'> |
52 | <title>Welcome!</title> | 36 | <title>Welcome!</title> |
@@ -978,7 +962,7 @@ | |||
978 | </section> | 962 | </section> |
979 | </section> | 963 | </section> |
980 | 964 | ||
981 | </book> | 965 | </article> |
982 | <!-- | 966 | <!-- |
983 | vim: expandtab tw=80 ts=4 | 967 | vim: expandtab tw=80 ts=4 |
984 | --> | 968 | --> |