49 files changed, 42 insertions, 34 deletions

diff --git a/Makefile.am b/Makefile.am
index ec64f0729..99c96b141 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ NULL =
 
 SUBDIRS = 						\
 	docs						\
-	html						\
 	policy						\
 	etc						\
 	man						\
diff --git a/configure.ac b/configure.ac
index fb7b69777..d877763dc 100755
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,7 @@ AC_INIT(PackageKit, 0.1.5)
 AC_CONFIG_SRCDIR(src)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
+GTK_DOC_CHECK([1.3])
 
 # libtool versioning - this applies to libpackagekit
 #
@@ -458,10 +459,11 @@ Makefile
 etc/Makefile
 man/Makefile
 docs/Makefile
+docs/html/Makefile
+docs/html/img/Makefile
+docs/spec/Makefile
 contrib/Makefile
 contrib/yum-packagekit/Makefile
-html/Makefile
-html/img/Makefile
 backends/Makefile
 backends/alpm/Makefile
 backends/apt/Makefile
diff --git a/docs/Makefile.am b/docs/Makefile.am
index a0ac37000..10a6120b8 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,33 +1,7 @@
-IMAGE_FILES =				\
-	pk-structure.png		\
-	pk-structure.svg
+NULL =
 
-SPEC_XML_FILES =			\
-	pk-reference.xml		\
-	pk-introduction.xml		\
-	pk-backends.xml
+SUBDIRS = 						\
+	html						\
+	spec						\
+	$(NULL)
 
