46 files changed, 5 insertions, 43 deletions
diff --git a/handbook/Makefile b/documentation/poky-ref-manual/Makefile
index 4b3035e796..b023045d0e 100644
--- a/handbook/Makefile
+++ b/documentation/poky-ref-manual/Makefile
@@ -1,8 +1,8 @@
 all: html pdf tarball
 
 pdf:
-	./tools/poky-docbook-to-pdf poky-handbook.xml ./template
-	./tools/poky-docbook-to-pdf bsp-guide.xml ./template
+	cd ..; ./tools/poky-docbook-to-pdf ./poky-ref-manual/poky-handbook.xml ./template
+	cd..; ./tools/poky-docbook-to-pdf ./poky-ref-manual/bsp-guide.xml ./template
 
 XSLTOPTS = --stringparam html.stylesheet style.css \
            --stringparam  chapter.autolabel 1 \
diff --git a/handbook/TODO b/documentation/poky-ref-manual/TODO
index ee0db977cc..ee0db977cc 100644
--- a/handbook/TODO
+++ b/documentation/poky-ref-manual/TODO
diff --git a/handbook/bsp-guide.xml b/documentation/poky-ref-manual/bsp-guide.xml
index 2f4906c173..2f4906c173 100644
--- a/handbook/bsp-guide.xml
+++ b/documentation/poky-ref-manual/bsp-guide.xml
diff --git a/handbook/bsp.xml b/documentation/poky-ref-manual/bsp.xml
index e0ca31732b..e0ca31732b 100644
--- a/handbook/bsp.xml
+++ b/documentation/poky-ref-manual/bsp.xml
diff --git a/handbook/development.xml b/documentation/poky-ref-manual/development.xml
index a383a2f4a8..a383a2f4a8 100644
--- a/handbook/development.xml
+++ b/documentation/poky-ref-manual/development.xml
diff --git a/handbook/examples/hello-autotools/hello_2.3.bb b/documentation/poky-ref-manual/examples/hello-autotools/hello_2.3.bb
index 5c5332f731..5c5332f731 100644
--- a/handbook/examples/hello-autotools/hello_2.3.bb
+++ b/documentation/poky-ref-manual/examples/hello-autotools/hello_2.3.bb
diff --git a/handbook/examples/hello-single/files/helloworld.c b/documentation/poky-ref-manual/examples/hello-single/files/helloworld.c
index fc7169b7b8..fc7169b7b8 100644
--- a/handbook/examples/hello-single/files/helloworld.c
+++ b/documentation/poky-ref-manual/examples/hello-single/files/helloworld.c
diff --git a/handbook/examples/hello-single/hello.bb b/documentation/poky-ref-manual/examples/hello-single/hello.bb
index d815b1ed73..d815b1ed73 100644
--- a/handbook/examples/hello-single/hello.bb
+++ b/documentation/poky-ref-manual/examples/hello-single/hello.bb
diff --git a/handbook/examples/libxpm/libxpm_3.5.6.bb b/documentation/poky-ref-manual/examples/libxpm/libxpm_3.5.6.bb
index 2710189b2a..2710189b2a 100644
--- a/handbook/examples/libxpm/libxpm_3.5.6.bb
+++ b/documentation/poky-ref-manual/examples/libxpm/libxpm_3.5.6.bb
diff --git a/handbook/examples/mtd-makefile/mtd-utils_1.0.0.bb b/documentation/poky-ref-manual/examples/mtd-makefile/mtd-utils_1.0.0.bb
index b21dc653af..b21dc653af 100644
--- a/handbook/examples/mtd-makefile/mtd-utils_1.0.0.bb
+++ b/documentation/poky-ref-manual/examples/mtd-makefile/mtd-utils_1.0.0.bb
diff --git a/handbook/extendpoky.xml b/documentation/poky-ref-manual/extendpoky.xml
index 662096844d..662096844d 100644
--- a/handbook/extendpoky.xml
+++ b/documentation/poky-ref-manual/extendpoky.xml
diff --git a/handbook/faq.xml b/documentation/poky-ref-manual/faq.xml
index b209fff81d..b209fff81d 100644
--- a/handbook/faq.xml
+++ b/documentation/poky-ref-manual/faq.xml
diff --git a/handbook/introduction.xml b/documentation/poky-ref-manual/introduction.xml
index 0b407a142a..0b407a142a 100644
--- a/handbook/introduction.xml
+++ b/documentation/poky-ref-manual/introduction.xml
diff --git a/handbook/poky-beaver.png b/documentation/poky-ref-manual/poky-beaver.png
index 9f9e6cf996..9f9e6cf996 100644
--- a/handbook/poky-beaver.png
+++ b/documentation/poky-ref-manual/poky-beaver.png
diff --git a/handbook/poky-handbook.png b/documentation/poky-ref-manual/poky-handbook.png
index 333442e0d6..333442e0d6 100644
--- a/handbook/poky-handbook.png
+++ b/documentation/poky-ref-manual/poky-handbook.png
diff --git a/handbook/poky-handbook.xml b/documentation/poky-ref-manual/poky-handbook.xml
index fb2bc80df3..fb2bc80df3 100644
--- a/handbook/poky-handbook.xml
+++ b/documentation/poky-ref-manual/poky-handbook.xml
diff --git a/handbook/poky-logo.svg b/documentation/poky-ref-manual/poky-logo.svg
index d0be402870..d0be402870 100644
--- a/handbook/poky-logo.svg
+++ b/documentation/poky-ref-manual/poky-logo.svg
diff --git a/handbook/ref-bitbake.xml b/documentation/poky-ref-manual/ref-bitbake.xml
index eaf9467950..eaf9467950 100644
--- a/handbook/ref-bitbake.xml
+++ b/documentation/poky-ref-manual/ref-bitbake.xml
diff --git a/handbook/ref-classes.xml b/documentation/poky-ref-manual/ref-classes.xml
index 036044dd28..036044dd28 100644
--- a/handbook/ref-classes.xml
+++ b/documentation/poky-ref-manual/ref-classes.xml
diff --git a/handbook/ref-features.xml b/documentation/poky-ref-manual/ref-features.xml
index cde9588116..cde9588116 100644
--- a/handbook/ref-features.xml
+++ b/documentation/poky-ref-manual/ref-features.xml
diff --git a/handbook/ref-images.xml b/documentation/poky-ref-manual/ref-images.xml
index 03583eb394..03583eb394 100644
--- a/handbook/ref-images.xml
+++ b/documentation/poky-ref-manual/ref-images.xml
diff --git a/handbook/ref-structure.xml b/documentation/poky-ref-manual/ref-structure.xml
index ca589de428..ca589de428 100644
--- a/handbook/ref-structure.xml
+++ b/documentation/poky-ref-manual/ref-structure.xml
diff --git a/handbook/ref-variables.xml b/documentation/poky-ref-manual/ref-variables.xml
index 7e10808525..7e10808525 100644
--- a/handbook/ref-variables.xml
+++ b/documentation/poky-ref-manual/ref-variables.xml
diff --git a/handbook/ref-varlocality.xml b/documentation/poky-ref-manual/ref-varlocality.xml
index 87ef0833d7..87ef0833d7 100644
--- a/handbook/ref-varlocality.xml
+++ b/documentation/poky-ref-manual/ref-varlocality.xml
diff --git a/handbook/resources.xml b/documentation/poky-ref-manual/resources.xml
index 7561669fba..7561669fba 100644
--- a/handbook/resources.xml
+++ b/documentation/poky-ref-manual/resources.xml
diff --git a/handbook/screenshots/ss-anjuta-poky-1.png b/documentation/poky-ref-manual/screenshots/ss-anjuta-poky-1.png
index 4e92012af5..4e92012af5 100644
--- a/handbook/screenshots/ss-anjuta-poky-1.png
+++ b/documentation/poky-ref-manual/screenshots/ss-anjuta-poky-1.png
diff --git a/handbook/screenshots/ss-anjuta-poky-2.png b/documentation/poky-ref-manual/screenshots/ss-anjuta-poky-2.png
index 2c9bfb3bbd..2c9bfb3bbd 100644
--- a/handbook/screenshots/ss-anjuta-poky-2.png
+++ b/documentation/poky-ref-manual/screenshots/ss-anjuta-poky-2.png
diff --git a/handbook/screenshots/ss-oprofile-viewer.png b/documentation/poky-ref-manual/screenshots/ss-oprofile-viewer.png
index fa7d1dfa4f..fa7d1dfa4f 100644
--- a/handbook/screenshots/ss-oprofile-viewer.png
+++ b/documentation/poky-ref-manual/screenshots/ss-oprofile-viewer.png
diff --git a/handbook/screenshots/ss-sato.png b/documentation/poky-ref-manual/screenshots/ss-sato.png
index 5a05709245..5a05709245 100644
--- a/handbook/screenshots/ss-sato.png
+++ b/documentation/poky-ref-manual/screenshots/ss-sato.png
diff --git a/handbook/style.css b/documentation/poky-ref-manual/style.css
index c4d9df197c..c4d9df197c 100644
--- a/handbook/style.css
+++ b/documentation/poky-ref-manual/style.css
diff --git a/handbook/usingpoky.xml b/documentation/poky-ref-manual/usingpoky.xml
index ad6bda2545..ad6bda2545 100644
--- a/handbook/usingpoky.xml
+++ b/documentation/poky-ref-manual/usingpoky.xml
diff --git a/handbook/template/Vera.ttf b/documentation/template/Vera.ttf
index 58cd6b5e61..58cd6b5e61 100644
--- a/handbook/template/Vera.ttf
+++ b/documentation/template/Vera.ttf
diff --git a/handbook/template/Vera.xml b/documentation/template/Vera.xml
index 3c82043e35..3c82043e35 100644
--- a/handbook/template/Vera.xml
+++ b/documentation/template/Vera.xml
diff --git a/handbook/template/VeraMoBd.ttf b/documentation/template/VeraMoBd.ttf
index 9be6547ed6..9be6547ed6 100644
--- a/handbook/template/VeraMoBd.ttf
+++ b/documentation/template/VeraMoBd.ttf
diff --git a/handbook/template/VeraMoBd.xml b/documentation/template/VeraMoBd.xml
index 9b33107a44..9b33107a44 100644
--- a/handbook/template/VeraMoBd.xml
+++ b/documentation/template/VeraMoBd.xml
diff --git a/handbook/template/VeraMono.ttf b/documentation/template/VeraMono.ttf
index 139f0b4311..139f0b4311 100644
--- a/handbook/template/VeraMono.ttf
+++ b/documentation/template/VeraMono.ttf
diff --git a/handbook/template/VeraMono.xml b/documentation/template/VeraMono.xml
index 3a0a86659c..3a0a86659c 100644
--- a/handbook/template/VeraMono.xml
+++ b/documentation/template/VeraMono.xml
diff --git a/handbook/template/draft.png b/documentation/template/draft.png
index 53051a9ddd..53051a9ddd 100644
--- a/handbook/template/draft.png
+++ b/documentation/template/draft.png
diff --git a/handbook/template/fop-config.xml b/documentation/template/fop-config.xml
index 7d56223d17..7d56223d17 100644
--- a/handbook/template/fop-config.xml
+++ b/documentation/template/fop-config.xml
diff --git a/handbook/template/ohand-color.svg b/documentation/template/ohand-color.svg
index e42ff9c6fc..e42ff9c6fc 100644
--- a/handbook/template/ohand-color.svg
+++ b/documentation/template/ohand-color.svg
diff --git a/handbook/template/poky-db-pdf.xsl b/documentation/template/poky-db-pdf.xsl
index 3dd065a57e..3dd065a57e 100644
--- a/handbook/template/poky-db-pdf.xsl
+++ b/documentation/template/poky-db-pdf.xsl
diff --git a/handbook/template/poky-handbook.png b/documentation/template/poky-handbook.png
index 2085edb467..2085edb467 100644
--- a/handbook/template/poky-handbook.png
+++ b/documentation/template/poky-handbook.png
diff --git a/handbook/template/poky.svg b/documentation/template/poky.svg
index a4ea5e2f45..a4ea5e2f45 100644
--- a/handbook/template/poky.svg
+++ b/documentation/template/poky.svg
diff --git a/handbook/template/titlepage.templates.xml b/documentation/template/titlepage.templates.xml
index ff640fa5f2..ff640fa5f2 100644
--- a/handbook/template/titlepage.templates.xml
+++ b/documentation/template/titlepage.templates.xml
diff --git a/handbook/tools/poky-docbook-to-pdf b/documentation/tools/poky-docbook-to-pdf
index 8e3d7542f7..aa221c02bc 100755
--- a/handbook/tools/poky-docbook-to-pdf
+++ b/documentation/tools/poky-docbook-to-pdf
@@ -9,9 +9,8 @@ if [ -z "$1" -o -z "$2" ]; then
    exit 0
 fi
 
