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>

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
 ALLPREQ = html eclipse tarball
 TARFILES = yocto-project-qs.html qs-style.css figures/yocto-environment.png \
            figures/building-an-image.png figures/using-a-pre-built-image.png \
-           figures/yocto-project-qs-title.png \
+           figures/yocto-project-transp.png \
            eclipse
 MANUALS = $(DOC)/$(DOC).html $(DOC)/eclipse
 FIGURES = figures
@@ -201,7 +201,7 @@ TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png figures
 	figures/package-feeds.png figures/layer-input.png figures/images.png figures/sdk.png \
 	figures/source-fetching.png figures/patching.png figures/configuration-compile-autoreconf.png \
 	figures/analysis-for-package-splitting.png figures/image-generation.png \
-	figures/sdk-generation.png figures/recipe-workflow.png figures/yocto-project-qs-title.png
+	figures/sdk-generation.png figures/recipe-workflow.png
 	endif
 
 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
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
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 @@
       xmlns="http://docbook.org/ns/docbook"
       >
 
-<para><imagedata fileref="figures/yocto-project-qs-title.png" width="100%" align="left" scalefit="1" /></para>
-
     <xi:include
         xmlns:xi="http://www.w3.org/2003/XInclude" href="../yocto-project-qs/yocto-project-qs.xml"/>
 
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
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
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 {
   background-color: transparent;
   background-repeat: no-repeat;
   padding-top: 256px;
-  background-image: url("figures/yocto-project-qs-title.png");
-  background-position: left top;
+  background-position: top;
   margin-top: -256px;
   padding-right: 50px;
-  margin-left: 0px;
-  text-align: right;
-  width: 740px;
+  margin-left: 50px;
+  text-align: center;
+  width: 600px;
 }
 
 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 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 [<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
 
-<book id='intro' lang='en'
-      xmlns:xi="http://www.w3.org/2003/XInclude"
-      xmlns="http://docbook.org/ns/docbook"
-      >
-    <bookinfo>
-        <mediaobject>
-            <imageobject>
-                <imagedata fileref='figures/yocto-project-qs-title.png'
-                    format='SVG'
-                    align='left' scalefit='1' width='100%'/>
-            </imageobject>
-        </mediaobject>
-
-        <title>
-            Yocto Project Quick Start
-        </title>
-
-        <authorgroup>
-            <author>
-                <firstname>Scott</firstname> <surname>Rifenbark</surname>
-                <affiliation>
-                    <orgname>Intel Corporation</orgname>
-                </affiliation>
-                <email>scott.m.rifenbark@intel.com</email>
-            </author>
-        </authorgroup>
+<article id='intro'>
+    <articleinfo>
+        <title>Yocto Project Quick Start</title>
 
         <copyright>
             <year>&COPYRIGHT_YEAR;</year>
@@ -46,7 +23,14 @@
                 from the Yocto Project website.
             </note>
         </legalnotice>
-    </bookinfo>
+
+
+        <abstract>
+            <imagedata fileref="figures/yocto-project-transp.png"
+                        width="6in" depth="1in"
+                        align="right" scale="25" />
+        </abstract>
+    </articleinfo>
 
 <section id='welcome'>
     <title>Welcome!</title>
@@ -978,7 +962,7 @@
     </section>
 </section>
 
-</book>
+</article>
 <!--
 vim: expandtab tw=80 ts=4
 -->