-SPEC_HTML_FILES =			\
-	pk-reference.html
-
-clean-local:
-	rm -f *~
-	rm -f *.html
-
-EXTRA_DIST = 				\
-	config.xsl			\
-	docbook.css			\
-	$(SPEC_XML_FILES)		\
-	$(IMAGE_FILES)
-
-if DOCBOOK_DOCS_ENABLED
-
-htmldocdir = $(docdir)
-htmldoc_DATA = pk-reference.html
-
-pk-reference.html : pk-introduction.xml
-	$(XMLTO) html-nochunks -m config.xsl pk-reference.xml
-
-EXTRA_DIST += $(SPEC_HTML_FILES)
-
-endif #DOCBOOK_DOCS_ENABLED
diff --git a/html/.gitignore b/docs/html/.gitignore
index b05de43f3..b05de43f3 100644
--- a/html/.gitignore
+++ b/docs/html/.gitignore
diff --git a/html/Makefile.am b/docs/html/Makefile.am
index 47f7312fc..47f7312fc 100644
--- a/html/Makefile.am
+++ b/docs/html/Makefile.am
diff --git a/html/img/Makefile.am b/docs/html/img/Makefile.am
index 373e64800..373e64800 100644
--- a/html/img/Makefile.am
+++ b/docs/html/img/Makefile.am
diff --git a/html/img/dialog-information.png b/docs/html/img/dialog-information.png
index 18af8ec03..18af8ec03 100644
--- a/html/img/dialog-information.png
+++ b/docs/html/img/dialog-information.png
diff --git a/html/img/large-accessories-text-editor.png b/docs/html/img/large-accessories-text-editor.png
index 78d55f96f..78d55f96f 100644
--- a/html/img/large-accessories-text-editor.png
+++ b/docs/html/img/large-accessories-text-editor.png
diff --git a/html/img/large-dialog-information.png b/docs/html/img/large-dialog-information.png
index 0a5e28160..0a5e28160 100644
--- a/html/img/large-dialog-information.png
+++ b/docs/html/img/large-dialog-information.png
diff --git a/html/img/large-emblem-photos.png b/docs/html/img/large-emblem-photos.png
index 222a2b924..222a2b924 100644
--- a/html/img/large-emblem-photos.png
+++ b/docs/html/img/large-emblem-photos.png
diff --git a/html/img/large-help-browser.png b/docs/html/img/large-help-browser.png
index 11cbe5579..11cbe5579 100644
--- a/html/img/large-help-browser.png
+++ b/docs/html/img/large-help-browser.png
diff --git a/html/img/large-preferences-system.png b/docs/html/img/large-preferences-system.png
index 9d667300f..9d667300f 100644
--- a/html/img/large-preferences-system.png
+++ b/docs/html/img/large-preferences-system.png
diff --git a/html/img/large-system-users.png b/docs/html/img/large-system-users.png
index a44367c14..a44367c14 100644
--- a/html/img/large-system-users.png
+++ b/docs/html/img/large-system-users.png
diff --git a/html/img/packagekit.png b/docs/html/img/packagekit.png
index c22a27df0..c22a27df0 100644
--- a/html/img/packagekit.png
+++ b/docs/html/img/packagekit.png
diff --git a/html/img/pk-application-groups.png b/docs/html/img/pk-application-groups.png
index 98fa80245..98fa80245 100644
--- a/html/img/pk-application-groups.png
+++ b/docs/html/img/pk-application-groups.png
diff --git a/html/img/pk-application-search.png b/docs/html/img/pk-application-search.png
index 9f0b151b1..9f0b151b1 100644
--- a/html/img/pk-application-search.png
+++ b/docs/html/img/pk-application-search.png
diff --git a/html/img/pk-auto-update.png b/docs/html/img/pk-auto-update.png
index 25ff3748a..25ff3748a 100644
--- a/html/img/pk-auto-update.png
+++ b/docs/html/img/pk-auto-update.png
diff --git a/html/img/pk-backend-status.png b/docs/html/img/pk-backend-status.png
index 5ccbcb3f1..5ccbcb3f1 100644
--- a/html/img/pk-backend-status.png
+++ b/docs/html/img/pk-backend-status.png
diff --git a/html/img/pk-battery.png b/docs/html/img/pk-battery.png
index b6d583714..b6d583714 100644
--- a/html/img/pk-battery.png
+++ b/docs/html/img/pk-battery.png
diff --git a/html/img/pk-inhibit.png b/docs/html/img/pk-inhibit.png
index 35dc71409..35dc71409 100644
--- a/html/img/pk-inhibit.png
+++ b/docs/html/img/pk-inhibit.png
diff --git a/html/img/pk-network.png b/docs/html/img/pk-network.png
index 94c6fad90..94c6fad90 100644
--- a/html/img/pk-network.png
+++ b/docs/html/img/pk-network.png
diff --git a/html/img/pk-prefs.png b/docs/html/img/pk-prefs.png
index 1526a299c..1526a299c 100644
--- a/html/img/pk-prefs.png
+++ b/docs/html/img/pk-prefs.png
diff --git a/html/img/pk-progress.png b/docs/html/img/pk-progress.png
index 440214c55..440214c55 100644
--- a/html/img/pk-progress.png
+++ b/docs/html/img/pk-progress.png
diff --git a/html/img/pk-remove-confirm.png b/docs/html/img/pk-remove-confirm.png
index b7cbb8c89..b7cbb8c89 100644
--- a/html/img/pk-remove-confirm.png
+++ b/docs/html/img/pk-remove-confirm.png
diff --git a/html/img/pk-repo-auth.png b/docs/html/img/pk-repo-auth.png
index 621c6d4dd..621c6d4dd 100644
--- a/html/img/pk-repo-auth.png
+++ b/docs/html/img/pk-repo-auth.png
diff --git a/html/img/pk-repo.png b/docs/html/img/pk-repo.png
index a64a00b5c..a64a00b5c 100644
--- a/html/img/pk-repo.png
+++ b/docs/html/img/pk-repo.png
diff --git a/html/img/pk-require-restart.png b/docs/html/img/pk-require-restart.png
index 61d0ec3c1..61d0ec3c1 100644
--- a/html/img/pk-require-restart.png
+++ b/docs/html/img/pk-require-restart.png
diff --git a/html/img/pk-transactions.png b/docs/html/img/pk-transactions.png
index d2c2214b5..d2c2214b5 100644
--- a/html/img/pk-transactions.png
+++ b/docs/html/img/pk-transactions.png
diff --git a/html/img/pk-updates-warning.png b/docs/html/img/pk-updates-warning.png
index e1ad35da4..e1ad35da4 100644
--- a/html/img/pk-updates-warning.png
+++ b/docs/html/img/pk-updates-warning.png
diff --git a/html/img/pk-updates.png b/docs/html/img/pk-updates.png
index 3ff814bfb..3ff814bfb 100644
--- a/html/img/pk-updates.png
+++ b/docs/html/img/pk-updates.png
diff --git a/html/img/pk-waiting.png b/docs/html/img/pk-waiting.png
index 1b93fcadb..1b93fcadb 100644
--- a/html/img/pk-waiting.png
+++ b/docs/html/img/pk-waiting.png
diff --git a/html/index.html b/docs/html/index.html
index 6da360866..6da360866 100644
--- a/html/index.html
+++ b/docs/html/index.html
diff --git a/html/pk-download.html b/docs/html/pk-download.html
index 18260ce39..18260ce39 100644
--- a/html/pk-download.html
+++ b/docs/html/pk-download.html
diff --git a/html/pk-faq.html b/docs/html/pk-faq.html
index 0a5146ec8..0a5146ec8 100644
--- a/html/pk-faq.html
+++ b/docs/html/pk-faq.html
diff --git a/html/pk-help.html b/docs/html/pk-help.html
index 943a8c8c8..943a8c8c8 100644
--- a/html/pk-help.html
+++ b/docs/html/pk-help.html
diff --git a/html/pk-intro.html b/docs/html/pk-intro.html
index 537b88ec2..537b88ec2 100644
--- a/html/pk-intro.html
+++ b/docs/html/pk-intro.html
diff --git a/html/pk-screenshots.html b/docs/html/pk-screenshots.html
index deebcbea3..deebcbea3 100644
--- a/html/pk-screenshots.html
+++ b/docs/html/pk-screenshots.html
diff --git a/html/pk-using.html b/docs/html/pk-using.html
index d310fba27..d310fba27 100644
--- a/html/pk-using.html
+++ b/docs/html/pk-using.html
diff --git a/html/style.css b/docs/html/style.css
index d2298183b..d2298183b 100644
--- a/html/style.css
+++ b/docs/html/style.css
diff --git a/html/upload.sh b/docs/html/upload.sh
index 33efe2352..33efe2352 100755
--- a/html/upload.sh
+++ b/docs/html/upload.sh
diff --git a/docs/spec/Makefile.am b/docs/spec/Makefile.am
new file mode 100644
index 000000000..a0ac37000
--- /dev/null
+++ b/docs/spec/Makefile.am
@@ -0,0 +1,33 @@
+IMAGE_FILES =				\
+	pk-structure.png		\
+	pk-structure.svg
+
+SPEC_XML_FILES =			\
+	pk-reference.xml		\
+	pk-introduction.xml		\
+	pk-backends.xml
+
+SPEC_HTML_FILES =			\
+	pk-reference.html
+
+clean-local:
+	rm -f *~
+	rm -f *.html
+
+EXTRA_DIST = 				\
+	config.xsl			\
+	docbook.css			\
+	$(SPEC_XML_FILES)		\
+	$(IMAGE_FILES)
+
+if DOCBOOK_DOCS_ENABLED
+
+htmldocdir = $(docdir)
+htmldoc_DATA = pk-reference.html
+
+pk-reference.html : pk-introduction.xml
+	$(XMLTO) html-nochunks -m config.xsl pk-reference.xml
+
+EXTRA_DIST += $(SPEC_HTML_FILES)
+
+endif #DOCBOOK_DOCS_ENABLED
diff --git a/docs/config.xsl b/docs/spec/config.xsl
index 1cb097e5b..1cb097e5b 100644
--- a/docs/config.xsl
+++ b/docs/spec/config.xsl
diff --git a/docs/docbook.css b/docs/spec/docbook.css
index a29a79f15..a29a79f15 100644
--- a/docs/docbook.css
+++ b/docs/spec/docbook.css
diff --git a/docs/pk-backends.xml b/docs/spec/pk-backends.xml
index deaf25b8c..deaf25b8c 100644
--- a/docs/pk-backends.xml
+++ b/docs/spec/pk-backends.xml
diff --git a/docs/pk-introduction.xml b/docs/spec/pk-introduction.xml
index b02c072d7..b02c072d7 100644
--- a/docs/pk-introduction.xml
+++ b/docs/spec/pk-introduction.xml
diff --git a/docs/pk-reference.xml b/docs/spec/pk-reference.xml
index bb5fddd4c..bb5fddd4c 100644
--- a/docs/pk-reference.xml
+++ b/docs/spec/pk-reference.xml
diff --git a/docs/pk-structure.png b/docs/spec/pk-structure.png
index abda7e3d2..abda7e3d2 100644
--- a/docs/pk-structure.png
+++ b/docs/spec/pk-structure.png
diff --git a/docs/pk-structure.svg b/docs/spec/pk-structure.svg
index 2177e63c5..2177e63c5 100644
--- a/docs/pk-structure.svg
+++ b/docs/spec/pk-structure.svg
diff --git a/docs/wscript_build b/docs/spec/wscript_build
index 73fcc3c17..73fcc3c17 100644
--- a/docs/wscript_build
+++ b/docs/spec/wscript_build