-BASENAME=`basename $1 .xml` || exit 1
-FO="$BASENAME.fo" 
-PDF="$BASENAME.pdf"
+FO=`echo $1 | sed s/.xml/.fo/` || exit 1
+PDF=`echo $1 | sed s/.xml/.pdf/` || exit 1
 TEMPLATEDIR=$2
 
 ##
@@ -35,6 +34,7 @@ xsltproc --xinclude                    \
          $TEMPLATEDIR/poky-db-pdf.xsl    \
 	 $1                 || exit 1
 
+echo fop -c $TEMPLATEDIR/fop-config.xml -fo $FO -pdf $PDF       || exit 1
 fop -c $TEMPLATEDIR/fop-config.xml -fo $FO -pdf $PDF       || exit 1
 
 rm -f $FO
diff --git a/handbook/ChangeLog b/handbook/ChangeLog
deleted file mode 100644
index e0b51d4a12..0000000000
--- a/handbook/ChangeLog
+++ /dev/null
@@ -1,38 +0,0 @@
-2008-02-29  Matthew Allum  <mallum@openedhand.com>
-
-	* development.xml:
-        Disable images too big / lack context for now.
-	* introduction.xml:
-        Remove some OH specific stuff.
-	* style.css:
-        Remove limit on image size
-
-2008-02-15  Matthew Allum  <mallum@openedhand.com>
-
-	* introduction.xml:
-        Minor tweaks to 'What is Poky'
-
-2008-02-15  Matthew Allum  <mallum@openedhand.com>
-
-	* poky-handbook.xml:
-        * poky-handbook.png
-        * poky-beaver.png
-	* poky-logo.svg:
-	* style.css:
-        Add some title images.
-
-2008-02-14  Matthew Allum  <mallum@openedhand.com>
-
-	* development.xml:
-        remove uri's
-	* style.css:
-        Fix glossary
-
-2008-02-06  Matthew Allum  <mallum@openedhand.com>
-
-	* Makefile:
-        Add various xslto options for html.
-	* introduction.xml:
-        Remove link in title.
-	* style.css:
-        Add initial version