Merge lp:~jpickett/ubuntu/oneiric/ubuntu-docs/fix-for-804855-bitesize into lp:ubuntu/oneiric/ubuntu-docs

[Joel Pickett]

fixed a small typo, recognizes --> recognize, to make the sentence make sense. updated changelog accordingly

[Didier Roche-Tolomelli (didrocks)]

Thanks for your patch there

seems you have a lot of conflicts between your branch and the ubuntu one (see the merge request diff below). Can you please try again to propose another merge request there with a fixed branch?
Ensure you parent branch is lp:ubuntu/ubuntu-docs which is maybe the issue there :)

If you need any help, do not hesitate to hop in #ubuntu-motu on freenode IRC channel to get people helping you using that tool.

I'll set the branch as work in progress right now and "need fixing". Do not hesitate to repropose your merge once you fixed your branch.

review: Needs Fixing

[Jeremy Bícha (jbicha)]

There were two merge proposals. I merged in the other one so this one isn't needed.

review: Disapprove

Unmerged revisions

9. By Joel Pickett on 2011-07-07

* fixing bitesize bug, LP: #804855
 * change changelog entry from natty to oneiric

8. By Matthew East on 2011-05-20

Update from gnome-user-docs/natty branch

7. By Connor Imes on 2011-05-11

Add script to insert HTML5 doctype header during html build, along with other validation fixes. Fixes LP: #478097.

6. By Connor Imes on 2011-05-08

Use variables in Makefile. Still need to add infrastructure to support other languages during html build.

5. By Connor Imes on 2011-05-08

Add check for broken ghelp links in fix-urls.sh

4. By Connor Imes on 2011-05-08

Update fix-urls.sh script to look in build/ rather than ../build/

3. By Matthew East on 2011-05-07

Update .bzrignore with gnome-doc-utils automatically generated build files

2. By Matthew East on 2011-05-07

Update ubuntu-help with new material and updates in gnome-user-docs/natty branch, update pot file

1. By Matthew East on 2011-05-03

Add files from gnome-user-docs source in Natty, adjust build system for building ubuntu-help document id

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-07-07 14:26:08 +0000
@@ -0,0 +1,19 @@
+unity-stubs/unity-stub.page.tmpl
+ubuntu-help/C/.page.tmpl
+ubuntu-help/C/unity-stub.page.tmpl
+.page.tmpl
+build/
+INSTALL
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+config.log
+config.status
+configure
+gnome-doc-utils.make
+install-sh
+missing
+ubuntu-help/Makefile
+ubuntu-help/Makefile.in
+

=== added file 'AUTHORS'
--- AUTHORS	1970-01-01 00:00:00 +0000
+++ AUTHORS	2011-07-07 14:26:08 +0000
@@ -0,0 +1,4 @@
+Ubuntu Documentation Team
+<[e-mail]>
+
+

=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2011-07-07 14:26:08 +0000
@@ -0,0 +1,4 @@
+This work is licenced under the Creative Commons Attribution 3.0
+United States License. To view a copy of this licence, visit
+http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative
+Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA.

=== added file 'ChangeLog'
--- ChangeLog	1970-01-01 00:00:00 +0000
+++ ChangeLog	2011-07-07 14:26:08 +0000
@@ -0,0 +1,1 @@
+Placeholder

=== added file 'MAINTAINERS'
--- MAINTAINERS	1970-01-01 00:00:00 +0000
+++ MAINTAINERS	2011-07-07 14:26:08 +0000
@@ -0,0 +1,9 @@
+PLEASE USE THE MAILING LIST:
[e-mail]
+http://mail.gnome.org/archives/gnome-doc-list/
+
+Primary Maintainer:
+
+Shaun McCance
+E-mail: [e-mail]
+Userid: shaunm

=== added file 'Makefile.am'
--- Makefile.am	1970-01-01 00:00:00 +0000
+++ Makefile.am	2011-07-07 14:26:08 +0000
@@ -0,0 +1,7 @@
+SUBDIRS = ubuntu-help
+
+EXTRA_DIST = gnome-doc-utils.make
+
+DISTCLEANFILES = gnome-doc-utils.make
+
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper

=== added file 'NEWS'
--- NEWS	1970-01-01 00:00:00 +0000
+++ NEWS	2011-07-07 14:26:08 +0000
@@ -0,0 +1,1 @@
+See debian/changelog

=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2011-07-07 14:26:08 +0000
@@ -0,0 +1,20 @@
+gnome-user-docs
+===============
+
+This package contains documents which will be packaged together and
+shipped as gnome-user-docs in the core GNOME distribution.  They should 
+be documents targetted for end-users of GNOME and have general GNOME
+applicability.
+
+The GNOME Documentation Project (GDP) is responsible for this documentation.
+
+GDP homepage: http://live.gnome.org/DocumentationProject
+GDP mailing list: http://mail.gnome.org/mailman/listinfo/gnome-doc-list
+
+
+Reporting Problems
+------------------
+
+If you find problems in the documentation, please report bugs in bugzilla.
+
+Bugzilla : http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-docs

=== added file 'TODO'
--- TODO	1970-01-01 00:00:00 +0000
+++ TODO	2011-07-07 14:26:08 +0000
@@ -0,0 +1,3 @@
+* Include serverguide here or separate branch?
+* usb-creator and jockey documents to move into respective packages?
+* Undo browser-homepage installation - any special requirements?

=== added file 'autogen.sh'
--- autogen.sh	1970-01-01 00:00:00 +0000
+++ autogen.sh	2011-07-07 14:26:08 +0000
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="ubuntu-docs"
+
+(test -f $srcdir/configure.in \
+  && test -d $srcdir/ubuntu-help) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from the GNOME CVS"
+    exit 1
+}
+
+REQUIRED_AUTOMAKE_VERSION=1.6
+export REQUIRED_AUTOMAKE_VERSION
+
+USE_GNOME2_MACROS=1 . gnome-autogen.sh

=== added file 'configure.in'
--- configure.in	1970-01-01 00:00:00 +0000
+++ configure.in	2011-07-07 14:26:08 +0000
@@ -0,0 +1,14 @@
+AC_INIT([ubuntu-docs], [11.10],
+        [https://bugs.launchpad.net/ubuntu/+source/ubuntu-docs])
+AM_INIT_AUTOMAKE
+
+GNOME_DOC_INIT
+
+AM_MAINTAINER_MODE
+
+PKG_CHECK_MODULES(GNOME2_USER_DOCS, [ gnome-doc-utils >= 0.5.6 ])
+
+AC_OUTPUT([
+Makefile
+ubuntu-help/Makefile
+])

=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2011-07-07 14:26:08 +0000
@@ -0,0 +1,1501 @@
+ubuntu-docs (11.10.1ubuntu1) oneiric; urgency=low
+
+  * fixing bitesize bug, LP: #804855
+   * change changelog entry from natty to oneiric
+
+ -- Joel Pickett <[e-mail]>  Thu, 07 Jul 2011 23:54:36 +1000
+
+ubuntu-docs (11.10.1) UNRELEASED oneiric; urgency=low
+
+  * Use Gnome and gnome-doc-utils for packaging - update debian/control 
+    for new build-deps accordingly
+  * Add Unity+Unity documentation here rather than gnome-user-docs; give it
+    its own document id and install in ubuntu-help directory
+  * Remove browser homepage update-alternative system
+
+ -- Matthew East <[e-mail]>  Fri, 29 Apr 2011 14:49:35 +0100
+
+ubuntu-docs (11.04.2) natty; urgency=low
+
+  * Updates for natty from Giuseppe Terrasi
+    - Use Libreoffice instead of Openoffice.org
+    - Use Banshee instead of Rhythmbox
+
+ -- Matthew East <[e-mail]>  Fri, 22 Apr 2011 07:08:34 +0000
+
+ubuntu-docs (11.04.1) natty; urgency=low
+
+  * Convert ubuntu-docs package for use as help for "Ubuntu Classic" desktop
+    (Unity documentation provided by the gnome-user-guide package)
+
+ -- Matthew East <[e-mail]>  Tue, 12 Apr 2011 20:58:59 +0000
+
+ubuntu-docs (10.10.4) maverick-proposed; urgency=low
+
+  * ldif at openldap installation is broken (LP: #677998)
+    + serverguide/C/network-auth.xml 
+
+ -- Mahyuddin Susanto <[e-mail]>  Mon, 06 Dec 2010 22:59:57 +0700
+
+ubuntu-docs (10.10.3) maverick; urgency=low
+
+  * Amend font-family for browser startpage (LP: #195590)
+  * Add translations from Launchpad
+
+ -- Matthew East <[e-mail]>  Sun, 19 Sep 2010 11:35:42 +0100
+
+ubuntu-docs (10.10.2) maverick; urgency=low
+
+  * Documentation String Freeze release
+  * General
+    - No longer generate ubuntu-serverguide binary
+    - Stop shipping serverguide, advanced-topics, 
+      basic-commands and windows in ubuntu-docs
+    - Changes discussed on ubuntu-doc@ and ubuntu-server@
+  * Update version number for offline browser startpage
+    LP: #632377
+  * Newtoubuntu:
+    - Replace f-spot with shotwell
+    - Fix some broken icons
+
+ -- Matthew East <[e-mail]>  Sun, 29 Aug 2010 14:47:58 +0100
+
+ubuntu-docs (10.10.1) maverick; urgency=low
+
+  * First release for maverick
+  * General:
+    - Update copyright year, LP: #580396
+    - Update version numbers for maverick, LP: #587119
+    - Update pot files
+  * Administrative:
+    - Users and Groups app UI changed - adjusted directions, 
+      LP: #570429 (Connor Imes)
+  * Basic-commands:
+    - Removed incorrect comment about using ~ with sudo, 
+      LP: #570423 (Connor Imes)
+  * Internet:
+    - Add section on Ubuntu One, authored by Matt Griffin with
+      some changes/review
+    - Typos: Cicso -> Cisco. Alex Wardle, LP: #561084
+  * Musicvideophotos:
+    - Add material on using Ubuntu One Music Store and 
+      other Music Stores
+      within Rhythmbox, content submitted by Matt Griffin
+    - Update microphone troubleshooting, LP: #591164
+  * Serverguide:
+    - Removed erroneous text from vmbuilder command,
+      LP: #559190
+    - Typo in network-config section. Alex Wardle, LP: #550892
+    - Fix typo in Kerberos section. David C. Curtis, LP: #561788
+    - Replaced dkim-filter with opendkim, feedback from 
+      Scott Kitterman. LP: #561825
+    - Changed ldapsearch command in ACL section for new authentication
+      mechanism. LP: #333733
+    - Adjusted certificate wording to be more concise about which 
+      lines to copy. LP: #575859
+    - Changed samba restart command to use new upstart scripts. 
+      LP: #575540
+    - New information about granting groups Admin rights for Samba.
+      LP: #579851
+    - Various typos and English fixes from Travis Nichol, Connor Imes,
+      Vikram Dhillon, Dean Sas, Andrew Rowell. LP: #594913,
+      LP: #572959, LP: #603947
+    - New Amavisd-new and Spamassassin section which adds note about possible
+      large amount of error messages sent to email. LP: #165184 (Adam Sommer)
+    - Removed OpenNebula section (Adam Sommer)
+    - Removed eBox section (Adam Sommer)
+    - Reviewed and updated User Management and Console Security sections
+      (Adam Sommer)
+    - Fixed spelling typo of dyngroup.schema, fixed ldapscripts <ask> example 
+      explanation, and ldapscripts example template path. LP: #595001 
+      (Adam Sommer)
+    - Updates to UEC sections (Adam Sommer)
+    - New "First Boot" section covering clout-init functionality (Adam Sommer)
+    - Fix broken links to installation-guide, add distro-rev-short
+      entity, LP: #575961
+  * Windows:
+    - Change wording of windows/C/preparing.xml, LP: #483153
+
+ -- Matthew East <[e-mail]>  Sat, 14 Aug 2010 22:35:52 +0100
+
+ubuntu-docs (10.04.3) lucid; urgency=low
+
+  * Import translations from Rosetta
+  * Replace old Ubuntu logo with new one from wiki:Brand (LP: #551058)
+
+ -- Matthew East <[e-mail]>  Sun, 18 Apr 2010 21:06:41 +0100
+
+ubuntu-docs (10.04.2) lucid; urgency=low
+
+  * General:
+    - Fixes to scripts/fix-url.sh (including LP: #482862)
+    - Fix character encoding in contributors.xml (LP: #448618)
+    - Updated version in browser-startpage html files, LP: #526320
+    - Refresh pot files
+  * Add-applications:
+    - Updates for UI changes, Phil Bull
+  * Config-desktop:
+    - Added topic on changing window buttons from the left, Phil Bull
+  * Hardware:
+    - Added mention of gsynaptics, Connor Imes, LP: #450567
+  * Internet:
+    - Refresh list of plugins supplied by ubuntu-restricted-extras, branch 
+      from Nathan Murray, LP: #504981
+    - Updates to reflect that Ekiga no longer installed by default, Connor Imes,
+      LP: #508572
+    - Grammar fix from Alex Wardle, LP: #517776
+    - Order adjustment for shares-admin usage, Alex Wardle, LP: #518119
+    - Button name change for shares-admin app, Alex Wardle, LP: #518170
+    - Use unlock icon in networking section, Alex Wardle, LP: #518117
+    - Updated directions on changing text size and page zooming in firefox,
+      Alison Rowland, LP: #512556
+    - Fixed guilabel usage in modem section. Alex Wardle, LP: #521243
+    - Updated button and tab names in Static Connections section,
+      Alex Wardle, LP: #521508
+    - Typo fix in adsl section. Alex Wardle, LP: #525349
+    - Removed unused and empty basics.xml, LP: #525431
+    - Minor wording update to directions for sharing folders via nautilus,
+      Connor Imes, LP: #518175
+    - Use 'NetworkManager' not 'Network Manager' for consistency, Connor Imes
+      LP: #518107
+    - Update to troubleshooting mobile devices, Connor Imes, LP: #453459
+    - Adjusted description of NetworkManager applet icons, Connor Imes
+      LP: #440826
+    - Additions to VPN section of connecting guide, Alex Wardle, LP: #452647
+    - Expanded on using config files for vpn connections, Connor Imes
+    - Command line substitution for Services utility which is not in Karmic or
+      Lucid, Connor Imes, LP: #518460
+    - Structural and language changes + updates for UI changes, Phil Bull
+  * Musicvideophotos:
+    - Added section for recording and editing video, Book 'em Dano, LP: #367569
+  * Newtoubuntu:
+    - Complete rewrite, Matthew East
+  * Printing:
+    - Simple Scan replaced xsane for scanning documents, Alex Wardle, LP: #546193
+  * Serverguide:
+    - Rename link to serverguide in advanced-topics.xml, Gilbert 
+      Mendoza, LP: #505708
+    - Use distro-short-codename variable for vmbuilder documentation in 
+      serverguide rather than static version example, Connor Imes,. LP: #509653
+    - Small fixes to security chapter, Connor Imes, LP: #510703
+    - Small fixes from Nathan Handler, LP: #507624
+    - Configuration change for OpenLDAP, Connor Imes, LP: #511090
+    - Refresh of network-config section, Gilbert Mendoza, LP: #506800
+    - Update manpage links to use distro-short-codename, Connor Imes
+    - Changed OpenLDAP replication to use single Provider/Consumer configuration,
+      Adam Sommer
+    - Removed grub-password-security section - it does not apply to Grub2,
+      Gilbert Mendoza, LP: #384148
+    - Reference Grub2 community doc page for advanced configuration directions,
+      Connor Imes, LP: #437446
+    - Added necessary configuration options for apt Periodic in automatic-updates
+      section, Connor Imes, LP: #532661
+    - Added subsections for consumer and provider configuration steps, Adam Sommer
+    - Changed TLS Replication section to use Single-Master scheme, Adam Sommer
+    - Clarified Postfix TLS/SSL using a CA configuration steps, Adam Sommer,
+      LP: #518289
+    - Changed Apache2 Subversion configuration to use VirtualHost file instead
+      of apache2.conf, Adam Sommer, LP: #515298.
+    - Adding Ubuntu Wiki links to each section's Resources subsection, Adam Sommer
+    - Added note in mail section about some packages being in multiverse,
+      Connor Imes, LP: #509355
+    - Use default serverguide index.html file location for accessing serverguide
+      in terminal, Connor Imes, LP: #537167#
+    - Updated to use Grub2 directions, Connor Imes, LP: #533582
+    - Updated MySQL information for mysql-server-5.1, Adam Sommer
+    - Replaced screen-profiles with byobu project, Adam Sommer
+    - Changed egrep command with kvm-ok script, Adam Sommer
+    - Removed references to likewise-open5, Adam Sommer
+    - Add reporting-bugs.xml - Steve Beattie
+    - Replaced Eucalyptus section with information on UEC, Adam Sommer
+    - Updated command and configuration mistakes in vpn.xml, Adam Sommer
+      LP: #489819
+    - Replaced update-motd section with newer pam_motd, Adam Sommer, LP: #496184
+    - Updated LocalSettings.php command for new file path, and recommending upping
+      the memory limit based on feedback from Cornelius Brümmer, Adam Sommer
+    - Updated Installation section for Lucid, and added row seperator for UEC
+      requirement tables, Adam Sommer
+    - Changed OpenLDAP TLS/SSL options to use gnutls to create certificate instead 
+      of OpenSSL, Adam Sommer
+  * Switching/Windows:
+    - Updated dualboot section to use startupmanager for changing 
+      boot options (valid for Grub and Grub2), Connor Imes
+    - Fixed 'Ubuntu Ubuntu' typo, Alex Wardle, LP: #526083
+    - Removed old string from Windows section and copied correct string to
+      Switching guide, Connor Imes, LP: #527905
+    - Split off directions for exporting favorites in IE8. Broke different
+      IE versions down into subsections, Connor Imes, LP: #528808
+
+ -- Matthew East <[e-mail]>  Mon, 29 Mar 2010 07:56:15 +0100
+
+ubuntu-docs (10.04.1) lucid; urgency=low
+
+  * First upload for lucid
+  * General:
+    - Refresh pot files
+    - Changed 'Text Editor' to 'gedit Text Editor' LP: #442417 (Connor Imes)
+  * Advanced-topics:
+    - Added link in advanced-topics to a description about Users and Groups in
+      Debian systems. LP: #145055 (Connor Imes)
+  * Hardware:
+    - Added mention of ext4 to hardware.xml and changed the mentioning of the
+      default filesystem in Ubuntu from ext3 to ext4 LP #449667 (Connor Imes)
+    - Removed subsection in hardware about quirk-checker script - link was 
+      broken, script is outdated LP: #461158 (Connor Imes)
+  * Keeping-safe:
+    - Updating instructions for automatic login for new GDM LP: #442676
+     (Dean Sas)
+    - String adjustment (period inside of a quote tag), Scott Shields, 
+      LP: #496885
+  * Internet:
+    - Changes remaining mention of flashplugin-nonfree to flashplugin-installer
+      in web-apps.xml LP: #444546 (Connor Imes)
+    - Change some <guimenu> tags to <guimenuitem> tags in web-apps.xml to show
+      arrows in HTML documentation instead of + signs LP: #453512 (Connor Imes)
+    - Removed reference to network-manager radio buttons, as radio buttons
+      aren't used in this version of NM for wired networks (Jim Campbell)
+    - Aligned similar strings in 'internet' section to benefit translators;
+      some small adjustments. LP: #460360 (Connor Imes)
+  * Musicvideophotos:
+    - Fixed apturl for mtp-tools package in music.xml LP #452262 (Connor Imes)
+    - Improve ipod section, patch by Michael Fitzhugh. LP: #370085
+  * Printing:
+    - Updated printer setup directions in printing section LP: #435510
+      (Connor Imes)
+    - Fix scanning typo. Patch by Shane Fagan LP: #447250
+  * Programming:
+    - Removed entire programming section LP: #414035 (Connor Imes)
+  * Serverguide:
+    - Adjusted wording in serverguide package-management file to more
+      clearly describe apticron.  LP: #473280 (Connor Imes)
+    - Updated LDAP section for changes to the Jaunty package.
+      Fixes LP: #475492, LP: #459403, LP: #463684 (Adam Sommer)
+    - In OpenSSH section, .ssh/authorized_keys permissions should be
+      600, not 644 LP: #491159 (Connor Imes)
+    - Replaced description of ebox Log Observer in serverguide with a real 
+      description of the event's purpose LP: #405926 (Connor Imes)
+    - Fixed IP example in serverguide's postfix configuration section
+      LP: #495202 (Connor Imes)
+    - Include 'auto eth1' in interfaces file for static IP configuration
+      LP: #441802 (Connor Imes)
+    - Fix for disabling Control-Alt-Delete in serverguide. Scott Shields,
+      LP: #496465
+    - Typo fix, Scott Shields, LP: #497867
+    - PostgreSQL setup fix for config file pg_hba.conf, Scott Shields,
+      LP: #492286
+    - Misc fixes in windows-networking section. Vikram Dhillon, LP: #462607
+    - Changes to RAID installation section LP: #428036, LP: #462719
+      (Connor Imes)
+    - Fixes and adjustments to web-servers LP: #462621 (Connor Imes)
+  * Switching:
+    - Replaced Pidgin with Empathy in applications-equivalents
+      LP: #490980 (Connor Imes)
+    - Fixed misspelling of Rhythmbox (Connor Imes)
+    - Added note about FAT32 file size limit to Windows. Also removed comment
+      of NTFS needing extra work since Ubuntu now supports it out of the box
+      LP: #442111 (Connor Imes)
+    - Replaced explicit em-dashes with normal en-dashes LP: #493331
+      (Connor Imes)
+  * Windows:
+    - Menu entry correction, LP: #483149 (Jonathan Jesse)
+    - Two very small fixes in Windows migratingdata section
+      LP: #493358, LP: #493843 (Connor Imes)
+    - Various updates to the Windows section on migrating data. LP: #492949,
+      LP: #492951, LP: #492955, LP: #493166, LP: #493169 (Connor Imes)
+    - Further updates to the Windows section on preparing to switch and
+      migrating data - specifically for transferring email 
+      LP: #493169 (Connor Imes)
+    - Add support for for exporting bookmarks in IE7 and IE8 LP: #442097
+      (Shane Fagan)
+    - Added necessary step to exporting Outlook data in windows section
+      LP: #493866 (Connor Imes)
+    - Ubuntu does have some fax support - adding link in glossary sections
+      LP: #493346 (Connor Imes)
+
+ -- Matthew East <[e-mail]>  Sat, 09 Jan 2010 10:26:29 +0000
+
+ubuntu-docs (9.10.11) karmic; urgency=low
+
+  * Update translations from Rosetta
+
+ -- Matthew East <[e-mail]>  Sat, 17 Oct 2009 17:23:03 +0100
+
+ubuntu-docs (9.10.10) karmic; urgency=low
+
+  * Remove draft watermark from html pages
+  * Drop fdupes script as it clashes with current pkgbinarymangler (LP: #441401)
+    - also need to set CDBS_NO_GNOME_HELP_SYMLINKING=1 to stop fdupes script
+  * Update version number in offline browser startpage to 9.10
+
+ -- Matthew East <[e-mail]>  Mon, 12 Oct 2009 22:09:57 +0100
+
+ubuntu-docs (9.10.9) karmic; urgency=low
+
+  * General:
+    - Refresh pot files
+    - Fix broken links to ghelp:hardware#jockey, Connor Imes, LP: #441460
+    - Update references to gnome-app-install to software-center, Connor
+      Imes, LP: #441810
+  * add-applications.xml:
+    - Replace references to 'Third party software' with 'Other software',
+      Shane Fagan, LP: #441323, LP: #441315
+  * internet.xml:
+    - Update packagenames for flashplugin-installer and ttf-mscorefonts-installer,
+      Connor Imes, LP: #441799
+  * musicvideophotos.xml:
+    - Correct firefox flash error message, LP: #441815
+  * programming.xml:
+    - Replace gambas with gambas2, Connor Imes, LP: #414287
+  * usb-creator.xml:
+    - Correct typo, Connor Imes, LP: #442231
+    - Correct unclear sentence, LP: #442461
+
+ -- Matthew East <[e-mail]>  Sun, 04 Oct 2009 21:05:06 +0100
+
+ubuntu-docs (9.10.8) karmic; urgency=low
+
+  * General:
+    - Refresh pot files
+  * hardware.xml:
+    - Update jockey instructions to reflect UI changes from some time ago (LP: #281143)
+    - Remove link to deprecated section in accessibility guide (LP: #293842)
+  * internet.xml:
+    - Network manager network list no longer has radio buttons, Dean Sas
+  * keeping-safe.xml:
+    - Update firewall section, Connor Imes / bodhi.zazen (LP: #377039)
+  * usb-creator.xml:
+    - Add manual for usb-creator, new document by Augustina Blair
+  * serverguide.xml:
+    - Add additional information for configuring TLS with OpenLDAP and gnutls, PeterNSteinmetz (LP: #437483)
+
+ -- Matthew East <[e-mail]>  Sun, 27 Sep 2009 17:26:16 +0100
+
+ubuntu-docs (9.10.7) karmic; urgency=low
+
+  * General:
+    - Refresh pot files
+  * Add-applications:
+    - Amend add-applications in light of move from gnome-app-install to software-center
+  * Serverguide (by Adam Sommer unless otherwise stated):
+    - Updating etckeeper section for new version and fixing typo, Thierry Carrez (LP: #432377)
+    - Updating the Postgresql section for version 8.4, ~BG (LP: #426971)
+    - Fix typos in Chat section, Connor Imes (LP: #410654)
+    - Removing note about command line utility differences, Connor Imes (LP: #394728)
+    - Update for phpinfo() test script, Christian Wenz (LP: #418045)
+    - Added note about manually compiling drbd module in virtual kernels, removed bad config
+      line based on feed back from Ante Karamatić (LP: #397241)
+    - Apache2 configuration update for more security, and clarification of using SSL
+      and Apache2 with Subversion (LP: #383605)
+    - Added a link to the Windows Networking section to find more info regarding Samba (LP: #415622)
+    - Added priority to MX record example (LP: #425207)
+    - Added more configuration options to Amavisd-new section to flag more messages as spam (LP: #363442)
+    - Updated mailman Apache2 configuration for latest version of moinmoin (LP: #381802)
+
+ -- Matthew East <[e-mail]>  Sat, 26 Sep 2009 14:07:07 +0100
+
+ubuntu-docs (9.10.6) karmic; urgency=low
+
+  * General:
+    - Refresh pot files
+    - debian/rules: remove deprecated scrollkeeper calls
+    - debian/rules: small fix to build process for translated xml 
+  * Internet:
+    - Remove outstanding mention of Pidgin (LP: #425834), Dougie Richardson
+    - Update bittorrent docs for introduction of Transmission, Dean Sas
+    - Fix instruction for Java plugin on amd64 (LP: #293781), Dougie Richardson
+
+ -- Matthew East <[e-mail]>  Tue, 22 Sep 2009 21:32:29 +0100
+
+ubuntu-docs (9.10.5) karmic; urgency=low
+
+  * General:
+    - Also ship translations which are under 75% translated now, as these are included in language packs
+    - Refresh pot files
+  * Internet:
+    - New mobile broadband troubleshooting section, Dougie Richardson
+  * Serverguide:
+    - Adjust the command to create an LDIF for schema addition, Adam Sommer (LP: #416520)
+  * Switching:
+    - Fix several typos, Jonathan Jesse (LP: #416422)
+
+ -- Matthew East <[e-mail]>  Mon, 31 Aug 2009 22:39:58 +0100
+
+ubuntu-docs (9.10.4) karmic; urgency=low
+
+  * General:
+    - Updating version numbers for 9.10/Karmic
+    - Refresh pot files
+  * About-ubuntu:
+    - reword first sentence to clarify system version number, LP: #395905
+  * Internet:
+    - Replace Pidgin with Empathy, now default IM app in Karmic
+    - typo, LP: #414153
+  * Serverguide:
+    - Update correct command for restarting cups, Dougie Richardson, LP: #380836
+    - New Jabberd2 section, Adam Sommer
+    - New OpenVPN chapter, Adam Sommer
+    - Typo, LP: #414605
+
+ -- Matthew East <[e-mail]>  Mon, 17 Aug 2009 08:30:56 +0100
+
+ubuntu-docs (9.10.3) karmic; urgency=low
+
+  * debian/rules - install "C" locale documents (these were not being
+    installed following changes in 9.10.1)
+  * Basic-commands:
+    - Spelling fix, Dougie Richardson, LP #388651
+  * Keeping-safe:
+    - Update for new firefox security dialogue, LP: #386556
+  * Internet:
+    - Added FAQ section, Dougie Richardson
+  * Printing:
+    - Grammar fix, LP: #386376
+  * Serverguide:
+    - Remove all instances of 'the the', LP: #377436
+    - New Monitoring chapter, including Nagios and Munin, Adam Sommer
+    - Adding bind9-utils package to the DNS Server task package list, from Shane Fagan, LP: #381739
+    - Typo in Landscape section, Jonathan Jesse, LP: #394026 
+    - Replaced Postfix and SMTPAUTH instructions, Adam Sommer
+    - Corrected /etc/ufw/sysctl.conf syntax, Adam Sommer, LP: #397357
+
+ -- Matthew East <[e-mail]>  Sat, 25 Jul 2009 14:08:12 +0100
+
+ubuntu-docs (9.10.2) karmic; urgency=low
+
+  * General:
+    - fix menu entry for gparted; patch from Artur Szymanski, LP: #371851
+    - a few corrections to use US not UK spelling, patch from Nathan Handler
+    - remove unnecessary use of alt+f2 to start apps available from the menu, Dean Sas
+  * Hardware:
+    - fix instructions to lock screen with new FUSA applet, patch from Artur Szymanski, LP: #371930
+  * Add-applications:
+    - new section on PPA, patch from Nathan Handler
+  * Musicvideophotos:
+    - generalise photo import instructions, from Stephanie Mardell
+    - update section on listening to online audio streams is outdated, patch from Shane Fagan
+    - Rhythmbox has a tag editor, patch from Shane Fagan
+  * Keeping-safe:
+    - fix link to removing programs, patch from Artur Szymanski
+  * Internet:
+    - document easiest way to change preferred email client, Dougie Richardson, LP: #356894
+    - java is no longer installed by ubuntu-restricted-extras, Dean Sas, LP: #366039
+  * Serverguide:
+    - Clarify read only explanation in samba section, patch from Connor Imes, LP: #281702
+    - Patch by Joel Goguen adding note about restarting after joining a domain, LP: #352934.
+    - Patch by Nathan Handler to remove information about dhcdbd that is no longer needed, LP: #373867.
+    - Merge from Connor Imes: 2009-05-06 Fix bad flag in useradd command, LP: #371730
+  * Games:
+    - remove confusing lines from supertux instructions, patch from Shane Fagan, LP: #346892
+  * Printing:
+    - Fix typo and update notification text, patch from Nathan Handler
+
+ -- Matthew East <[e-mail]>  Sun, 17 May 2009 09:45:19 +0100
+
+ubuntu-docs (9.10.1) karmic; urgency=low
+
+  * [Matthew East]
+    - First release for Karmic
+    - Drastically shorten package build time by only building translated xml 
+      for translations that we are actually going to ship
+    - hardware.xml - computer-janitor updates
+    - Correction to PhotoEditor instructions - patch from Connor Ines - LP: #355008
+    - photos.xml - import window opens automatically on f-spot first use, LP: #209530
+    - Add introductory paragraph to seek to explain GNOME desktop - LP: #219972
+    - Errors in musicvideophotos, patches from Artur Szymanski and Connor Imes - LP: #359288
+    - Typos in desktop-effects.xml, patch from Connor Imes. LP: #357344
+    - add missing apt: prefix to xchat-gnome installation link, LP: #356933
+    - Update debian/control and debian/copyright - patch from Nathan Handler, LP: #363552
+    - Grammar error in virtualization.xml, patch from Connor Imes. LP: #352313
+    - Make language in jockey section consistent with language used in UI, LP: #274845
+    - Add link to debian section on Ubuntu website, patch from Connor Imes, LP: #257337
+  * [Bhuvaneswaran A]
+    - serverguide/lamp-applications.xml - improvements to mediawiki instructions
+    - serverguide/chat.xml - new section about chat server applications
+    - improvements to exim section in serverguide/mail
+  * [Dean Sas] - typo fix in serverguide/jeos
+
+ -- Matthew East <[e-mail]>  Wed, 29 Apr 2009 00:23:20 +0100
+
+ubuntu-docs (9.04.9) jaunty; urgency=low
+
+  * Final import of translations from Rosetta for NonLangPackFreeze
+  * Removing erroneous section about totem not supporting DVD menus (LP: #354777)
+  * libdvdread3 -> libdvdread4 (LP: #354764)
+
+ -- Matthew East <[e-mail]>  Thu, 09 Apr 2009 21:15:26 +0100
+
+ubuntu-docs (9.04.8) jaunty; urgency=low
+
+  * [Jordan Mantha]
+    - Add Conflicts on edubuntu-docs (<< 9.04.1ubuntu1) LP: #353288
+
+  * [Matthew East]
+    - Remove es_ES and es_PR locales (LP: #348855)
+    - Removing strings about totem not being able to support DVD menus (LP: #354777)
+
+ -- Matthew East <[e-mail]>  Fri, 03 Apr 2009 21:19:27 +0100
+
+ubuntu-docs (9.04.7) jaunty; urgency=low
+
+  * debian/ubuntu-docs.postinst - Fix syntax error with previous release (LP: #353117)
+  * refreshing translations from Rosetta
+
+ -- Matthew East <[e-mail]>  Wed, 01 Apr 2009 14:21:14 +0100
+
+ubuntu-docs (9.04.6) jaunty; urgency=low
+
+  * Remove deprecated directory at /usr/share/gnome/help/libs (LP: #303578)
+    - Thanks to Steve Langasek for the fix
+
+ -- Matthew East <[e-mail]>  Mon, 30 Mar 2009 18:09:05 +0100
+
+ubuntu-docs (9.04.5) jaunty; urgency=low
+
+  * String freeze release
+
+  * [Matthew East]
+    - Updating logout and shutdown instructions for Jaunty (User Switcher, not System menu)
+    - musicvideophotos.xml - use consistent language for extracting audio cds (LP: #346245)
+    - musicvideophotos.xml - use direct link to brasero manual
+    - Make titles of documents in yelp indexes match the title of the documents themselves (LP: #345852)
+    - Refresh pot templates
+
+  * [Dougie Richardson]
+    - basic-commands.xml - paste instructions correction (LP: #341534)
+    - internet/troubleshooting.xml - changing bad wording
+    - video.xml - dvd support requires gstreamer-ugly (LP: #338321)
+    - connecting.xml - modem instructions (LP: #310331)
+
+  * [Adam Sommer] - Server Guide
+    - Updated OpenLDAP section for new /etc/default/slapd configuration.
+    - Added instructions for setting correct ACL for the Kerberos keys.
+    - virtualization.xml - new Eucalyptus and OpenNebula sections
+    - installation.xml:
+      * rewrite of Extending Volume Groups section (LP: #347201, LP: #346862, and LP: #346859)
+      * Updates for Jaunty.
+    - security.xml:
+      * Updated Firewall section for Jaunty.
+      * Corrected "sudo ufw app info Samba" command (LP: #346327).
+    - dns.xml - fixing grammar and spelling mistakes (LP: #348032, LP: #348023, LP: #348094).
+    - windows-networking - Updated Likewise Open section for Jaunty (feedback from Thierry Carrez).
+
+  * [Phil Bull]
+    - about-ubuntu.xml - minor edits and updates, simplify a few sentences
+    - add-applications.xml:
+      * Add new entity for Software Sources, with sensible name
+      * Simplify structure
+      * Reduce verbosity, concentrate on the instructions
+      * Separate-out conceptual information into dedicated sections
+
+  * [Nathan Handler]
+    - virtualization.xml - typo (LP: #343633)
+
+  * [Dean Sas]
+    - music.xml - volume control preferences fix (LP: #346957)
+
+  * [Tim Bosse]
+    - connecting.xml - add basic VPN instructions
+
+ -- Matthew East <[e-mail]>  Wed, 25 Mar 2009 22:03:21 +0000
+
+ubuntu-docs (9.04.4) jaunty; urgency=low
+
+  * [Matthew East]
+    - Rewrite of internet/connecting/mobile-broadband
+    - Review of internet/connecting/wireless
+    - fix typo - LP: #339227
+    - Update guilabel for disabling visual effects (LP: #339103)
+    - Correction to 'Hardware Drivers' entity
+    - Add documentation for visual effects keyboard shortcuts (LP: #147294) - patch from seisen1
+    - Refresh pot files
+    - programming.xml - package name should be in small case (LP: #336629)
+    - Switching from Windows - typo fix and update to firefox bookmark export (LP: #330912, LP: #330908)
+
+  * [Dougie Richardson]
+    - Document MTP player support for rhythmbox (LP: #338437)
+    - Use xref links rather than ulink in musicvideophotos (LP: #222990)
+
+  * [Adam Sommer]
+    - Improvements to OpenLDAP credentials section (LP: #333733, LP: #333437)
+    - Fix to Samba security instructions (LP: #332478)
+    - Fix to Subversion authentication details (LP: #337215)
+    - Add -c flag to vert-viewer command example (LP: #335541)
+    - Update link to MoinMoin website (LP: #334652)
+    - Updated Postfix section with instructions for new dovecot-postfix package
+    - Bind configuration improvements (LP: #339910)
+
+ -- Matthew East <[e-mail]>  Sun, 08 Mar 2009 13:54:15 +0000
+
+ubuntu-docs (9.04.3) jaunty; urgency=low
+
+  * Cruft Remover renamed to Computer Janitor, adjusting hardware.xml accordingly (LP: #336288)
+  * Expansion and revision of Programming document (Dean Sas)
+  * No way to change hostname using GUI tool now (LP: #322268) - Dougie Richardson
+  * Update logout details (LP: #335279) - Dougie Richardson
+  * Update version number in offline firefox startpage
+  * Typo in serverguide (LP: #334697) - Dougie Richardson
+  * Update to Windows partition manager in Switching from Windows doc (LP: #333600) - Dougie Richardson
+  * Refresh pot files
+
+ -- Matthew East <[e-mail]>  Sun, 01 Mar 2009 15:46:22 +0000
+
+ubuntu-docs (9.04.2) jaunty; urgency=low
+
+  * Various serverguide fixes:
+    - Grammar error (LP: #203829) - Dean Sas
+    - Fix mailman dependencies (LP: #291772) - Morten Siebuhr
+    - CVS installation error (LP: #298605) - Thomas M
+    - Postfox installation error (LP: #306289) - Adam Sommer
+    - SSH update (LP: #311900) - Dean Sas
+    - unzoo replaced by zoo (LP: #312506)
+    - Samba instructions update (LP: #313232) - Adam Sommer
+    - Clearer SSL instructions (LP: #314951) - Adam Sommer
+    - LDAP error (LP: #319179) - Adam Sommer
+    - MoinMoin installation fix (LP: #320840) - Adam Sommer
+    - Postfix ssl improvements (LP: #323203) - Adam Sommer
+    - Ebox instructions error (LP: #324399) - Dean Sas
+    - Typo in openssh section (LP: #325828) - Dean Sas
+    - Typo in samba section (LP: #285484) - Nick Ellery
+    - SSHD fix (LP: #295279) - Adam Sommer
+    - Jeos fix (LP: #307582) - Adam Sommer
+    - Remove reference to ebox-all package (LP: #322367) - Adam Sommer
+
+  * Typo in "switching from windows" (LP: #309735)
+  * Broken link in "programming" (LP: #310081) - Jonathan Jesse
+  * lsb_release issue in "basic commands" (LP: #310713) - Thomas M
+  * Updating logout instructions (LP: #327060) - Dean Sas
+  * Updating all documents to use apt-url for installation instructions
+  * Refreshing pot files for Rosetta
+  * Recompress *.png files with 'advpng -z -4 file.png' to save space -  Sahak Petrosyan
+  * Improve instructions on pasting commands (LP: #185892) - Martin Mai
+  * Rewrite of networking instructions (LP: #298513, LP: #321308, LP: #314680, LP: #321179) - Dougie Richardson
+  * Amend punctuation of about-ubuntu (LP: #275592) - Dougie Richardson
+  * Documentation for automatic login (LP: #290467) - Dougie Richardson
+
+ -- Matthew East <[e-mail]>  Sun, 15 Feb 2009 11:50:28 +0000
+
+ubuntu-docs (9.04.1) jaunty; urgency=low
+
+  * Images should not be executable (LP: #206371) - Sahak Petrosyan
+  * Couple of typos (LP: #282358, LP: #266997) - Sahak Petrosyan
+  * ubuntu-restricted-extras has java6 (LP: #288623) - Dean Sas
+  * Permit building html for other languages in Makefile - Mitsuya Shibata
+  * Use the same background image as Ubuntu website (LP: #305760)
+  * Make search available for users without javascript - Dustin Kirkland
+  * Various content improvements - Phil Bull
+  * Use "Enter", not "Return" - Joel Goguen (LP: #213104)
+
+ -- Matthew East <[e-mail]>  Thu, 11 Dec 2008 12:47:51 +0000
+
+ubuntu-docs (8.10.2) intrepid; urgency=low
+
+  * Updating translations from Launchpad as at 19 Oct 08 (LP: #286829)
+  * Small update to Hebrew translation of browser startpage (LP: #285696)
+  * To save CD space, only ship translations which are over 75% translated
+
+ -- Matthew East <[e-mail]>  Sun, 19 Oct 2008 20:21:13 +0100
+
+ubuntu-docs (8.10.1) intrepid; urgency=low
+
+  * Add ukranian translation of firefox homepage (LP: #216982)
+  * Correct wrong codename in basic-commands document (LP: #281664)
+
+ -- Matthew East <[e-mail]>  Tue, 14 Oct 2008 22:27:20 +0100
+
+ubuntu-docs (8.09.2) intrepid; urgency=low
+
+  * ubuntu-serverguide should suggest www-browser and not firefox (LP: #272772)
+
+ -- Matthew East <[e-mail]>  Sun, 21 Sep 2008 21:21:03 +0100
+
+ubuntu-docs (8.09.1) intrepid; urgency=low
+
+  * about-ubuntu validity fix (LP: #255088)
+  * various text updates (LP: #238661, LP: #14425, LP: #248283, LP: #215025)
+  * hebrew startpage improvement (LP: #220780)
+
+ -- Matthew East <[e-mail]>  Thu, 04 Sep 2008 22:50:16 +0100
+
+ubuntu-docs (8.08.2) intrepid; urgency=low
+
+  * Updating browser startpage version numbers
+
+ -- Matthew East <[e-mail]>  Mon, 04 Aug 2008 21:55:44 +0100
+
+ubuntu-docs (8.08.1) intrepid; urgency=low
+
+  * First release for intrepid
+  * Severe restructuring and simplification of tree
+  * Removing lots of unused files
+  * Only build translated xml at build time, rather than in advance
+  * Various text fixes
+
+ -- Matthew East <[e-mail]>  Sat, 05 Apr 2008 15:03:15 +0100
+
+ubuntu-docs (8.03.4) hardy; urgency=low
+
+  * Install omf file for serverguide (LP: #208134)
+
+ -- Matthew East <[e-mail]>  Fri, 28 Mar 2008 08:12:48 +0000
+
+ubuntu-docs (8.03.3) hardy; urgency=low
+
+  * New bzr checkout (LP: #181236, LP: #203198, LP: #204163, LP: #204666)
+  * String freeze now in effect
+  * Refresh pot files
+
+ -- Matthew East <[e-mail]>  Fri, 21 Mar 2008 14:34:49 +0000
+
+ubuntu-docs (8.03.2) hardy; urgency=low
+
+  * New bzr checkout (LP: #176678, LP: #118963, LP: #108083, LP: #202312)
+  * Replacing "server" document with "serverguide"
+  * Refresh pot files
+  * Fixing debian/rules to filter translations less than 40%
+
+ -- Matthew East <[e-mail]>  Sun, 16 Mar 2008 22:16:42 +0000
+
+ubuntu-docs (8.03.1) hardy; urgency=low
+
+  * New bzr checkout (LP: #49435, LP: #197557, LP: #172650, LP: #192202,
+    LP: #144788, LP: #162446, LP: #183339, LP: #195882)
+  * Include html version of contributors in ubuntu-serverguide (LP: #88814)
+  * Refresh pot templates
+
+ -- Matthew East <[e-mail]>  Sun, 09 Mar 2008 18:37:08 +0000
+
+ubuntu-docs (8.02.2) hardy; urgency=low
+
+  * Adding translations for all documents
+  * Amending path for pot templates, as requested by carlos
+
+ -- Matthew East <[e-mail]>  Wed, 20 Feb 2008 07:56:10 +0000
+
+ubuntu-docs (8.02.1) hardy; urgency=low
+
+  * New bzr checkout - loads of text fixes and improvements (LP: #183148,
+    LP: #183025, LP: #178064, LP: #160435, LP: #158016, LP: #146794, 
+    LP: #144795, LP: #185867, LP: #163188, LP: #150167, LP: #148372, 
+    LP: #144928, LP: #141491, LP: #141444, LP: #138891, LP: #172565, 
+    LP: #144285, LP: #150641, LP: #176678)
+  * First release for hardy
+
+ -- Matthew East <[e-mail]>  Sat, 16 Feb 2008 18:31:20 +0000
+
+ubuntu-docs (7.10.4) gutsy; urgency=low
+
+  * Fix broken link in "windows" document (LP: #144796)
+
+ -- Matthew East <[e-mail]>  Fri, 12 Oct 2007 08:36:57 +0100
+
+ubuntu-docs (7.10.3) gutsy; urgency=low
+
+  * Advanced Topics - changing link to more useful doc for programming reference
+
+ -- Matthew East <[e-mail]>  Sun, 07 Oct 2007 12:34:41 +0100
+
+ubuntu-docs (7.10.2) gutsy; urgency=low
+
+  * New translation export from rosetta
+  * Restoring translations over 40% complete
+  * Including all languages in ubuntu-serverguide package (LP: #110863)
+  * Last package upload before gutsy (LP: #149993)
+
+ -- Matthew East <[e-mail]>  Sat, 06 Oct 2007 15:25:19 +0100
+
+ubuntu-docs (7.10.1) gutsy; urgency=low
+
+  * Adding translations to source package
+  * Don't install libs/pdf directory 
+  * Restore symlink-dupes script to eliminate duplicate files (LP: 149040)
+  * Fix debian/rules to take account of new location for pot files (thanks to Martin Pitt)
+  * Only install translations which are >90% complete (temporary measure to keep package size small)
+
+ -- Matthew East <[e-mail]>  Thu, 04 Oct 2007 08:17:06 +0100
+
+ubuntu-docs (7.09.3) gutsy; urgency=low
+
+  * Strip out unwanted directories from the source package in 
+		debian/rules rather than manually.
+
+ -- Matthew East <[e-mail]>  Mon, 17 Sep 2007 08:46:53 +0100
+
+ubuntu-docs (7.09.2) gutsy; urgency=low
+
+  * New SVN checkout
+  * String Freeze in effect, refreshing pot templates
+
+ -- Matthew East <[e-mail]>  Fri, 14 Sep 2007 08:23:05 +0100
+
+ubuntu-docs (7.09.1) gutsy; urgency=low
+
+  * New SVN checkout
+  * Changing 7.04 to 7.10 in browser homepage
+
+ -- Matthew East <[e-mail]>  Tue, 28 Aug 2007 08:14:03 +0100
+
+ubuntu-docs (7.07.2) gutsy; urgency=low
+
+  * New SVN checkout.
+
+ -- Jordan Mantha <[e-mail]>  Wed, 15 Aug 2007 13:35:31 -0700
+
+ubuntu-docs (7.07.1) gutsy; urgency=low
+
+  * New SVN checkout.
+  * debian/rules: remove symlink-dupes bits.
+
+ -- Daniel Holbach <[e-mail]>  Wed, 04 Jul 2007 09:30:59 +0200
+
+ubuntu-docs (7.04.4) feisty; urgency=low
+
+  * debian/control: Add missing Pre-depends: on dpkg for bzip2 compression
+    support.
+  * debian/rules: Use the same 'poorly translated' barrier for the server
+    parts of ubuntu-doc, and raise the bar to 30%.
+  * debian/rules: Add -o /dev/null to msgfmt calls to avoid writing
+    messages.mo into the root directory.
+
+ -- Martin Pitt <[e-mail]>  Wed, 11 Apr 2007 10:00:01 +0200
+
+ubuntu-docs (7.04.3) feisty; urgency=low
+
+  * Update translations from Rosetta
+  * Install translations for ubuntu-serverguide
+  * Unbreak about-ubuntu panel menu entry
+  * [Martin Pitt]:
+    - debian/rules: Do not ship documents which are less than 25% translated.
+      They are useless for non-English speakers anyway and bloat the package.
+    - debian/control: Add bc build dependency (needed for the percentage 
+      calculation).
+
+ -- Matthew East <[e-mail]>  Sun,  8 Apr 2007 10:26:54 +0100
+
+ubuntu-docs (7.04.2) feisty; urgency=low
+
+  * Package diet to stop being so ridiculously space inefficient:
+    - debian/rules: Use bzip2 compression.
+    - Add symlink-dupes and run it in debian/rules, to symlink duplicate
+      files. Add fdupes build dependency for that.
+
+ -- Martin Pitt <[e-mail]>  Thu,  5 Apr 2007 12:32:17 +0200
+
+ubuntu-docs (7.04.1) feisty; urgency=low
+
+  * Adding translations for all documents
+  * [Daniel Holbach]
+    - debian/control: change gnome2-user-guide to gnome-user-guide.
+
+ -- Matthew East <[e-mail]>  Wed,  4 Apr 2007 08:00:57 +0100
+
+ubuntu-docs (7.03.3) feisty; urgency=low
+
+  * A few new strings approved as per DocumentationStringFreeze
+  * Refreshing pot templates
+  * Removing pot template for switching guide
+
+ -- Matthew East <[e-mail]>  Thu, 15 Mar 2007 08:25:46 +0000
+
+ubuntu-docs (7.03.2) feisty; urgency=low
+
+  * New material, mainly from Phil Bull
+  * Refreshing pot templates
+  * String freeze now in effect
+
+ -- Matthew East <[e-mail]>  Thu,  8 Mar 2007 08:20:38 +0000
+
+ubuntu-docs (7.03.1) feisty; urgency=low
+
+  * Two new documents - basic-commands and desktop-effects
+  * Refreshing pot templates
+
+ -- Matthew East <[e-mail]>  Sat,  3 Mar 2007 11:03:55 +0000
+
+ubuntu-docs (7.02.3) feisty; urgency=low
+
+  * split out serverguide as a standalone .deb
+    - moved install, links, postinst, and prerm to ubuntu-docs.*
+    - added ubuntu-serverguide binary section to debian/control
+    - cleaned up long descriptions to reflect what is actually
+      shipped.
+    - added ubuntu-serverguide build and install rules
+  * split out packagingguide as standalone .deb
+  * updated debian/copyright to reflect above
+
+ -- Jordan Mantha <[e-mail]>  Wed, 21 Feb 2007 02:10:28 -0800
+
+ubuntu-docs (7.02.2) feisty; urgency=low
+
+  * Adding a "Files, Folders and Documents" topic.
+  * Various text updates
+
+ -- Matthew East <[e-mail]>  Fri,  9 Feb 2007 08:21:45 +0000
+
+ubuntu-docs (7.02.1) feisty; urgency=low
+
+  * Installing documents within the gnome/help scheme
+    - for easier linking
+
+ -- Matthew East <[e-mail]>  Fri,  2 Feb 2007 00:28:53 +0000
+
+ubuntu-docs (7.01.3) feisty; urgency=low
+
+  * Rearranging directory structure and adding translation templates
+
+ -- Matthew East <[e-mail]>  Sat, 27 Jan 2007 07:53:31 -0500
+
+ubuntu-docs (7.01.2) feisty; urgency=low
+
+  * adding new advanced-topics category with links to man pages
+
+ -- Matthew East <[e-mail]>  Wed, 24 Jan 2007 00:14:21 +0000
+
+ubuntu-docs (7.01.1) feisty; urgency=low
+
+  * Adding gnome2-user-guide and yelp to Depends
+  * Two new top level topics
+
+ -- Matthew East <[e-mail]>  Tue,  9 Jan 2007 00:08:10 +0000
+
+ubuntu-docs (6.12.2) feisty; urgency=low
+
+  * Tweaking of which documents show up on the front page
+  * Various text updates
+
+ -- Matthew East <[e-mail]>  Sat, 23 Dec 2006 01:11:53 +0000
+
+ubuntu-docs (6.12.1) feisty; urgency=low
+
+  * Serious revamping of structure of documentation, accordingly
+	 changes made to packaging. Please do some serious testing.
+
+ -- Matthew East <[e-mail]>  Sat, 16 Dec 2006 17:00:00 +0000
+
+ubuntu-docs (6.11.2) feisty; urgency=low
+
+  * Changing the packaging process to point mainly at debian/rules rather
+	 than debian/install so we don't have to keep adding files manually to the
+	 latter.
+
+ -- Matthew East <[e-mail]>  Sun, 19 Nov 2006 10:39:00 +0000
+
+ubuntu-docs (6.11.1) edgy-updates; urgency=low
+
+  * Some missing entities causing validity havoc in our docbook
+  * Fixing invalidity of contribute.xml
+
+ -- Matthew East <[e-mail]>  Sat, 18 Nov 2006 20:53:00 +0000
+
+ubuntu-docs (6.10.4) edgy; urgency=low
+
+  * Updating omf files for getting-help
+  * Removing es_ES locale for aboutubuntu (duplicate of es) - bug 66819
+
+ -- Matthew East <[e-mail]>  Fri, 20 Oct 2006 20:30:00 +0100
+
+ubuntu-docs (6.10.3) edgy; urgency=low
+
+  * Matthew East:
+    - Fixing translations by installing *omf files for each document and 
+      fixing paths in the omf files
+  * Daniel Holbach:
+    - fix installation, run dh_scrollkeeper.
+
+ -- Matthew East <[e-mail]>  Wed, 18 Oct 2006 22:00:00 +0100
+
+ubuntu-docs (6.10.2) edgy; urgency=low
+
+  * Adding translations for all documents
+
+ -- Matthew East <[e-mail]>  Sun, 15 Oct 2006 10:30:00 +0100
+
+ubuntu-docs (6.10.1) edgy; urgency=low
+
+  * Including po files for translations in source package, as requested by Carlos.
+  * Adding pot template and correcting typo in omf file for Getting Help document.
+
+ -- Matthew East <[e-mail]>  Sun, 30 Sep 2006 12:00:00 +0100
+
+ubuntu-docs (6.09.3) edgy; urgency=low
+
+  * New SVN checkout.
+  * ubuntu/browser-startpage/*:
+    - changed occurrences of Dapper, Drake, 6.06, LTS, ... to their 'edgy'
+      equivalents - there are more strings to change outside of this.
+
+ -- Daniel Holbach <[e-mail]>  Tue, 26 Sep 2006 12:42:25 +0200
+
+ubuntu-docs (6.09.2) edgy; urgency=low
+
+  * New SVN checkout. 
+
+ -- Daniel Holbach <[e-mail]>  Thu, 21 Sep 2006 22:52:02 +0200
+
+ubuntu-docs (6.09.1) edgy; urgency=low
+
+  * New release.
+  * debian/control:
+    - removed Depends on gnome2-user-guide, after discussion with Corey
+      Burger.
+
+ -- Daniel Holbach <[e-mail]>  Fri, 15 Sep 2006 17:55:30 +0200
+
+ubuntu-docs (6.08.2) edgy; urgency=low
+
+  * New "Contribute to Ubuntu" doc, written by Andreas Lloyd and imported from the wiki
+  * Desktop guide significantly restructured, now includes the Gnome user-guide
+  * Including pot templates for automatic import into Rosetta
+
+ -- Matthew East <[e-mail]>  Mon, 28 August 2006 22:00:00 +0100
+
+ubuntu-docs (6.08.1) edgy; urgency=low
+
+  * first package for Edgy
+  * removing translations of documentation
+  * changing installation directory for documentation from /usr/share/ubuntu-doc
+     to /usr/share/gnome/help to integrate with gnome help system
+  * splitting documents up to make a nicer structure for help system, hopefully
+  .
+  * [Daniel Holbach]
+    - debian/README: updated repository URL. 
+    - debian/control:
+      - bumped Standards-Version,
+      - made cdbs and debhelper Build-Depends, not Build-Depends-Indep.
+    - debian/install:
+      - changed ubuntuheader.png location.
+
+ -- Matthew East <[e-mail]>  Fri, 2 August 2006 14:00:00 +0100
+
+ubuntu-docs (6.06.2) dapper-updates; urgency=low
+
+  * New snapshot of translations from Rosetta
+
+ -- Matthew East <[e-mail]>  Fri, 16 June 2006 13:25:00 +0100
+
+ubuntu-docs (6.06.1) dapper; urgency=low
+
+  * removing useless link (Ubuntu: #47016)
+
+ -- Matthew East <[e-mail]>  Sun, 28 May 2006 01:44:00 +0100
+
+ubuntu-docs (6.05.6) dapper; urgency=low
+
+  * Replace `Ubuntu 6.06, Dapper Drake' with `Ubuntu 6.06 LTS'.
+  * Replace 6.04 with 60.6 in generic/libs/generic.ent.
+  * New sk translation of desktopguide (patch via mdke).
+  * Remove `ka_GE' from DapperFirefoxStartPageTranslation locale list.
+    It's too near to the Dapper release to complete the remaining stages
+    of the adding-a-locale process, and we must not stop halfway.
+
+ -- Ian Jackson <[e-mail]>  Tue, 23 May 2006 15:39:25 +0100
+
+ubuntu-docs (6.05.5) dapper; urgency=low
+
+  * Updated translations for everything (last update before the release)
+  * [Daniel Holbach]
+    - debian/README: updated.
+
+ -- Matthew East <[e-mail]>  Sun, 21 May 2006 17:31:00 +0100
+
+ubuntu-docs (6.05.4) UNRELEASED; urgency=low
+
+  * Adding preface.xml for zh_TW (was causing scrollkeeper errors)
+  * DapperFirefoxStartPageTranslation - new translateable locale `ka_GE'
+
+ -- Matthew East <[e-mail]>  Wed, 17 May 2006 20:53:00 +0100
+
+ubuntu-docs (6.05.3) dapper; urgency=low
+
+  * DapperFirefoxStartPageTranslation for epiphany:
+    produce an index-C.html for epiphany's index-%l.html.
+  * New translateable locale `ku'.
+
+ -- Ian Jackson <[e-mail]>  Tue, 16 May 2006 17:18:19 +0100
+
+ubuntu-docs (6.05.2) dapper; urgency=low
+
+  * New snapshot of translations for all documents
+
+ -- Matthew East <[e-mail]>  Sun, 14 May 2006 12:42:00 +0100
+
+ubuntu-docs (6.05.1) dapper; urgency=low
+
+  * Taking html out of shipped documentation.
+  * Adding preface.xml for those translations which have them
+  * New snapshot of translations for all documents
+
+ -- Matthew East <[e-mail]>  Tue, 02 May 2006 19:23:16 +0200
+
+ubuntu-docs (6.04.8) dapper; urgency=low
+
+  * [Matthew East and the Docteam]
+    - Adding some symbolic links so that the css and images in localised 
+      firefox homepages work
+    - Adding translations of the documents (BIG INCREASE IN PACKAGE SIZE)
+    - Moved to debhelper 5 so that we can use comments in debian/install to 
+      keep track of what has now become a long and confusing file.
+    - Relocated sample folders up a directory so that they don't need to be 
+      included for each translation
+  * [Daniel Holbach]
+    - debian/README:
+      - updated instructions to obtain 'source' for ubuntu-docs.
+
+ -- Daniel Holbach <[e-mail]>  Sun, 23 Apr 2006 08:39:40 +0200
+
+ubuntu-docs (6.04.7) dapper; urgency=low
+
+  * Revised DapperFirefoxStartPageTranslation:
+    - new slave alternatives directory for translated homepages
+    - automatic script for generation of link farm
+
+ -- Ian Jackson <[e-mail]>  Fri, 21 Apr 2006 18:05:36 +0100
+
+ubuntu-docs (6.04.6) dapper; urgency=low
+
+  * SVN checkout to make mdke happy. 
+
+ -- Daniel Holbach <[e-mail]>  Sat, 15 Apr 2006 13:58:57 +0200
+
+ubuntu-docs (6.04.5) dapper; urgency=low
+
+  * Massive reduction in source package (to make dholbach happy)
+  * Adding more firefox homepage translations
+
+ -- Matthew East <[e-mail]>  Tue, 11 Apr 2006 22:26:00 +0100
+
+ubuntu-docs (6.04.4) dapper; urgency=low
+
+  * The "gee the docteam rocks nowadays" release
+  * Documentation string freeze
+  * Pot templates for about ubuntu, desktop guide, server guide, packagingguide, preface
+  * Fixing broken entity in about ubuntu
+  * Adding more firefox homepage translations
+
+ -- Matthew East <[e-mail]>  Fri, 07 Apr 2006 15:11:07 +0100
+
+ubuntu-docs (6.04.3) dapper; urgency=low
+
+  * Adding links for dummy firefox homepage translations
+  * Adding lt translation of firefox homepage
+
+ -- Matthew East <[e-mail]>  Tue, 05 Apr 2006 15:11:07 +0100
+
+ubuntu-docs (6.04.2) dapper; urgency=low
+
+  * Adding a link for common files in /usr/share/gnome (fixes malone 37979)
+
+ -- Matthew East <[e-mail]>  Tue, 04 Apr 2006 11:11:07 +0100
+
+ubuntu-docs (6.04.1) dapper; urgency=low
+
+  * New SVN snapshot:
+    - Rewrite of About Ubuntu document.
+    - Updated pot file for About-Ubuntu
+
+ -- Daniel Holbach <[e-mail]>  Mon, 03 Apr 2006 20:55:07 +0200
+
+ubuntu-docs (6.03.5) dapper; urgency=low
+
+  * New SVN snapshot.
+  * debian/control:
+    - added docbook-xml to Build-Depends.
+
+ -- Daniel Holbach <[e-mail]>  Sun, 26 Mar 2006 16:06:40 +0200
+
+ubuntu-docs (6.03.4) dapper; urgency=low
+
+  * New SVN snapshot, should make scrollkeeper happy again. 
+
+ -- Daniel Holbach <[e-mail]>  Sat, 25 Mar 2006 13:11:39 +0100
+
+ubuntu-docs (6.03.3) dapper; urgency=low
+
+  * New SVN snapshot. 
+
+ -- Daniel Holbach <[e-mail]>  Wed, 22 Mar 2006 14:46:49 +0100
+
+ubuntu-docs (6.03.2) dapper; urgency=low
+
+  * New SVN snapshot. 
+
+ -- Daniel Holbach <[e-mail]>  Tue, 14 Mar 2006 13:10:44 +0100
+
+ubuntu-docs (6.03.1) dapper; urgency=low
+
+  * lots of new material from the whole team
+  * new style for browser homepage, including some images
+  * corrected position of the sample directories for desktop/server guide html versions
+
+ -- Matthew East <[e-mail]>  Wed, 8 Mar 2006 16:11:00 +0000
+
+ubuntu-docs (6.02.3) dapper; urgency=low
+
+  * New SVN snapshot.
+    - enhanced copyright file (Malone: #27923)
+
+ -- Daniel Holbach <[e-mail]>  Tue, 28 Feb 2006 08:16:47 +0100
+
+ubuntu-docs (6.02.2) dapper; urgency=low
+
+  * New SVN snapshot.
+
+ -- Daniel Holbach <[e-mail]>  Tue, 21 Feb 2006 14:02:23 +0100
+
+ubuntu-docs (6.02.1) dapper; urgency=low
+
+  * New SVN snapshot.
+
+ -- Daniel Holbach <[e-mail]>  Mon, 13 Feb 2006 17:31:48 +0100
+
+ubuntu-docs (6.01.6) dapper; urgency=low
+
+  * removing links to html versions of the guides from Yelp Table of Contents
+  * new material for desktopguide (Naaman Campbell, Milo Casagrande, mdke); lots of bugs fixed; fairly drastic re-organisation: please test and give feedback!!
+  * new material for serverguide (bhuvan)
+  * reworking of the packagingguide (LaserJock)
+  * included pot templates for all the guides, which will go into Rosetta (hopefully)
+
+ -- Matthew East <[e-mail]>  Fri, 3 Feb 2006 12:29:00 +0000
+
+ubuntu-docs (6.01.5) dapper; urgency=low
+
+  * [Daniel Holbach]
+    - New SVN checkout.
+  * [Matthew East]
+    - using a static html browser startpage rather than a page generated from
+    docbook xml.
+
+ -- Daniel Holbach <[e-mail]>  Mon, 23 Jan 2006 15:55:39 +0100
+
+ubuntu-docs (6.01.4) dapper; urgency=low
+
+  * New SVN checkout. 
+
+ -- Daniel Holbach <[e-mail]>  Tue, 17 Jan 2006 20:20:09 +0100
+
+ubuntu-docs (6.01.3) dapper; urgency=low
+
+  * Matthew East <[e-mail]>:
+    - new shorter firefox start page.
+  * Daniel Holbach <[e-mail]>:
+    - new SVN checkout.
+
+ -- Daniel Holbach <[e-mail]>  Thu, 12 Jan 2006 10:27:36 +0100
+
+ubuntu-docs (6.01.2) dapper; urgency=low
+
+  * New SVN checkout.
+
+ -- Daniel Holbach <[e-mail]>  Mon,  9 Jan 2006 13:08:28 +0100
+
+ubuntu-docs (6.01.1) dapper; urgency=low
+
+  * New SVN checkout.
+
+ -- Daniel Holbach <[e-mail]>  Mon,  2 Jan 2006 15:19:27 +0100
+
+ubuntu-docs (5.12.4) dapper; urgency=low
+
+  * New SVN checkout.
+  * debian/README:
+    - fixed little typo. 
+  * ubuntu/Makefile:
+    - dropped dg-IT from dg build target to fix build.
+
+ -- Daniel Holbach <[e-mail]>  Thu, 22 Dec 2005 12:18:55 +0100
+
+ubuntu-docs (5.12.3) dapper; urgency=low
+
+  * Use update-alternatives for Firefox index page
+
+ -- Jonathan Riddell <[e-mail]>  Tue, 20 Dec 2005 19:27:41 +0000
+
+ubuntu-docs (5.12.2) dapper; urgency=low
+
+  * New SVN checkout.
+  * debian/README.Debian
+    - added by Matthew East. 
+    - The directories mentioned in there are stripped from the tarball.
+
+ -- Daniel Holbach <[e-mail]>  Wed, 14 Dec 2005 22:43:52 +0100
+
+ubuntu-docs (5.12.1) dapper; urgency=low
+
+  * New SVN checkout.
+
+ -- Daniel Holbach <[e-mail]>  Tue,  6 Dec 2005 08:32:51 +0100
+
+ubuntu-docs (5.11-4) dapper; urgency=low
+
+  * new text, image and css in /usr/share/ubuntu-artwork/home/index.html (Ubuntu #15013, #16932, #17605 and #20692)
+  * Including the sample/ directory with desktopguide and serverguide
+
+ -- Matthew East <[e-mail]>  Mon, 2 Dec 2005 17:37:00 +0000
+
+ubuntu-docs (5.11-3) dapper; urgency=low
+
+  * adding packaging guide to the package
+  * moving xml guides to a new location (/usr/share/ubuntu-docs/ubuntu rather than /usr/share/ubuntu-docs) so that the entities work.
+
+ -- Matthew East <[e-mail]>  Mon, 28 Nov 2005 18:37:49 +0000
+
+ubuntu-docs (5.11-2) dapper; urgency=low
+
+  * added html versions of desktopguide and serverguide with relevant omf targets
+  * fixing misplaced css and navigation buttons
+
+ -- Matthew East <[e-mail]>  Mon, 28 Nov 2005 18:37:49 +0000
+
+ubuntu-docs (5.11-1) dapper; urgency=low
+
+  * New SVN checkout.
+  * debian/control:
+    - Bumped Standards-Version.
+  * debian/ubuntu-docs.doc-base.quicktour:
+    - dropped.
+
+ -- Daniel Holbach <[e-mail]>  Fri, 25 Nov 2005 20:56:49 +0100
+
+ubuntu-docs (5.10-7) dapper; urgency=low
+
+  * New document names for dapper (faqguide -> desktopguide)
+
+  * Improved About Ubuntu css
+
+  * Removed translations (translation won't start until string freeze)
+
+  * Added new Server Guide
+
+ -- Matthew East <[e-mail]>  Fri, 25 Nov 2005 15:52:14 +0000
+
+ubuntu-docs (5.10-6) breezy; urgency=low
+
+  * Resolve remaining errors from pofile export from Rosetta.
+    (Ubuntu #17145)
+    Thanks to Matthew East for this!
+
+  * Make ghelp URIs work again (Ubuntu  #16982)
+
+  * Prune out unused images.
+
+  * Firefox start page now has image and CSS.
+
+  * The faqguide is now known as the "Ubuntu 5.10 Starter Guide"
+
+ -- Jeff Bailey <[e-mail]>  Fri,  7 Oct 2005 16:32:14 -0400
+
+ubuntu-docs (5.10-5) breezy; urgency=low
+
+  * Resolve entity errors (Ubuntu: #15866, 16680)
+
+  * Provide firefox start page (Ubuntu: #16663)
+
+  Note: This page needs work as the image doesn't display and the CSS
+  file crashes firefox, but this kills the annoying error.
+
+ -- Jeff Bailey <[e-mail]>  Mon,  3 Oct 2005 02:20:04 -0400
+
+ubuntu-docs (5.10-4) breezy; urgency=low
+
+  * Final update for NonLanguagePackTranslationDeadlinreg
+
+ -- Jeff Bailey <[e-mail]>  Thu, 29 Sep 2005 23:28:43 -0400
+
+ubuntu-docs (5.10-3) breezy; urgency=low
+
+  * Lighten the package somewhat (Thanks to Jerome Gotangco)
+
+  * Conflict/Replace ubuntu-faqguide (Ubuntu: #16465)
+    Thanks to Matt Zimmerman for catching this!
+
+ -- Jeff Bailey <[e-mail]>  Wed, 28 Sep 2005 00:26:10 -0400
+
+ubuntu-docs (5.10-2) breezy; urgency=low
+
+  * Switch to docbook
+
+  * Remove old ubuntu-quickguide (Ubuntu #14816, #14709)
+
+  * Various updates from the docteam and translators.
+
+ -- Jeff Bailey <[e-mail]>  Tue, 27 Sep 2005 00:34:05 -0400
+
+ubuntu-docs (5.10-1) breezy; urgency=low
+
+  * Redo packaging based heavily off of Matt's packaging, make
+    sure that images are all included and that pages don't say
+    "draft".
+
+    Currently includes: about-ubuntu, faqamd64, faqi386, faqppc,
+    quicktour, and release-notes.
+
+ -- Jeff Bailey <[e-mail]>  Fri,  2 Sep 2005 01:55:34 -0400
+
+ubuntu-docs (5.10-0.0) breezy; urgency=low
+
+  * First release using new revision number scheme
+  * Currently only include releasenotes, aboutubuntu, and the faqguide
+
+ -- Matt T Galvin <[e-mail]>  Wed, 10 Aug 2005 20:37:21 -0400
+
+ubuntu-docs (1.0-1) hoary; urgency=low
+
+  * New release
+    (xh OMF files are now translated)
+  * Bump to 1.0 because this one wants to be the last upload for Hoary
+
+ -- Enrico Zini <[e-mail]>  Wed,  6 Apr 2005 15:03:50 +0200
+
+ubuntu-docs (0.7-1) hoary; urgency=low
+
+  * New release
+  * Added translated OMF files
+
+ -- Enrico Zini <[e-mail]>  Wed,  6 Apr 2005 14:20:26 +0200
+
+ubuntu-docs (0.6-1) hoary; urgency=low
+
+  * New release
+  * Translations updated
+  * quickguide file name changed
+  * Quickguide starts having translations as well
+
+ -- Enrico Zini <[e-mail]>  Tue,  5 Apr 2005 16:56:31 +0200
+
+ubuntu-docs (0.5-1) hoary; urgency=low
+
+  * New release
+  * Includes translations
+
+ -- Enrico Zini <[e-mail]>  Mon,  4 Apr 2005 15:52:27 +0200
+
+ubuntu-docs (0.4-1) hoary; urgency=low
+
+  * New release
+  * Reworked Debian packaging to install things according to Gnome standards
+
+ -- Enrico Zini <[e-mail]>  Thu, 24 Mar 2005 13:29:23 +0100
+
+ubuntu-docs (0.3-1) hoary; urgency=low
+
+  * New release
+  * Fixed the debian/ scripts to handle changes in the location of the release
+    notes
+  * ubuntu-docs conflicts with ubuntu-quickguide << 0.3 because an image has
+    been moved from the quickguide package to the ubuntu-docs package
+
+ -- Enrico Zini <[e-mail]>  Mon, 21 Mar 2005 11:16:12 +0100
+
+ubuntu-docs (0.2-1) hoary; urgency=low
+
+  * New release
+  * Added more OMF files; registration with scroolkeeper now works, but the
+    documents show up in the "Other" cathegory, which is suboptimal
+
+ -- Enrico Zini <[e-mail]>  Fri,  4 Mar 2005 15:42:16 +0100
+
+ubuntu-docs (0.1-1) hoary; urgency=low
+
+  * Initial release.
+
+ -- Enrico Zini <[e-mail]>  Tue, 30 Nov 2004 17:55:37 +0200

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2011-07-07 14:26:08 +0000
@@ -0,0 +1,1 @@
+5

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2011-07-07 14:26:08 +0000
@@ -0,0 +1,21 @@
+Source: ubuntu-docs
+Section: text
+Priority: optional
+Maintainer: Ubuntu Documentation Team <[e-mail]>
+Build-Depends: debhelper (>= 5.0.0), cdbs
+Build-Depends-Indep: gnome-doc-utils, pkg-config, gnome-common, automake1.10
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-doc/ubuntu-docs/oneiric
+Standards-Version: 3.8.1
+Homepage: https://launchpad.net/ubuntu-doc
+
+Package: ubuntu-docs
+Architecture: all
+Pre-Depends: dpkg (>= 1.10.24)
+Depends: scrollkeeper, yelp
+Conflicts: ubuntu-quickguide (<< 5.10), ubuntu-faqguide, edubuntu-docs (<< 9.04.1ubuntu1)
+Replaces: ubuntu-faqguide
+Description: The Ubuntu Documentation Project
+ This package holds the official Ubuntu-specific documentation, maintained 
+ by the Ubuntu Documentation Team. The documentation can  be viewed using
+ Yelp, the GNOME help browser.
+

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2011-07-07 14:26:08 +0000
@@ -0,0 +1,282 @@
+The current source is available under bzr, and it can be downloaded using:
+bzr branch lp:ubuntu-doc
+
+Upstream author: Ubuntu Documentation Team <[e-mail]>
+
+Copyright (C) 2004-2009 The Ubuntu Documentation Team
+
+License:
+
+All documents are licensed under Creative Commons ShareAlike 2.5 License
+(CC-BY-SA). All shell scripts and Makefiles are licensed under the GNU General
+Public License.
+
+--------------------------------------------------------------------------------------
+GNU General Public License:
+
+	This program is free software; you can redistribute it and/or modify it under
+	the terms of the GNU General Public License as published by the Free Software
+	Foundation; either version 2 of the License, or (at your option) any later
+	version.
+
+	This program is distributed in the hope that it will be useful, but WITHOUT ANY
+	WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+	PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+	On Debian systems, the complete text of the GNU General Public License can be
+	found in /usr/share/common-licenses/GPL-2 file.
+
+---------------------------------------------------------------------------------------
+
+Creative Commons Attribution-ShareAlike 2.5
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE
+BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
+CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+CONDITIONS.
+
+1. Definitions
+
+   1. "Collective Work" means a work, such as a periodical issue, anthology or
+encyclopedia, in which the Work in its entirety in unmodified form, along with
+a number of other contributions, constituting separate and independent works in
+themselves, are assembled into a collective whole. A work that constitutes a
+Collective Work will not be considered a Derivative Work (as defined below) for
+the purposes of this License.
+
+   2. "Derivative Work" means a work based upon the Work or upon the Work and
+other pre-existing works, such as a translation, musical arrangement,
+dramatization, fictionalization, motion picture version, sound recording, art
+reproduction, abridgment, condensation, or any other form in which the Work may
+be recast, transformed, or adapted, except that a work that constitutes a
+Collective Work will not be considered a Derivative Work for the purpose of
+this License. For the avoidance of doubt, where the Work is a musical
+composition or sound recording, the synchronization of the Work in
+timed-relation with a moving image ("synching") will be considered a Derivative
+Work for the purpose of this License.
+
+   3. "Licensor" means the individual or entity that offers the Work under the
+terms of this License.
+
+   4. "Original Author" means the individual or entity who created the Work.
+
+   5. "Work" means the copyrightable work of authorship offered under the terms
+of this License.
+
+   6. "You" means an individual or entity exercising rights under this License
+who has not previously violated the terms of this License with respect to the
+Work, or who has received express permission from the Licensor to exercise
+rights under this License despite a previous violation.
+
+   7. "License Elements" means the following high-level license attributes as
+selected by Licensor and indicated in the title of this License: Attribution,
+ShareAlike.
+
+2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or
+restrict any rights arising from fair use, first sale or other limitations on
+the exclusive rights of the copyright owner under copyright law or other
+applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor
+hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the
+duration of the applicable copyright) license to exercise the rights in the
+Work as stated below:
+
+   1. to reproduce the Work, to incorporate the Work into one or more
+Collective Works, and to reproduce the Work as incorporated in the Collective
+Works;
+
+   2. to create and reproduce Derivative Works;
+
+   3. to distribute copies or phonorecords of, display publicly, perform
+publicly, and perform publicly by means of a digital audio transmission the
+Work including as incorporated in Collective Works;
+   
+   4. to distribute copies or phonorecords of, display publicly, perform
+publicly, and perform publicly by means of a digital audio transmission
+Derivative Works.
+
+   5.
+
+      For the avoidance of doubt, where the work is a musical composition:
+
+	 1. Performance Royalties Under Blanket Licenses. Licensor waives the
+exclusive right to collect, whether individually or via a performance rights
+society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or
+public digital performance (e.g. webcast) of the Work.
+
+	 2. Mechanical Rights and Statutory Royalties. Licensor waives the
+exclusive right to collect, whether individually or via a music rights society
+or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You
+create from the Work ("cover version") and distribute, subject to the
+compulsory license created by 17 USC Section 115 of the US Copyright Act (or
+the equivalent in other jurisdictions).
+
+   6. Webcasting Rights and Statutory Royalties. For the avoidance of doubt,
+where the Work is a sound recording, Licensor waives the exclusive right to
+collect, whether individually or via a performance-rights society (e.g.
+SoundExchange), royalties for the public digital performance (e.g. webcast) of
+the Work, subject to the compulsory license created by 17 USC Section 114 of
+the US Copyright Act (or the equivalent in other jurisdictions).
+
+The above rights may be exercised in all media and formats whether now known or
+hereafter devised. The above rights include the right to make such
+modifications as are technically necessary to exercise the rights in other
+media and formats. All rights not expressly granted by Licensor are hereby
+reserved.
+
+4. Restrictions.The license granted in Section 3 above is expressly made
+subject to and limited by the following restrictions:
+
+   1. You may distribute, publicly display, publicly perform, or publicly
+digitally perform the Work only under the terms of this License, and You must
+include a copy of, or the Uniform Resource Identifier for, this License with
+every copy or phonorecord of the Work You distribute, publicly display,
+publicly perform, or publicly digitally perform. You may not offer or impose
+any terms on the Work that alter or restrict the terms of this License or the
+recipients' exercise of the rights granted hereunder. You may not sublicense
+the Work. You must keep intact all notices that refer to this License and to
+the disclaimer of warranties. You may not distribute, publicly display,
+publicly perform, or publicly digitally perform the Work with any technological
+measures that control access or use of the Work in a manner inconsistent with
+the terms of this License Agreement. The above applies to the Work as
+incorporated in a Collective Work, but this does not require the Collective
+Work apart from the Work itself to be made subject to the terms of this
+License. If You create a Collective Work, upon notice from any Licensor You
+must, to the extent practicable, remove from the Collective Work any credit as
+required by clause 4(c), as requested. If You create a Derivative Work, upon
+notice from any Licensor You must, to the extent practicable, remove from the
+Derivative Work any credit as required by clause 4(c), as requested.
+
+   2. You may distribute, publicly display, publicly perform, or publicly
+digitally perform a Derivative Work only under the terms of this License, a
+later version of this License with the same License Elements as this License,
+or a Creative Commons iCommons license that contains the same License Elements
+as this License (e.g. Attribution-ShareAlike 2.5 Japan). You must include a
+copy of, or the Uniform Resource Identifier for, this License or other license
+specified in the previous sentence with every copy or phonorecord of each
+Derivative Work You distribute, publicly display, publicly perform, or publicly
+digitally perform. You may not offer or impose any terms on the Derivative
+Works that alter or restrict the terms of this License or the recipients'
+exercise of the rights granted hereunder, and You must keep intact all notices
+that refer to this License and to the disclaimer of warranties. You may not
+distribute, publicly display, publicly perform, or publicly digitally perform
+the Derivative Work with any technological measures that control access or use
+of the Work in a manner inconsistent with the terms of this License Agreement.
+The above applies to the Derivative Work as incorporated in a Collective Work,
+but this does not require the Collective Work apart from the Derivative Work
+itself to be made subject to the terms of this License.
+
+   3. If you distribute, publicly display, publicly perform, or publicly
+digitally perform the Work or any Derivative Works or Collective Works, You
+must keep intact all copyright notices for the Work and provide, reasonable to
+the medium or means You are utilizing: (i) the name of the Original Author (or
+pseudonym, if applicable) if supplied, and/or (ii) if the Original Author
+and/or Licensor designate another party or parties (e.g. a sponsor institute,
+publishing entity, journal) for attribution in Licensor's copyright notice,
+terms of service or by other reasonable means, the name of such party or
+parties; the title of the Work if supplied; to the extent reasonably
+practicable, the Uniform Resource Identifier, if any, that Licensor specifies
+to be associated with the Work, unless such URI does not refer to the copyright
+notice or licensing information for the Work; and in the case of a Derivative
+Work, a credit identifying the use of the Work in the Derivative Work (e.g.,
+"French translation of the Work by Original Author," or "Screenplay based on
+original Work by Original Author"). Such credit may be implemented in any
+reasonable manner; provided, however, that in the case of a Derivative Work or
+Collective Work, at a minimum such credit will appear where any other
+comparable authorship credit appears and in a manner at least as prominent as
+such other comparable authorship credit.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK
+AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE
+MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT
+LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR
+PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY,
+OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME
+JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH
+EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN
+NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL,
+INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
+LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+   1. This License and the rights granted hereunder will terminate
+automatically upon any breach by You of the terms of this License. Individuals
+or entities who have received Derivative Works or Collective Works from You
+under this License, however, will not have their licenses terminated provided
+such individuals or entities remain in full compliance with those licenses.
+Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+
+   2. Subject to the above terms and conditions, the license granted here is
+perpetual (for the duration of the applicable copyright in the Work).
+Notwithstanding the above, Licensor reserves the right to release the Work
+under different license terms or to stop distributing the Work at any time;
+provided, however that any such election will not serve to withdraw this
+License (or any other license that has been, or is required to be, granted
+under the terms of this License), and this License will continue in full force
+and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+   1. Each time You distribute or publicly digitally perform the Work or a
+Collective Work, the Licensor offers to the recipient a license to the Work on
+the same terms and conditions as the license granted to You under this License.
+
+   2. Each time You distribute or publicly digitally perform a Derivative Work,
+Licensor offers to the recipient a license to the original Work on the same
+terms and conditions as the license granted to You under this License.
+
+   3. If any provision of this License is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of the
+remainder of the terms of this License, and without further action by the
+parties to this agreement, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.
+
+   4. No term or provision of this License shall be deemed waived and no breach
+consented to unless such waiver or consent shall be in writing and signed by
+the party to be charged with such waiver or consent.
+
+   5. This License constitutes the entire agreement between the parties with
+respect to the Work licensed here. There are no understandings, agreements or
+representations with respect to the Work not specified here. Licensor shall not
+be bound by any additional provisions that may appear in any communication from
+You. This License may not be modified without the mutual written agreement of
+the Licensor and You.
+
+Creative Commons is not a party to this License, and makes no warranty
+whatsoever in connection with the Work. Creative Commons will not be liable to
+You or any party on any legal theory for any damages whatsoever, including
+without limitation any general, special, incidental or consequential damages
+arising in connection to this license. Notwithstanding the foregoing two (2)
+sentences, if Creative Commons has expressly identified itself as the Licensor
+hereunder, it shall have all rights and obligations of Licensor.
+
+Except for the limited purpose of indicating to the public that the Work is
+licensed under the CCPL, neither party will use the trademark "Creative
+Commons" or any related trademark or logo of Creative Commons without the prior
+written consent of Creative Commons. Any permitted use will be in compliance
+with Creative Commons' then-current trademark usage guidelines, as may be
+published on its website or otherwise made available upon request from time to
+time.
+
+Creative Commons may be contacted at http://creativecommons.org/.
+

=== added file 'debian/docs'
--- debian/docs	1970-01-01 00:00:00 +0000
+++ debian/docs	2011-07-07 14:26:08 +0000
@@ -0,0 +1,1 @@
+COPYING

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2011-07-07 14:26:08 +0000
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_DH_BUILDDEB_ARGS := -- -Zbzip2
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
+DEB_DH_INSTALL_SOURCEDIR = debian/tmp
+
+makebuilddir/ubuntu-docs::
+	@gnome-autogen.sh --prefix=/usr --disable-scrollkeeper
+	@echo "---"
+	@make -C ubuntu-help -f Makefile pot
+	@echo "---"
+
+

=== added directory 'html'
=== added file 'html/Makefile'
--- html/Makefile	1970-01-01 00:00:00 +0000
+++ html/Makefile	2011-07-07 14:26:08 +0000
@@ -0,0 +1,53 @@
+####################################################################################           
+# Makefile for the GNOME Ubuntu Documentation
+# Copyright (C) 2005-2006 Ubuntu Documentation Project ([e-mail])
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version. 
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#    On Debian based systems a copy of the GPL can be found 
+#    at /usr/share/common-licenses/GPL
+#
+####################################################################################
+
+MAKECMD=make
+
+# Language code for documents
+# Ex. LN=ja for japanese
+LN=C
+
+# Ubuntu Mallard Customization Layer
+
+UBUNTUXSL=ubuntu.xsl
+
+ubuntu-help: clean style
+
+	./yelp-build html -o build -x $(UBUNTUXSL) ../ubuntu-help/$(LN)/
+# add html5 doctype header to html files
+# this can be removed once yelp-build does this for us
+	./add-html5-doctype.sh
+	./fix-urls.sh
+	# Workaround for a bug in yelp-build
+	rm -rf build/usr
+
+clean:
+	rm -rf build
+
+style:
+
+	# copy style sheet and common images to build directory
+	mkdir -p build/img
+	mkdir -p build/figures
+	cp img/* build/img/
+# figures are always in /C/ at this time
+	cp ../ubuntu-help/C/figures/* build/figures/
+

=== added file 'html/add-html5-doctype.sh'
--- html/add-html5-doctype.sh	1970-01-01 00:00:00 +0000
+++ html/add-html5-doctype.sh	2011-07-07 14:26:08 +0000
@@ -0,0 +1,24 @@
+####################################################################################           
+# Copyright (C) 2005-2011 Ubuntu Documentation Project ([e-mail])
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version. 
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#    On Debian based systems a copy of the GPL can be found 
+#    at /usr/share/common-licenses/GPL
+####################################################################################
+
+# This script will add the HTML5 doctype header to all html files in build/
+
+sed -i build/*.html -e '1i\
+\<!DOCTYPE html\>'
+

=== added file 'html/fix-urls.sh'
--- html/fix-urls.sh	1970-01-01 00:00:00 +0000
+++ html/fix-urls.sh	2011-07-07 14:26:08 +0000
@@ -0,0 +1,49 @@
+####################################################################################           
+# Copyright (C) 2005-2006 Ubuntu Documentation Project ([e-mail])
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version. 
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#    On Debian based systems a copy of the GPL can be found 
+#    at /usr/share/common-licenses/GPL
+####################################################################################
+
+## ghelp links
+
+ 	sed -i build/*.html -e "s#ghelp:brasero#http://library\.gnome\.org/users/brasero/2\.32/#g"
+ 	sed -i build/*.html -e "s#ghelp:cheese#http://library\.gnome\.org/users/cheese/2\.32/#g"
+ 	sed -i build/*.html -e "s#ghelp:empathy#http://library\.gnome\.org/users/empathy/2\.32/#g"
+ 	sed -i build/*.html -e "s#ghelp:evolution?usage-calendar#http://library\.gnome\.org/users/evolution/stable/usage-calendar\.html#g"
+ 	sed -i build/*.html -e "s#ghelp:gucharmap#http://library\.gnome\.org/users/gucharmap/2\.32/#g"
+ 	sed -i build/*.html -e "s#ghelp:orca#http://library\.gnome\.org/users/orca/3\.0/#g"
+ 	sed -i build/*.html -e "s#ghelp:synaptic#https://help\.ubuntu\.com/community/SynapticHowto#g"
+ 	sed -i build/*.html -e "s#ghelp:software-center#https://help\.ubuntu\.com/11\.04/software-center/C/index\.html#g"
+ 	sed -i build/*.html -e "s#ghelp:gnome-classic-index#https://help\.ubuntu\.com/11\.04/ubuntu-classic/gnome-classic-index/C/index\.html#g"
+ 	sed -i build/*.html -e "s#ghelp:language-selector#https://help\.ubuntu\.com/11\.04/language-selector/C/index\.html#g"
+
+## Icons
+
+ 	sed -i build/*.html -e "s#/usr/share/icons/gnome/apps/22/preferences-desktop-accessibility\.svg#img/preferences-desktop-accessibility\.svg#g"
+ 	sed -i build/*.html -e "s#/usr/share/icons/ubuntu-mono-light/status/24/bluetooth-active\.svg#img/bluetooth-active\.svg#g"
+ 	sed -i build/*.html -e "s#/usr/share/icons/ubuntu-mono-light/status/24/bluetooth-active\.svg#img/bluetooth-active\.svg#g"
+ 	sed -i build/*.html -e "s#/usr/share/icons/ubuntu-mono-light/status/24/battery-100\.svg#img/battery-100\.svg#g"
+ 	sed -i build/*.html -e "s#/usr/share/icons/ubuntu-mono-light/status/24/network-offline\.svg#img/network-offline\.svg#g"
+ 	sed -i build/*.html -e "s#/usr/share/icons/ubuntu-mono-light/status/24/audio-volume-high-panel\.svg#img/audio-volume-high-panel\.svg#g"
+ 	sed -i build/*.html -e "s#/usr/share/icons/ubuntu-mono-light/status/24/indicator-messages\.svg#img/indicator-messages\.svg#g"
+ 	sed -i build/*.html -e "s#/usr/share/icons/ubuntu-mono-light/status/24/user-offline-panel\.svg#img/user-offline-panel\.svg#g"
+ 	sed -i build/*.html -e "s#/usr/share/icons/ubuntu-mono-light/actions/24/system-shutdown-panel\.svg#img/system-shutdown-panel\.svg#g"
+
+## Search for unfixed ghelp links
+echo "\nSearching for unfixed ghelp links:"
+grep -r "href=\"ghelp:" build/
+
+exit 0

=== added directory 'html/img'
=== added file 'html/img/audio-volume-high-panel.svg'
--- html/img/audio-volume-high-panel.svg	1970-01-01 00:00:00 +0000
+++ html/img/audio-volume-high-panel.svg	2011-07-07 14:26:08 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg3814" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata3819">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(0,8)">
+  <path id="rect3180-0" d="m8.0134-2.3842e-8c-0.30522 0-0.56653 0.12796-0.75 0.34375l-2.25 2.6562h-2c-0.552 0-1 0.448-1 1-0.00627 0.99607 0.00222 2.0145 0 3 0 0.552 0.448 1 1 1h2l2.1562 2.4688c0.1714 0.305 0.4693 0.531 0.8438 0.531 0.552 0 1-0.448 1-1v-9c0-0.552-0.448-1-1-1z" style="opacity:.3;fill-rule:evenodd;fill:#fff"/>
+  <path id="path3209-4" d="m17.868-2.15s2.6135 2.4227 2.6135 7.6349c0 5.1866-2.618 7.6651-2.618 7.6651m-2.971-13.055s1.8454 1.7448 1.7797 5.4045c-0.0662 3.6901-1.8093 5.4045-1.8093 5.4045m-3-8.6827s0.98347 0.79498 1.0085 3.2306c0.02476 2.4053-1.0085 3.3256-1.0085 3.3256" style="opacity:.3;stroke-width:1.7;stroke:#fff;stroke-linecap:round;fill:none"/>
+  <path id="path3209" d="m17.868-3.15s2.6135 2.4227 2.6135 7.6349c0 5.1866-2.618 7.6651-2.618 7.6651m-2.971-13.055s1.8454 1.7448 1.7797 5.4045c-0.0662 3.6901-1.8093 5.4045-1.8093 5.4045m-3-8.6827s0.98347 0.79498 1.0085 3.2306c0.02476 2.4053-1.0085 3.3256-1.0085 3.3256" style="stroke-width:1.7;stroke:#3c3c3c;stroke-linecap:round;fill:none"/>
+  <path id="rect3180" d="m8.0134-1c-0.30522 0-0.56653 0.12796-0.75 0.34375l-2.25 2.6562h-2c-0.552 0-1 0.448-1 1-0.00627 0.99607 0.00222 2.0145 0 3 0 0.552 0.448 1 1 1h2l2.1562 2.4688c0.1714 0.3049 0.4693 0.5312 0.8438 0.5312 0.552 0 1-0.448 1-1v-9c0-0.552-0.448-1-1-1z" style="fill-rule:evenodd;fill:#3c3c3c"/>
+ </g>
+</svg>

=== added file 'html/img/battery-100.svg'
--- html/img/battery-100.svg	1970-01-01 00:00:00 +0000
+++ html/img/battery-100.svg	2011-07-07 14:26:08 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg3014" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata3019">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path id="rect2401-5" d="m7 7c-1.108 0-2 0.892-2 2v8c0 1.108 0.892 2 2 2h18c1.108 0 2-0.892 2-2v-1h0.38433c1.108 0 1.616-0.892 1.616-2v-2c0-1.108-0.42558-2-1.5336-2h-0.466v-1c0-1.108-0.892-2-2-2zm0 1h18c0.554 0 1 0.446 1 1v8c0 0.554-0.446 1-1 1h-18c-0.554 0-1-0.446-1-1v-8c0-0.554 0.446-1 1-1zm20 3c0.59742 0 1 0.051 1 1v2c0 0.9914-0.40645 1-1 1z" style="opacity:.3;fill:#fff"/>
+ <rect id="rect3190-4" style="opacity:.3;fill-rule:evenodd;fill:#fff" rx=".5" ry=".5" transform="rotate(90)" width="8" y="-25" x="9" height="18"/>
+ <path id="rect2401" d="m7 6c-1.108 0-2 0.892-2 2v8c0 1.108 0.892 2 2 2h18c1.108 0 2-0.892 2-2v-1h0.38433c1.108 0 1.616-0.892 1.616-2v-2c0-1.108-0.426-2-1.534-2h-0.466v-1c0-1.108-0.892-2-2-2zm0 1h18c0.554 0 1 0.446 1 1v8c0 0.554-0.446 1-1 1h-18c-0.554 0-1-0.446-1-1v-8c0-0.554 0.446-1 1-1zm20 3c0.59742 0 1 0.051 1 1v2c0 0.9914-0.40645 1-1 1z" style="fill:#3c3c3c"/>
+ <rect id="rect3192" style="opacity:.3;stroke-width:0.5;stroke:#3c3c3c;stroke-linecap:round;fill:none" rx=".75" ry=".75" height="9.5" width="19.5" y="7.25" x="6.25"/>
+ <rect id="rect3190" style="fill-rule:evenodd;fill:#3c3c3c" rx=".5" ry=".5" transform="rotate(90)" width="8" y="-25" x="8" height="18"/>
+</svg>

=== added file 'html/img/bg-content.png'
Binary files html/img/bg-content.png	1970-01-01 00:00:00 +0000 and html/img/bg-content.png	2011-07-07 14:26:08 +0000 differ
=== added file 'html/img/bg-page.png'
Binary files html/img/bg-page.png	1970-01-01 00:00:00 +0000 and html/img/bg-page.png	2011-07-07 14:26:08 +0000 differ
=== added file 'html/img/bluetooth-active.svg'
--- html/img/bluetooth-active.svg	1970-01-01 00:00:00 +0000
+++ html/img/bluetooth-active.svg	2011-07-07 14:26:08 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg3213" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata12">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(-1 -.00025397)">
+  <g id="g3790" style="opacity:.3;stroke:#fff" transform="translate(0 1.0003)">
+   <path id="path3367-2" style="stroke-linejoin:round;stroke:#fff;stroke-linecap:round;stroke-width:1.4115;fill:none" d="m11.789 19.294 3.505-3.74-6.5883-6.6311m-1e-7 6.0661 6.5885-6.6311-3.5516-3.6521"/>
+   <path id="path3590-1" style="stroke:#fff;stroke-linecap:round;stroke-width:1px;fill:none" d="m11.507 4.8749 0.08824 14.156"/>
+  </g>
+  <path id="path3367" style="stroke-linejoin:round;stroke:#3c3c3c;stroke-linecap:round;stroke-width:1.4115;fill:none" d="m11.789 19.294 3.505-3.74-6.5883-6.6311m-1e-7 6.0661 6.5885-6.6311-3.5516-3.6521"/>
+  <path id="path3590" style="stroke:#3c3c3c;stroke-linecap:round;stroke-width:1px;fill:none" d="m11.507 4.8749 0.08824 14.156"/>
+ </g>
+</svg>

=== added file 'html/img/cap-bottom.png'
Binary files html/img/cap-bottom.png	1970-01-01 00:00:00 +0000 and html/img/cap-bottom.png	2011-07-07 14:26:08 +0000 differ
=== added file 'html/img/cap-top.png'
Binary files html/img/cap-top.png	1970-01-01 00:00:00 +0000 and html/img/cap-top.png	2011-07-07 14:26:08 +0000 differ
=== added file 'html/img/header.png'
Binary files html/img/header.png	1970-01-01 00:00:00 +0000 and html/img/header.png	2011-07-07 14:26:08 +0000 differ
=== added file 'html/img/headerlogo.png'
Binary files html/img/headerlogo.png	1970-01-01 00:00:00 +0000 and html/img/headerlogo.png	2011-07-07 14:26:08 +0000 differ
=== added file 'html/img/help-about.png'
Binary files html/img/help-about.png	1970-01-01 00:00:00 +0000 and html/img/help-about.png	2011-07-07 14:26:08 +0000 differ
=== added file 'html/img/indicator-messages.svg'
--- html/img/indicator-messages.svg	1970-01-01 00:00:00 +0000
+++ html/img/indicator-messages.svg	2011-07-07 14:26:08 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg3229" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata9">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path id="rect3170-2" d="m4.305 7.0221c-0.6094 0-1.305 0.7602-1.305 1.3142v9.2987c0 0.731 0.7889 1.365 1.4535 1.365h15.048c0.798 0 1.498-0.678 1.498-1.376v-9.1594c0-0.7756-0.689-1.4646-1.409-1.4646l-15.286 0.0221zm0.5388 1.1341 6.8442 6.8438h0.59375l6.875-6.8438 0.6875 0.6875-4.094 4.1563 3.0938 3.1562-0.6875 0.6875-3.156-3.156-2.281 2.312h-1.438l-2.281-2.312-3.1562 3.187-0.6876-0.719 3.125-3.156-4.125-4.1562 0.6876-0.6876z" style="opacity:.3;fill:#fff"/>
+ <path id="rect3170" d="m4.305 6.0221c-0.6094 0-1.305 0.7602-1.305 1.3142v9.2987c0 0.731 0.7889 1.365 1.4535 1.365h15.048c0.798 0 1.498-0.678 1.498-1.376v-9.1594c0-0.7756-0.689-1.4646-1.409-1.4646l-15.286 0.0221zm0.5388 1.1341 6.8442 6.8438h0.59375l6.875-6.8438 0.6875 0.6875-4.094 4.1563 3.0938 3.1562-0.6875 0.6875-3.156-3.156-2.281 2.312h-1.438l-2.281-2.312-3.1562 3.187-0.6876-0.719 3.125-3.156-4.125-4.1562 0.6876-0.6876z" style="fill:#3c3c3c"/>
+</svg>

=== added file 'html/img/network-offline.svg'
--- html/img/network-offline.svg	1970-01-01 00:00:00 +0000
+++ html/img/network-offline.svg	2011-07-07 14:26:08 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg3883" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata3888">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path id="path3683-6-6" d="m11.918 19.854-9.068-9.038s2.8978-3.2944 9.132-3.2944c6.2036 0 9.168 3.3 9.168 3.3z" style="opacity:.3;stroke-linejoin:round;stroke:#fff;stroke-linecap:round;fill:none"/>
+ <path id="path3683-6" d="m11.918 18.854-9.068-9.0379s2.8978-3.2944 9.132-3.2944c6.2036 0 9.168 3.3 9.168 3.3z" style="stroke-linejoin:round;stroke:#3c3c3c;stroke-linecap:round;fill:none"/>
+ <path id="path3868" d="m11.969 7.2812c-2.9839 0-5.1262 0.79512-6.5312 1.5625-1.0022 0.5473-1.1762 0.8107-1.4378 1.0625l7.9062 7.875 8.094-7.906c-0.273-0.2552-0.458-0.4861-1.469-1.0312-1.426-0.7692-3.594-1.5626-6.562-1.5626z" style="opacity:.3;stroke-linejoin:round;stroke-width:.5;stroke:#3c3c3c;stroke-linecap:round;fill:none"/>
+</svg>

=== added file 'html/img/system-shutdown-panel.svg'
--- html/img/system-shutdown-panel.svg	1970-01-01 00:00:00 +0000
+++ html/img/system-shutdown-panel.svg	2011-07-07 14:26:08 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg3194" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata8">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path id="path3341-5" style="opacity:.3;stroke:#fff;stroke-linecap:round;stroke-width:1.9;fill:none" d="m8.8428 8.45c-5.2339 2.742-2.8672 10.6 3.1162 10.6 5.9212 0 8.575-7.4496 3.1164-10.6m-3.125 3.55v-6.0059"/>
+ <path id="path3341" style="stroke:#3c3c3c;stroke-linecap:round;stroke-width:1.9;fill:none" d="m8.8428 7.45c-5.2339 2.7422-2.8671 10.6 3.1164 10.6 5.9212 0 8.575-7.4496 3.1164-10.6m-3.126 3.55v-6.0059"/>
+</svg>

=== added file 'html/img/tab_off_ns1.png'
Binary files html/img/tab_off_ns1.png	1970-01-01 00:00:00 +0000 and html/img/tab_off_ns1.png	2011-07-07 14:26:08 +0000 differ
=== added file 'html/img/tab_off_ns2.png'
Binary files html/img/tab_off_ns2.png	1970-01-01 00:00:00 +0000 and html/img/tab_off_ns2.png	2011-07-07 14:26:08 +0000 differ
=== added file 'html/img/tab_on_ns1.png'
Binary files html/img/tab_on_ns1.png	1970-01-01 00:00:00 +0000 and html/img/tab_on_ns1.png	2011-07-07 14:26:08 +0000 differ
=== added file 'html/img/tab_on_ns2.png'
Binary files html/img/tab_on_ns2.png	1970-01-01 00:00:00 +0000 and html/img/tab_on_ns2.png	2011-07-07 14:26:08 +0000 differ
=== added file 'html/img/u-header.png'
Binary files html/img/u-header.png	1970-01-01 00:00:00 +0000 and html/img/u-header.png	2011-07-07 14:26:08 +0000 differ
=== added file 'html/img/ubuntuheader.png'
Binary files html/img/ubuntuheader.png	1970-01-01 00:00:00 +0000 and html/img/ubuntuheader.png	2011-07-07 14:26:08 +0000 differ
=== added file 'html/img/user-offline-panel.svg'
--- html/img/user-offline-panel.svg	1970-01-01 00:00:00 +0000
+++ html/img/user-offline-panel.svg	2011-07-07 14:26:08 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg2816" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata8">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path id="path2396-7" style="opacity:.3;fill-rule:evenodd;fill:#fff" d="m11.5 6c-4.14 0-7.5 3.36-7.5 7.5s3.36 7.5 7.5 7.5c1.9648 0 3.7561-0.76222 5.0938-2h5.406l-3.344-3.344c0.208-0.687 0.344-1.401 0.344-2.156 0-4.14-3.36-7.5-7.5-7.5zm-2.1875 4 2.1875 2.25 2.25-2.219 1.25 1.281-2.25 2.188 2.219 2.25-1.281 1.25-2.188-2.25-2.25 2.219-1.25-1.281 2.25-2.188-2.2188-2.25 1.2813-1.25z"/>
+ <path id="path2396" style="fill-rule:evenodd;fill:#3c3c3c" d="m11.5 5c-4.14 0-7.5 3.36-7.5 7.5s3.36 7.5 7.5 7.5c1.9648 0 3.7561-0.76222 5.0938-2h5.406l-3.344-3.344c0.208-0.687 0.344-1.401 0.344-2.156 0-4.14-3.36-7.5-7.5-7.5zm-2.1875 4 2.1875 2.25 2.25-2.2188 1.25 1.2808-2.25 2.188 2.219 2.25-1.281 1.25-2.188-2.25-2.25 2.219-1.25-1.281 2.25-2.188-2.2188-2.25 1.2813-1.25z"/>
+</svg>

=== added file 'html/ubuntu.xsl'
--- html/ubuntu.xsl	1970-01-01 00:00:00 +0000
+++ html/ubuntu.xsl	2011-07-07 14:26:08 +0000
@@ -0,0 +1,436 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:html="http://www.w3.org/1999/xhtml"
+                xmlns:exsl="http://exslt.org/common"
+                xmlns:set="http://exslt.org/sets"
+                xmlns="http://www.w3.org/1999/xhtml"
+                exclude-result-prefixes="html set"
+                extension-element-prefixes="exsl"
+                version="1.0">
+
+<xsl:param name="color.gray_background" select="'#f7f6f5'"/>
+<xsl:param name="color.gray_border" select="'#ccc1c1'"/>
+<xsl:param name="color.blue_background" select="'#f7f6f5'"/>
+<xsl:param name="color.blue_border" select="'#ccc1c1'"/>
+<xsl:param name="color.yellow_background" select="'#f7f6f5'"/>
+<xsl:param name="color.yellow_border" select="'#ccc1c1'"/>
+<xsl:param name="color.red_background" select="'#f7f6f5'"/>
+<xsl:param name="color.red_border" select="'#ccc1c1'"/>
+
+<xsl:param name="color.text" select="'#333333'"/>
+<xsl:param name="color.text_light" select="'#aea79f'"/>
+<xsl:param name="color.link" select="'#dd4814'"/>
+<xsl:param name="color.link_visited" select="'#dd4814'"/>
+
+<xsl:template name="html.css.custom">
+  <xsl:param name="node" select="."/>
+  <xsl:param name="direction">
+    <xsl:call-template name="l10n.direction"/>
+  </xsl:param>
+  <xsl:param name="left">
+    <xsl:call-template name="l10n.align.start">
+      <xsl:with-param name="direction" select="$direction"/>
+    </xsl:call-template>
+  </xsl:param>
+  <xsl:param name="right">
+    <xsl:call-template name="l10n.align.end">
+      <xsl:with-param name="direction" select="$direction"/>
+    </xsl:call-template>
+  </xsl:param>
+  <xsl:text>
+
+body {
+ background: #d3caaa url(img/bg-page.png) repeat-x top;
+ margin: 20px;
+ padding: 0;
+ font-size: 90%;
+ font-family:"Helvetica Neue", "Lucida Grande", Helvetica, Arial, Verdana, sans-serif;
+ color:#000;
+ max-width: 100%;
+ position: relative;
+}
+#round {
+	background: #fff url(img/bg-content.png) repeat-y top;
+	width: 876px;
+	margin: auto;
+	margin-bottom: 50px;
+	position: relative;
+}
+#round .sb-inner {
+	background-color: #fff;
+}
+#page {
+	clear: both;
+	margin: 0;
+	padding: 10px 30px;
+}
+#content {
+	padding: 12px;
+}
+img.ubuntulogo {
+	margin: 20px;
+}
+#topcap {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+#bottomcap {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+}
+#header {
+	padding-top: 12px;
+}
+#header h1 {
+	display: inline;
+}
+#header h1 span {
+	display: none;
+}
+#logo-floater {
+	width: 225px;
+	float: left;
+	padding: 10px;
+}
+#logo-floater h1 {
+	border: none;
+}
+#sitename a {
+	position: relative;
+	top: 35px;
+	float: right;
+	font-size: 1.5em;
+	padding-right: 20px;
+	text-decoration: none;
+	color: black;
+}
+#sitename span {
+	padding-left: 5px;
+}
+#cse-search-box {
+	position: absolute;
+	right: 3px;
+	top: 3px;
+	/* float: right; */
+	margin: 5px 10px;
+	padding: 0;
+	white-space: nowrap;
+	font-size: 13px;
+}
+#cse-search-box form div {
+    display: inline;
+}
+/* Links */
+a, a:visited {
+	color: #D90D19;
+}
+a:hover {
+	color: #800000;
+}
+/* Headings */
+h1, h2, h3, h4, h5, h6
+{
+        margin: 0;
+        padding: 2px 0;
+        font-weight: normal; 
+        color: #5A3320;
+        line-height: 1.2em;
+}	
+h1
+{
+        border-bottom: 2px solid #6d4c07; /* ubuntu dark brown */
+	font-size: 1.6em;
+}
+h2
+{
+        border-bottom: 1px solid #6d4c07; /* ubuntu dark brown */
+	font-size: 1.4em;
+}
+h3 {font-size: 1.3em;}
+h4 {font-size: 1.1em;}
+h4, h5, h6 {font-size: 1em;}
+#footer {
+	margin: 0;
+	font-size: 90%;
+	color: #444;
+}
+#ubuntulinks {
+	text-align: center;
+}
+li {
+  margin: 16px 0 0 0;
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 16px;
+  -webkit-margin-start: 16px; -webkit-margin-end: 0;
+  -moz-margin-start: 16px; -moz-margin-end: 0;
+}
+dt { margin-top: 16px; }
+dt:first-child { margin-top: 0; }
+dt + dt { margin-top: 0; }
+dd {
+  margin: 8px 0 0 0;
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 16px;
+  -webkit-margin-start: 16px; -webkit-margin-end: 0;
+  -moz-margin-start: 16px; -moz-margin-end: 0;
+}
+ol.compact li { margin-top: 8px; }
+ul.compact li { margin-top: 8px; }
+ol.compact li:first-child { margin-top: 0; }
+ul.compact li:first-child { margin-top: 0; }
+dl.compact dt { margin-top: 8px; }
+dl.compact dt:first-child { margin-top: 0; }
+dl.compact dt + dt { margin-top: 0; }
+
+div.title { margin: 0 0 8px 0; }
+div.desc { margin: 0 0 8px 0; }
+div.contents + div.desc { margin: 8px 0 0 0; }
+pre.contents { padding: 8px; }
+li.links {
+  margin: 8px 0 8px 0;
+  padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 16px;
+}
+div.sectionlinks { padding: 0 16px 0 16px; }
+div.sectionlinks div.title { margin: 8px 0 8px 0; }
+div.sectionlinks div.sectionlinks { margin: 8px 0 0 0; }
+div.sectionlinks div.sectionlinks li {
+  padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 16px;
+}
+div.nextlinks {
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 16px;
+}
+div.serieslinks { padding: 0 16px 0 16px; }
+div.serieslinks div.title { margin: 8xp 0 8px 0; }
+pre.numbered {
+  padding: 8px;
+  margin-</xsl:text><xsl:value-of select="$right"/><xsl:text>: 8px;
+}
+div.figure {
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 16px;
+  -webkit-margin-start: 16px;
+  -moz-margin-start: 16px;
+  padding: 4px;
+}
+div.figure > div.inner > div.contents {
+  padding: 8px 16px 8px 16px;
+}
+div.list > div.title { margin-bottom: 8px; }
+div.note { padding: 8px; }
+div.note > div.inner > div.title {
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: </xsl:text>
+    <xsl:value-of select="$icons.size.note + 8"/><xsl:text>px;
+}
+div.note > div.inner > div.contents {
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: </xsl:text>
+    <xsl:value-of select="$icons.size.note + 8"/><xsl:text>px;
+}
+div.note-sidebar {
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 8px;
+  padding: 8px;
+}
+div.quote > div.inner > div.title { margin: 0 0 8px 0; }
+div.quote > div.inner > div.cite { margin-top: 8px; }
+ol.steps, ul.steps {
+  padding: 8px 16px 8px 16px;
+}
+li.steps {
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 16px;
+  -webkit-margin-start: 16px;
+  -moz-margin-start: 16px;
+}
+li.steps li.steps {
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 32px;
+  -webkit-margin-start: 32px;
+  -moz-margin-start: 32px;
+}
+div.synopsis > div.inner > div.contents, div.synopsis > pre.contents {
+  padding: 8px 16px 8px 16px;
+}
+span.cmd { padding: 0 4px 0 4px; }
+span.key { padding: 0 4px 0 4px; }
+div.media-ttml-p {
+  margin: 8px 0 0 0;
+  padding: 8px;
+}
+div.floatleft { margin-right: 16px; }
+div.floatright { margin-left: 16px; }
+div.floatstart {
+  margin-</xsl:text><xsl:value-of select="$right"/><xsl:text>: 16px;
+}
+div.floatend {
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 16px;
+}
+ul.mouseovers a { padding: 6px; }
+table.toronto td {
+  padding-top: 16px;
+  padding-</xsl:text><xsl:value-of select="$right"/><xsl:text>: 16px;
+}
+td.twocolumnright {
+  padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 16px;
+  -webkit-padding-start: 16px;
+  -moz-padding-start: 16px;
+}
+div.linkdiv div.title { font-size: 12px; }
+div.linkdiv {
+  padding: 8px;
+  -moz-border-radius: 0px;
+  border: solid 1px </xsl:text>
+    <xsl:value-of select="$color.background"/><xsl:text>;
+}
+div.example {
+  padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 16px;
+}
+div.comment { padding: 8px; }
+div.comment div.comment { margin: 16px 16px 0 16px; }
+div.comment div.cite { margin: 0 0 8px 0; }
+ul.tree ul.tree {
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 16px;
+  -webkit-margin-start: 16px;
+  -moz-margin-start: 16px;
+}
+div.facets { padding: 8px; } 
+div.facet {
+  margin-bottom: 16px;
+  margin-</xsl:text><xsl:value-of select="$right"/><xsl:text>: 16px;
+}
+
+</xsl:text>
+</xsl:template>
+
+<xsl:template name="html.page">
+  <xsl:param name="node" select="."/>
+  <html>
+    <head>
+      <title>
+        <xsl:apply-templates mode="html.title.mode" select="$node"/>
+      </title>
+      <xsl:call-template name="html.css"/>
+      <xsl:call-template name="html.js"/>
+      <xsl:call-template name="html.head.custom"/>
+    </head>
+    <body>
+     <div id="round">
+     <img id="topcap" alt="" src="https://help.ubuntu.com/htdocs/ubuntunew/img/cap-top.png" />
+     <div id="layout" class="container clear-block">
+      <xsl:apply-templates mode="html.body.attr.mode" select="$node"/>
+      <script src="https://ssl.google-analytics.com/urchin.js"
+      type="text/javascript"></script>
+      <script type="text/javascript">
+      _uacct = "UA-1018242-8";
+      urchinTracker();
+      </script>
+      <div id="header">
+      <div id="logo-floater">
+       <h1><a href="https://help.ubuntu.com" title="Ubuntu Documentation"><img alt="Ubuntu" id="logo" src="https://help.ubuntu.com/htdocs/ubuntunew/img/logo.png" /></a>
+       </h1>
+      </div> <!-- logo-floater -->
+
+      <!-- Provide a search box for clients with and without javascript -->
+      <noscript>
+       <form action="http://www.google.com/cse" id="cse-search-box">
+        <div>
+         <input type="hidden" name="cx" value="004599128559784038176:vj_p0xo-nng" />
+         <input type="hidden" name="ie" value="UTF-8" />
+         <input type="text" name="q" size="27" />
+         <input type="submit" name="sa" value="Search" />
+        </div>
+       </form>
+      </noscript>
+
+      <!-- Search box -->
+      <script>
+       document.write('<form action="https://help.ubuntu.com/search.html" id="cse-search-box">');
+       document.write('  <div>');
+       document.write('    <input type="hidden" name="cof" value="FORID:9" />');
+       document.write('    <input type="hidden" name="cx" value="004599128559784038176:vj_p0xo-nng" />');
+       document.write('    <input type="hidden" name="ie" value="UTF-8" />');
+       document.write('    <input type="text" name="q" size="27" />');
+       document.write('    <input type="submit" name="sa" value="Search" />');
+       document.write('  </div>');
+       document.write('</form>');
+      </script>
+      <div id="sitename"><a href="https://help.ubuntu.com/"><img alt="Official Documentation" src="https://help.ubuntu.com/htdocs/ubuntunew/img/help-about.png" /><span>Official Documentation</span></a>
+      </div> <!-- sitename -->
+      </div> <!-- header -->
+      <div id="page">
+        <xsl:apply-templates mode="html.header.mode" select="$node"/>
+      <div id="content">
+        <xsl:apply-templates mode="html.body.mode" select="$node"/>
+      </div> <!-- content -->
+      <hr />
+      <div id="footer">
+       <div id="ubuntulinks">
+	<p>The material in this document is available under a free license, see <a href="/legal.html">Legal</a> for details<br />
+	For information on contributing see the <a href="https://wiki.ubuntu.com/DocumentationTeam">Ubuntu Documentation Team wiki page</a>. To report a problem, visit the <a href="https://bugs.launchpad.net/ubuntu/+source/ubuntu-docs">bug page for Ubuntu Documentation</a></p>
+       </div> <!-- ubuntulinks -->
+      <br />
+      </div> <!-- footer -->
+      <div id="bottomcap">
+	<img src="https://help.ubuntu.com/htdocs/ubuntunew/img/cap-bottom.png" alt=""/>
+      </div> <!-- bottomcap -->
+      </div> <!-- page -->
+      </div> <!-- layout -->
+      </div> <!-- round -->
+    </body>
+  </html>
+</xsl:template>
+
+<xsl:template name="mal2html.page.linktrails.trail">
+  <xsl:param name="node" select="."/>
+  <div class="trail">
+    <a href="https://help.ubuntu.com" class="trail">Ubuntu Documentation</a>
+  <xsl:variable name="direction">
+    <xsl:call-template name="l10n.direction"/>
+  </xsl:variable>
+  <xsl:choose>
+    <xsl:when test="$direction = 'rtl'">
+      <xsl:choose>
+        <xsl:when test="$node/@child = 'section'">
+          <xsl:text>&#x00A0;‹ </xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>&#x00A0;« </xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:choose>
+        <xsl:when test="$node/@child = 'section'">
+          <xsl:text>&#x00A0;› </xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>&#x00A0;» </xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:otherwise>
+  </xsl:choose>
+    <a href="https://help.ubuntu.com/11.04" class="trail">Ubuntu 11.04</a>
+  <xsl:choose>
+    <xsl:when test="$direction = 'rtl'">
+      <xsl:choose>
+        <xsl:when test="$node/@child = 'section'">
+          <xsl:text>&#x00A0;‹ </xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>&#x00A0;« </xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:choose>
+        <xsl:when test="$node/@child = 'section'">
+          <xsl:text>&#x00A0;› </xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>&#x00A0;» </xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:otherwise>
+  </xsl:choose>
+
+    <xsl:call-template name="mal2html.page.linktrails.link">
+      <xsl:with-param name="node" select="$node"/>
+    </xsl:call-template>
+  </div>
+</xsl:template>
+
+</xsl:stylesheet>

=== added file 'html/yelp-build'
--- html/yelp-build	1970-01-01 00:00:00 +0000
+++ html/yelp-build	2011-07-07 14:26:08 +0000
@@ -0,0 +1,505 @@
+#!/bin/sh
+# yelp-build
+# Copyright (C) 2010 Shaun McCance <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+xsl_mal_cache='/usr/share/yelp-xsl/xslt/mallard/cache/mal-cache.xsl'
+xsl_db2html='/usr/share/yelp-xsl/xslt/docbook/html/db2html.xsl'
+xsl_db2xhtml='/usr/share/yelp-xsl/xslt/docbook/html/db2xhtml.xsl'
+xsl_mal2html='/usr/share/yelp-xsl/xslt/mallard/html/mal2html.xsl'
+xsl_mal2xhtml='/usr/share/yelp-xsl/xslt/mallard/html/mal2xhtml.xsl'
+yelp_icon_dir='/usr/share/yelp-xsl/icons/hicolor/24x24/status'
+yelp_js_dir='/usr/share/yelp-xsl/js'
+
+mkdir_p () {
+    if [ ! -d "$1" ]; then
+        mkdir_p `dirname "$1"`
+        mkdir "$1"
+    fi
+}
+
+urlencode () {
+    echo "$1" | LANG=C awk '
+BEGIN {
+  for (i = 1; i <= 255; i++) chars[sprintf("%c", i)] = i;
+}
+{
+  ret = "";
+  for (i = 1; i <= length($0); i++) {
+    c = substr($0, i, 1);
+    if (c ~ /[\/a-zA-Z0-9._-]/)
+      ret = ret c;
+    else
+      ret = ret sprintf("%%%X%X", int(chars[c] / 16), chars[c] % 16);
+  }
+  print ret;
+}'
+}
+
+urldecode () {
+    echo "$1" | LANG=C awk '
+BEGIN {
+  for(i = 0; i < 10; i++) hex[i] = i;
+  hex["A"] = hex["a"] = 10;
+  hex["B"] = hex["b"] = 11;
+  hex["C"] = hex["c"] = 12;
+  hex["D"] = hex["d"] = 13;
+  hex["E"] = hex["e"] = 14;
+  hex["F"] = hex["f"] = 15;
+}
+{
+  ret = "";
+  for (i = 1; i <= length($0); i++) {
+    c = substr($0, i, 1);
+    if (c == "+") {
+      ret = ret " ";
+    }
+    else if (c == "%") {
+      c = sprintf("%c", hex[substr($0, i + 1, 1)] * 16 + hex[substr($0, i + 2, 1)]);
+      ret = ret c;
+      i += 2;
+    }
+    else {
+      ret = ret c;
+    }
+  }
+  print ret;
+}'
+}
+
+yelp_usage () {
+    (
+        echo "Usage: yelp-build <COMMAND> [OPTIONS] [FILES]"
+        echo ""
+        echo "Commands:"
+        echo "  cache         Create a Mallard cache file"
+        echo "  html          Convert input files to HTML"
+        echo "  xhtml         Convert input files to XHTML"
+    ) 1>&2
+}
+yelp_usage_cache () {
+    (
+        echo "Usage: yelp-build cache <FILES>"
+        echo ""
+        echo "  Create a Mallard cache file from the page files FILES."
+        echo "  If FILES contains directories, all .page files in those"
+        echo "  directories will be used."
+    ) 1>&2
+}
+yelp_usage_html () {
+    (
+        echo "Usage: yelp-build <html|xhtml> [OPTIONS] <FILES>"
+        echo ""
+        echo "  Create HTML or XHTML from the input files FILES."
+        echo "  FILES can be DocBook files, Mallard page files,"
+        echo "  or directories containing Mallard page files."
+        echo ""
+        echo "Options:"
+        echo "  -c CACHE      Use the existing Mallard cache CACHE"
+        echo "  -o OUT        Output files in the directory OUT"
+        echo "  -x CUSTOM     Import the custom XSLT file CUSTOM"
+    ) 1>&2
+}
+
+if [ $# = 0 ]; then
+    yelp_usage
+    exit 1
+fi
+
+yelp_cache_ls () {
+    fbase=`basename "$1"`
+    fdir=`dirname "$1"`
+    fdir=`(cd "$fdir" && pwd)`
+    echo '<page cache:href="file://'`urlencode "$fdir/$fbase"`'"/>'
+}
+yelp_cache () {
+    cache_out="index.cache"
+    while [ "$#" != "0" ]; do
+        case "$1" in
+            "-o")
+                shift
+                cache_out="$1"
+                shift
+                ;;
+            *)
+                break
+                ;;
+        esac
+    done
+    if [ "$#" = "0" -o "x$1" = "x--help" ]; then
+        yelp_usage_cache
+        exit 1
+    fi
+    (
+        echo '<cache:cache xmlns:cache="http://projectmallard.org/cache/1.0/"'
+        echo '  xmlns="http://projectmallard.org/1.0/">'
+        for page in "$@"; do
+            if [ -d "$page" ]; then
+                for sub in "$page"/*.page; do
+                    yelp_cache_ls "$sub"
+                done
+            else
+                yelp_cache_ls "$page"
+            fi
+        done
+        echo '</cache:cache>'
+    ) | xsltproc --xinclude -o "$cache_out" "$xsl_mal_cache" -
+}
+
+yelp_html_xsl_common () {
+    if [ "x$html_custom" != "x" ]; then
+        echo '<xsl:include href="file://'`urlencode "$html_custom"`'"/>'
+    fi
+    echo '<xsl:variable name="yelp.locale">'
+    echo ' <xsl:choose>'
+    echo '  <xsl:when test="$l10n.locale != '"''"'">'
+    echo '   <xsl:value-of select="$l10n.locale"/>'
+    echo '  </xsl:when>'
+    echo '  <xsl:otherwise>'
+    echo '   <xsl:text>C</xsl:text>'
+    echo '  </xsl:otherwise>'
+    echo ' </xsl:choose>'
+    echo '</xsl:variable>'
+    echo '<xsl:template name="html.css">'
+    echo ' <xsl:param name="node" select="."/>'
+    echo ' <exsl:document href="{$yelp.locale}.css" method="text">'
+    echo '  <xsl:call-template name="html.css.content">'
+    echo '   <xsl:with-param name="node" select="$node"/>'
+    echo '  </xsl:call-template>'
+    echo ' </exsl:document>'
+    echo ' <link rel="stylesheet" type="text/css" href="{$html.css.root}{$yelp.locale}.css"/>'
+    echo '</xsl:template>'
+    echo '<xsl:template name="html.js">'
+    echo ' <xsl:param name="node" select="."/>'
+    echo ' <xsl:call-template name="html.js.jquery">'
+    echo '  <xsl:with-param name="node" select="$node"/>'
+    echo ' </xsl:call-template>'
+    echo ' <exsl:document href="yelp.js" method="text">'
+    echo '  <xsl:call-template name="html.js.content">'
+    echo '   <xsl:with-param name="node" select="$node"/>'
+    echo '  </xsl:call-template>'
+    echo ' </exsl:document>'
+    echo ' <script type="text/javascript" language="javascript" src="{$html.js.root}yelp.js"/>'
+    echo '</xsl:template>'
+}
+yelp_html_db2html () {
+    for xml in "$@"; do
+        xmldir=`dirname "$xml"`
+        xmldir=`(cd "$xmldir" && pwd)`
+        # Output HTML
+        (
+            echo '<xsl:stylesheet'
+            echo ' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"'
+            echo ' xmlns:exsl="http://exslt.org/common"'
+            echo ' extension-element-prefixes="exsl"'
+            echo ' version="1.0">'
+            if [ "x$is_xhtml" = "x1" ]; then
+                xsl='file://'`urlencode "$xsl_db2xhtml"`
+            else
+                xsl='file://'`urlencode "$xsl_db2html"`
+            fi
+            echo '<xsl:import href="'"$xsl"'"/>'
+            yelp_html_xsl_common
+            echo '</xsl:stylesheet>'
+        ) | xsltproc --xinclude -o "$html_out"/ - "$xml"
+        # Copy media
+        if [ "x$xmldir" != "x$html_out" ]; then
+            (
+                echo '<xsl:stylesheet'
+                echo ' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"'
+                echo ' xmlns:db="http://docbook.org/ns/docbook"'
+                echo ' exclude-result-prefixes="db"'
+                echo ' version="1.0">'
+                echo '<xsl:output method="text"/>'
+                echo '<xsl:template match="/">'
+                echo ' <xsl:for-each select="'
+                echo '   //audiodata | //imagedata | //videodata |'
+                echo '   //db:audiodata | //db:imagedata | //db:videodata">'
+                echo '  <xsl:value-of select="concat(@fileref, '"'&#x000A;'"')"/>'
+                echo ' </xsl:for-each>'
+                echo '</xsl:template>'
+                echo '</xsl:stylesheet>'
+            ) | xsltproc --xinclude - "$xml" | while read media; do
+                mfile=`urldecode "$media"`
+                minput="$xmldir/$mfile"
+                moutput="$html_out/$mfile"
+                mkdir_p `dirname "$moutput"`
+                cp "$minput" "$moutput"
+            done
+        fi
+        # Copy icons
+        (
+            echo '<xsl:stylesheet'
+            echo ' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"'
+            echo ' xmlns:db="http://docbook.org/ns/docbook"'
+            echo ' exclude-result-prefixes="db"'
+            echo ' version="1.0">'
+            echo '<xsl:output method="text"/>'
+            echo '<xsl:template match="/">'
+            echo ' <xsl:for-each select="(//caution|//warning|//db:caution|//db:warning)[1]">'
+            echo '  <xsl:text>yelp-note-warning&#x000A;</xsl:text>'
+            echo ' </xsl:for-each>'
+            echo ' <xsl:for-each select="(//important|//db:important)[1]">'
+            echo '  <xsl:text>yelp-note-important&#x000A;</xsl:text>'
+            echo ' </xsl:for-each>'
+            echo ' <xsl:for-each select="(//tip|//db:tip)[1]">'
+            echo '  <xsl:text>yelp-note-tip&#x000A;</xsl:text>'
+            echo ' </xsl:for-each>'
+            echo ' <xsl:for-each select="(//note|//db:note)[@role='"'bug'"'][1]">'
+            echo '  <xsl:text>yelp-note-bug&#x000A;</xsl:text>'
+            echo ' </xsl:for-each>'
+            echo ' <xsl:for-each select="(//note|//db:note)[not(@role) or @role!='"'bug'"'][1]">'
+            echo '  <xsl:text>yelp-note&#x000A;</xsl:text>'
+            echo ' </xsl:for-each>'
+            echo '</xsl:template>'
+            echo '</xsl:stylesheet>'
+        ) | xsltproc --xinclude - "$xml" | sort | uniq | while read icon; do
+            cp "${yelp_icon_dir}/${icon}.png" "$html_out"
+        done;
+        # Copy jQuery
+        cp "${yelp_js_dir}/jquery.js" "$html_out"
+        cp "${yelp_js_dir}/jquery.syntax.js" "$html_out"
+        (
+            echo '<xsl:stylesheet'
+            echo ' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"'
+            echo ' xmlns:db="http://docbook.org/ns/docbook"'
+            echo ' xmlns:html="http://www.w3.org/1999/xhtml"'
+            echo ' xmlns:exsl="http://exslt.org/common"'
+            echo ' exclude-result-prefixes="db"'
+            echo ' extension-element-prefixes="exsl"'
+            echo ' version="1.0">'
+            xsl='file://'`urlencode "$xsl_db2xhtml"`
+            echo '<xsl:import href="'"$xsl"'"/>'
+            echo '<xsl:output method="text"/>'
+            echo '<xsl:template match="/">'
+            echo ' <xsl:for-each select="//programlisting[@language] | //db:programlisting[@language]">'
+            echo '  <xsl:variable name="out">'
+            echo '   <xsl:call-template name="db2html.pre"/>'
+            echo '  </xsl:variable>'
+            echo '  <xsl:value-of select="exsl:node-set($out)/*/html:pre[last()]/@class"/>'
+            echo '  <xsl:text>&#x000A;</xsl:text>'
+            echo ' </xsl:for-each>'
+            echo '</xsl:template>'
+            echo '</xsl:stylesheet>'
+        ) | xsltproc --xinclude - "$xml" | sort | uniq \
+            | grep '^contents syntax ' | sed -e 's/^contents syntax brush-/brush./' \
+            | while read js; do
+            cp "${yelp_js_dir}/jquery.syntax.${js}.js" "$html_out"
+        done
+    done
+}
+
+yelp_html_page2html () {
+    xml="$1"
+    xmldir=`dirname "$xml"`
+    xmldir=`(cd "$xmldir" && pwd)`
+    # Output HTML
+    (
+        echo '<xsl:stylesheet'
+        echo ' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"'
+        echo ' xmlns:exsl="http://exslt.org/common"'
+        echo ' extension-element-prefixes="exsl"'
+        echo ' version="1.0">'
+        if [ "x$is_xhtml" = "x1" ]; then
+            xsl='file://'`urlencode "$xsl_mal2xhtml"`
+        else
+            xsl='file://'`urlencode "$xsl_mal2html"`
+        fi
+        echo '<xsl:import href="'"$xsl"'"/>'
+        yelp_html_xsl_common
+        html_cache_url='file://'`urlencode "$html_cache_file"`
+        echo '<xsl:param name="mal.cache.file" select="'"'$html_cache_url'"'"/>'
+        echo '</xsl:stylesheet>'
+    ) | xsltproc --xinclude -o "$html_out"/ - "$xml"
+    # Copy media
+    if [ "x$xmldir" != "x$html_out" ]; then
+        (
+            echo '<xsl:stylesheet'
+            echo ' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"'
+            echo ' xmlns:mal="http://projectmallard.org/1.0/"'
+            echo ' exclude-result-prefixes="mal"'
+            echo ' version="1.0">'
+            echo '<xsl:output method="text"/>'
+            echo '<xsl:template match="/">'
+            echo ' <xsl:for-each select="//mal:media">'
+            echo '  <xsl:value-of select="concat(@src, '"'&#x000A;'"')"/>'
+            echo ' </xsl:for-each>'
+            echo '</xsl:template>'
+            echo '</xsl:stylesheet>'
+        ) | xsltproc --xinclude - "$xml" | while read media; do
+            mfile=`urldecode "$media"`
+            minput="$xmldir/$mfile"
+            moutput="$html_out/$mfile"
+            mkdir_p `dirname "$moutput"`
+            cp "$minput" "$moutput"
+        done
+    fi
+    # Copy icons
+    (
+        echo '<xsl:stylesheet'
+        echo ' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"'
+        echo ' xmlns:mal="http://projectmallard.org/1.0/"'
+        echo ' exclude-result-prefixes="mal"'
+        echo ' version="1.0">'
+        echo '<xsl:output method="text"/>'
+        echo '<xsl:template match="/">'
+        echo ' <xsl:for-each select="//mal:note">'
+        echo '  <xsl:variable name="style" select="concat('"'"' '"'"', @style, '"'"' '"'"')"/>'
+        echo '  <xsl:choose>'
+        echo '   <xsl:when test="contains($style, '"'"' advanced '"'"')">'
+        echo '    <xsl:text>yelp-note-advanced&#x000A;</xsl:text>'
+        echo '   </xsl:when>'
+        echo '   <xsl:when test="contains($style, '"'"' bug '"'"')">'
+        echo '    <xsl:text>yelp-note-bug&#x000A;</xsl:text>'
+        echo '   </xsl:when>'
+        echo '   <xsl:when test="contains($style, '"'"' important '"'"')">'
+        echo '    <xsl:text>yelp-note-important&#x000A;</xsl:text>'
+        echo '   </xsl:when>'
+        echo '   <xsl:when test="contains($style, '"'"' sidebar '"'"')"/>'
+        echo '   <xsl:when test="contains($style, '"'"' tip '"'"')">'
+        echo '    <xsl:text>yelp-note-tip&#x000A;</xsl:text>'
+        echo '   </xsl:when>'
+        echo '   <xsl:when test="contains($style, '"'"' warning '"'"')">'
+        echo '    <xsl:text>yelp-note-warning&#x000A;</xsl:text>'
+        echo '   </xsl:when>'
+        echo '   <xsl:otherwise>'
+        echo '    <xsl:text>yelp-note&#x000A;</xsl:text>'
+        echo '   </xsl:otherwise>'
+        echo '  </xsl:choose>'
+        echo ' </xsl:for-each>'
+        echo '</xsl:template>'
+        echo '</xsl:stylesheet>'
+    ) | xsltproc --xinclude - "$xml" | sort | uniq | while read icon; do
+        cp "${yelp_icon_dir}/${icon}.png" "$html_out"
+    done;
+    # Copy jQuery
+    cp "${yelp_js_dir}/jquery.js" "$html_out"
+    cp "${yelp_js_dir}/jquery.syntax.js" "$html_out"
+    (
+        echo '<xsl:stylesheet'
+        echo ' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"'
+        echo ' xmlns:mal="http://projectmallard.org/1.0/"'
+        echo ' xmlns:html="http://www.w3.org/1999/xhtml"'
+        echo ' xmlns:exsl="http://exslt.org/common"'
+        echo ' exclude-result-prefixes="mal"'
+        echo ' extension-element-prefixes="exsl"'
+        echo ' version="1.0">'
+        xsl='file://'`urlencode "$xsl_mal2xhtml"`
+        echo '<xsl:import href="'"$xsl"'"/>'
+        echo '<xsl:output method="text"/>'
+        echo '<xsl:template match="/">'
+        echo ' <xsl:for-each select="//mal:code[@mime]">'
+        echo '  <xsl:variable name="out">'
+        echo '   <xsl:call-template name="mal2html.pre"/>'
+        echo '  </xsl:variable>'
+        echo '  <xsl:value-of select="exsl:node-set($out)/*/html:pre[last()]/@class"/>'
+        echo '  <xsl:text>&#x000A;</xsl:text>'
+        echo ' </xsl:for-each>'
+        echo '</xsl:template>'
+        echo '</xsl:stylesheet>'
+    ) | xsltproc --xinclude - "$xml" | sort | uniq \
+        | grep '^contents syntax ' | sed -e 's/^contents syntax brush-/brush./' \
+        | while read js; do
+        cp "${yelp_js_dir}/jquery.syntax.${js}.js" "$html_out"
+    done
+}
+
+yelp_html_mal2html () {
+    if [ "x$html_cache_file" != "x" ]; then
+        html_cache_file=`(cd $(dirname "$html_cache_file") && pwd)`/`basename "$html_cache_file"`
+    else
+        html_cache_file_is_tmp="yes"
+        html_cache_file=`mktemp`
+        yelp_cache -o "$html_cache_file" "$@"
+    fi
+    for xml in "$@"; do
+        if [ -d "$xml" ]; then
+            for page in "$xml"/*.page; do
+                yelp_html_page2html "$page"
+            done
+        else
+            yelp_html_page2html "$xml"
+        fi
+    done
+    if [ "x$html_cache_file_is_tmp" = "xyes" ]; then
+        rm "$html_cache_file"
+    fi
+}
+
+yelp_html () {
+    html_out="."
+    while [ "$#" != "0" ]; do
+        case "$1" in
+            "-c")
+                shift
+                html_cache_file="$1"
+                shift
+                ;;
+            "-o")
+                shift
+                html_out="$1"
+                shift
+                ;;
+            "-x")
+                shift
+                html_custom="$1"
+                shift
+                ;;
+            *)
+                break
+                ;;
+        esac
+    done
+    if [ ! -d "$html_out" ]; then
+        echo "Error: output must be a directory." 1>&2
+        exit 1
+    fi
+    html_out=`(cd "$html_out" && pwd)`
+    if [ "x$html_custom" != "x" ]; then
+        html_custom_dir=`dirname "$html_custom"`
+        html_custom_dir=`(cd "$html_custom_dir" && pwd)`
+        html_custom="$html_custom_dir"/`basename "$html_custom"`
+    fi
+    if [ "$#" = "0" -o "x$1" = "x--help" ]; then
+        yelp_usage_html
+        exit 1
+    fi
+    ext=`echo "$1" | sed -e 's/.*\.//'`
+    if [ "x$ext" = "xxml" -o "x$ext" = "xdocbook" ]; then
+        yelp_html_db2html "$@"
+    else
+        yelp_html_mal2html "$@"
+    fi
+}
+
+cmd="$1"
+shift
+case "x$cmd" in
+    "xcache")
+        yelp_cache "$@"
+        ;;
+    "xhtml")
+        is_xhtml=0
+        yelp_html "$@"
+        ;;
+    "xxhtml")
+        is_xhtml=1
+        yelp_html "$@"
+        ;;
+    *)
+        yelp_usage
+        ;;
+esac

=== added directory 'libs'
=== renamed directory 'libs' => 'libs.moved'
=== added file 'libs/gnome-doc-utils.make'
--- libs/gnome-doc-utils.make	1970-01-01 00:00:00 +0000
+++ libs/gnome-doc-utils.make	2011-07-07 14:26:08 +0000
@@ -0,0 +1,656 @@
+# gnome-doc-utils.make - make magic for building documentation
+# Copyright (C) 2004-2005 Shaun McCance <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+################################################################################
+## @@ Generating Header Files
+
+## @ DOC_H_FILE
+## The name of the header file to generate
+DOC_H_FILE ?=
+
+## @ DOC_H_DOCS
+## The input DocBook files for generating the header file
+DOC_H_DOCS ?=
+
+$(DOC_H_FILE): $(DOC_H_DOCS);
+	@rm -f $@.tmp; touch $@.tmp;
+	echo 'const gchar* documentation_credits[] = {' >> $@.tmp
+	list='$(DOC_H_DOCS)'; for doc in $$list; do \
+	  xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
+	  if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
+	  xsltproc --path "$$xmlpath" $(_credits) $$doc; \
+	done | sort | uniq \
+	  | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \
+	  | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
+	echo '	NULL' >> $@.tmp
+	echo '};' >> $@.tmp
+	echo >> $@.tmp
+	list='$(DOC_H_DOCS)'; for doc in $$list; do \
+	  xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
+	  if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
+	  docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
+	    | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
+	  echo $$xmlpath; \
+	  ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
+	  for id in $$ids; do \
+	    echo '#define HELP_'`echo $$docid`'_'`echo $$id \
+	      | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
+	  done; \
+	  echo >> $@.tmp; \
+	done;
+	cp $@.tmp $@ && rm -f $@.tmp
+
+dist-check-gdu:
+if !HAVE_GNOME_DOC_UTILS
+	@echo "*** GNOME Doc Utils must be installed in order to make dist"
+	@false
+endif
+
+.PHONY: dist-doc-header
+dist-doc-header: $(DOC_H_FILE)
+	@if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \
+	echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \
+	$(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)";
+
+doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header)
+
+.PHONY: clean-doc-header
+_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
+clean-local: $(_clean_doc_header)
+distclean-local: $(_clean_doc_header)
+mostlyclean-local: $(_clean_doc_header)
+maintainer-clean-local: $(_clean_doc_header)
+clean-doc-header:
+	rm -f $(DOC_H_FILE)
+
+all: $(DOC_H_FILE)
+
+
+################################################################################
+## @@ Generating Documentation Files
+
+## @ DOC_MODULE
+## The name of the document being built
+DOC_MODULE ?=
+
+## @ DOC_ID
+## The unique identifier for a Mallard document
+DOC_ID ?=
+
+## @ DOC_PAGES
+## Page files in a Mallard document
+DOC_PAGES ?=
+
+## @ DOC_ENTITIES
+## Files included with a SYSTEM entity
+DOC_ENTITIES ?=
+
+## @ DOC_INCLUDES
+## Files included with XInclude
+DOC_INCLUDES ?=
+
+## @ DOC_FIGURES
+## Figures and other external data
+DOC_FIGURES ?=
+
+## @ DOC_FORMATS
+## The default formats to be built and installed
+DOC_FORMATS ?= docbook
+_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
+
+## @ DOC_LINGUAS
+## The languages this document is translated into
+DOC_LINGUAS ?=
+_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),		\
+	$(filter $(LINGUAS),$(DOC_LINGUAS)),					\
+	$(DOC_LINGUAS))
+
+_DOC_ABS_SRCDIR = @abs_srcdir@
+
+
+################################################################################
+## Variables for Bootstrapping
+
+_xml2po ?= `which xml2po`
+_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
+
+_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
+
+if ENABLE_SK
+_ENABLE_SK = true
+_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+endif
+
+
+################################################################################
+## @@ Rules for OMF Files
+
+db2omf_args =									\
+	--stringparam db2omf.basename $(DOC_MODULE)				\
+	--stringparam db2omf.format $(3)					\
+	--stringparam db2omf.dtd						\
+	$(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 		\
+		| sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/')			\
+	--stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2)))	\
+	--stringparam db2omf.omf_dir "$(OMF_DIR)"				\
+	--stringparam db2omf.help_dir "$(HELP_DIR)"				\
+	--stringparam db2omf.omf_in "$(_DOC_OMF_IN)"				\
+	$(if $(_ENABLE_SK),							\
+	  --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)")		\
+	$(_db2omf) $(2)
+
+## @ _DOC_OMF_IN
+## The OMF input file
+_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in))
+
+## @ _DOC_OMF_DB
+## The OMF files for DocBook output
+_DOC_OMF_DB = $(if $(_DOC_OMF_IN),						\
+	$(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf))
+
+$(_DOC_OMF_DB) : $(_DOC_OMF_IN)
+$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
+	@test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || {	\
+	  echo "The file '$(_skcontentslist)' does not exist." >&2;		\
+	  echo "Please check your ScrollKeeper installation." >&2;		\
+	  exit 1; }
+	xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
+
+## @ _DOC_OMF_HTML
+## The OMF files for HTML output
+_DOC_OMF_HTML = $(if $(_DOC_OMF_IN),						\
+	$(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf))
+
+$(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
+$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
+if ENABLE_SK
+	@test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || {	\
+	  echo "The file '$(_skcontentslist)' does not exist" >&2;		\
+	  echo "Please check your ScrollKeeper installation." >&2;		\
+	  exit 1; }
+endif
+	xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
+
+## @ _DOC_OMF_ALL
+## All OMF output files to be built
+# FIXME
+_DOC_OMF_ALL =									\
+	$(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB))		\
+	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML))
+
+.PHONY: omf
+omf: $(_DOC_OMF_ALL)
+
+
+################################################################################
+## @@ C Locale Documents
+
+## @ _DOC_C_MODULE
+## The top-level documentation file in the C locale
+_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
+
+## @ _DOC_C_PAGES
+## Page files in a Mallard document in the C locale
+_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
+
+## @ _DOC_C_ENTITIES
+## Files included with a SYSTEM entity in the C locale
+_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
+
+## @ _DOC_C_XINCLUDES
+## Files included with XInclude in the C locale
+_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
+
+## @ _DOC_C_DOCS
+## All documentation files in the C locale
+_DOC_C_DOCS =								\
+	$(_DOC_C_ENTITIES)	$(_DOC_C_INCLUDES)			\
+	$(_DOC_C_PAGES)		$(_DOC_C_MODULE)
+
+## @ _DOC_C_DOCS_NOENT
+## All documentation files in the C locale,
+## except files included with a SYSTEM entity
+_DOC_C_DOCS_NOENT =							\
+	$(_DOC_C_MODULE)	$(_DOC_C_INCLUDES)			\
+	$(_DOC_C_PAGES)
+
+## @ _DOC_C_FIGURES
+## All figures and other external data in the C locale
+_DOC_C_FIGURES = $(if $(DOC_FIGURES),					\
+	$(foreach fig,$(DOC_FIGURES),C/$(fig)),				\
+	$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png)))
+
+## @ _DOC_C_HTML
+## All HTML documentation in the C locale
+# FIXME: probably have to shell escape to determine the file names
+_DOC_C_HTML = $(foreach f,						\
+	$(shell xsltproc --xinclude 					\
+	  --stringparam db.chunk.basename "$(DOC_MODULE)"		\
+	  $(_chunks) "C/$(DOC_MODULE).xml"),				\
+	C/$(f).xhtml)
+
+###############################################################################
+## @@ Other Locale Documentation
+
+## @ _DOC_POFILES
+## The .po files used for translating the document
+_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID),					\
+	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
+
+.PHONY: po
+po: $(_DOC_POFILES)
+
+## @ _DOC_MOFILES
+## The .mo files used for translating the document
+_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
+
+.PHONY: mo
+mo: $(_DOC_MOFILES)
+
+## @ _DOC_LC_MODULES
+## The top-level documentation files in all other locales
+_DOC_LC_MODULES = $(if $(DOC_MODULE),						\
+	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
+
+## @ _DOC_LC_PAGES
+## Page files in a Mallard document in all other locales
+_DOC_LC_PAGES =									\
+	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES),	\
+		$(lc)/$(notdir $(page)) ))
+
+## @ _DOC_LC_XINCLUDES
+## Files included with XInclude in all other locales
+_DOC_LC_INCLUDES =								\
+	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES),	\
+		$(lc)/$(notdir $(inc)) ))
+
+## @ _DOC_LC_HTML
+## All HTML documentation in all other locales
+# FIXME: probably have to shell escape to determine the file names
+_DOC_LC_HTML =									\
+	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML),		\
+		$(lc)/$(notdir $(doc)) ))
+
+## @ _DOC_LC_DOCS
+## All documentation files in all other locales
+_DOC_LC_DOCS =									\
+	$(_DOC_LC_MODULES)	$(_DOC_LC_INCLUDES)	$(_DOC_LC_PAGES)	\
+	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
+
+## @ _DOC_LC_FIGURES
+## All figures and other external data in all other locales
+_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS),				\
+	$(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) )
+
+_DOC_SRC_FIGURES =								\
+	$(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS),	\
+		$(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) ))
+
+$(_DOC_POFILES):
+	@if ! test -d $(dir $@); then \
+	  echo "mkdir $(dir $@)"; \
+	  mkdir "$(dir $@)"; \
+	fi
+	@if test ! -f $@ -a -f $(srcdir)/$@; then \
+	  echo "cp $(srcdir)/$@ $@"; \
+	  cp "$(srcdir)/$@" "$@"; \
+	fi;
+	@docs=; \
+	list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \
+	  docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \
+	done; \
+	if ! test -f $@; then \
+	  echo "(cd $(dir $@) && \
+	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
+	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
+	  (cd $(dir $@) && \
+	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
+	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
+	else \
+	  echo "(cd $(dir $@) && \
+	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
+	  (cd $(dir $@) && \
+	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
+	fi
+
+$(_DOC_MOFILES): %.mo: %.po
+	@if ! test -d $(dir $@); then \
+	  echo "mkdir $(dir $@)"; \
+	  mkdir "$(dir $@)"; \
+	fi
+	msgfmt -o $@ $<
+
+# FIXME: fix the dependancy
+# FIXME: hook xml2po up
+$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
+$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
+	if ! test -d $(dir $@); then mkdir $(dir $@); fi
+	if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+	mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
+	if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
+	(cd $(dir $@) && \
+	  $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
+	    "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
+	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
+
+## @ _DOC_POT
+## A pot file
+_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,\
+$(if $(DOC_ID),$(DOC_ID).pot))
+.PHONY: pot
+pot: $(_DOC_POT)
+$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
+	$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
+
+
+################################################################################
+## @@ All Documentation
+
+## @ _DOC_HTML_ALL
+## All HTML documentation, only if it's built
+_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
+	$(_DOC_C_HTML) $(_DOC_LC_HTML))
+
+_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
+
+$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
+	xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
+
+
+################################################################################
+## All
+
+all:							\
+	$(_DOC_C_DOCS)		$(_DOC_LC_DOCS)		\
+	$(_DOC_OMF_ALL)		$(_DOC_DSK_ALL)		\
+	$(_DOC_HTML_ALL)	$(_DOC_POFILES)
+
+
+################################################################################
+## Clean
+
+.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
+
+clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
+clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
+clean-doc-lc:
+	rm -f $(_DOC_LC_DOCS)
+	rm -f $(_DOC_MOFILES)
+	@list='$(_DOC_POFILES)'; for po in $$list; do \
+	  if ! test "$$po" -ef "$(srcdir)/$$po"; then \
+	    echo "rm -f $$po"; \
+	    rm -f "$$po"; \
+	  fi; \
+	done
+#	.xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
+	@for lc in C $(_DOC_REAL_LINGUAS); do \
+	  if test -f "$$lc/.xml2po.mo"; then \
+	    echo "rm -f $$lc/.xml2po.mo"; \
+	    rm -f "$$lc/.xml2po.mo"; \
+	  fi; \
+	done
+clean-doc-dir: clean-doc-lc
+	@for lc in C $(_DOC_REAL_LINGUAS); do \
+	  for dir in `find $$lc -depth -type d`; do \
+	    if ! test $$dir -ef $(srcdir)/$$dir; then \
+	      echo "rmdir $$dir"; \
+	      rmdir "$$dir"; \
+	   fi; \
+	  done; \
+	done
+
+_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
+_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
+_clean_lc  = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
+_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
+
+clean-local:						\
+	$(_clean_omf)		$(_clean_dsk)		\
+	$(_clean_lc)		$(_clean_dir)
+distclean-local:					\
+	$(_clean_omf)		$(_clean_dsk)		\
+	$(_clean_lc)		$(_clean_dir)
+mostlyclean-local:					\
+	$(_clean_omf)		$(_clean_dsk)		\
+	$(_clean_lc)		$(_clean_dir)
+maintainer-clean-local:					\
+	$(_clean_omf)		$(_clean_dsk)		\
+	$(_clean_lc)		$(_clean_dir)
+
+
+
+################################################################################
+## Dist
+
+.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
+doc-dist-hook: 						\
+	$(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs)	\
+	$(if $(_DOC_C_FIGURES),dist-doc-figs)		\
+	$(if $(_DOC_OMF_IN),dist-doc-omf)
+#	$(if $(_DOC_DSK_IN),dist-doc-dsk)
+
+dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)
+	@for lc in C $(_DOC_REAL_LINGUAS); do \
+	  echo " $(mkinstalldirs) $(distdir)/$$lc"; \
+	  $(mkinstalldirs) "$(distdir)/$$lc"; \
+	done
+	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
+	for doc in $$list; do \
+	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
+	    docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+	    if ! test -d "$(distdir)/$$docdir"; then \
+	      echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
+	      $(mkinstalldirs) "$(distdir)/$$docdir"; \
+	    fi; \
+	  echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
+	  $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
+	done
+
+dist-doc-figs: $(_DOC_SRC_FIGURES)
+	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \
+	for fig in $$list; do \
+	  if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$fig"; then \
+	    figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+	    if ! test -d "$(distdir)/$$figdir"; then \
+	      echo "$(mkinstalldirs) $(distdir)/$$figdir"; \
+	      $(mkinstalldirs) "$(distdir)/$$figdir"; \
+	    fi; \
+	    echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \
+	    $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \
+	  fi; \
+	done;
+
+dist-doc-omf:
+	@if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \
+	echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \
+	$(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))"
+
+dist-doc-dsk:
+	@if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \
+	echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
+	$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
+
+
+
+################################################################################
+## Check
+
+.PHONY: check-doc-docs check-doc-omf
+check:							\
+	$(if $(DOC_MODULE),check-doc-docs)		\
+	$(if $(DOC_ID),check-doc-pages)			\
+	$(if $(_DOC_OMF_IN),check-doc-omf)
+
+check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
+	@for lc in C $(_DOC_REAL_LINGUAS); do \
+	  if test -f "$$lc"; \
+	    then d=; \
+	    xmlpath="$$lc"; \
+	  else \
+	    d="$(srcdir)/"; \
+	    xmlpath="$$lc:$(srcdir)/$$lc"; \
+	  fi; \
+	  echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \
+	  xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
+	done
+
+check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
+	for lc in C $(_DOC_REAL_LINGUAS); do \
+	  if test -f "$$lc"; \
+	    then d=; \
+	    xmlpath="$$lc"; \
+	  else \
+	    d="$(srcdir)/"; \
+	    xmlpath="$$lc:$(srcdir)/$$lc"; \
+	  fi; \
+	  for page in $(DOC_PAGES); do \
+	    echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
+	    xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
+	  done; \
+	done
+
+check-doc-omf: $(_DOC_OMF_ALL)
+	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
+	  echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
+	  xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
+	done
+
+
+
+################################################################################
+## Install
+
+.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
+
+_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
+
+install-data-local:					\
+	$(if $(DOC_MODULE)$(DOC_ID),install-doc-docs)	\
+	$(if $(_DOC_HTML_ALL),install-doc-html)		\
+	$(if $(_DOC_C_FIGURES),install-doc-figs)	\
+	$(if $(_DOC_OMF_IN),install-doc-omf)
+#	$(if $(_DOC_DSK_IN),install-doc-dsk)
+
+install-doc-docs:
+	@for lc in C $(_DOC_REAL_LINGUAS); do \
+	  echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
+	  $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
+	done
+	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
+	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
+	  docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+	  docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
+	  if ! test -d "$$docdir"; then \
+	    echo "$(mkinstalldirs) $$docdir"; \
+	    $(mkinstalldirs) "$$docdir"; \
+	  fi; \
+	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
+	done
+
+install-doc-figs:
+	@list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
+	  for lc in C $(_DOC_REAL_LINGUAS); do \
+	    figsymlink=false; \
+	    if test -f "$$lc/$$fig"; then \
+	      figfile="$$lc/$$fig"; \
+	    elif test -f "$(srcdir)/$$lc/$$fig"; then \
+	      figfile="$(srcdir)/$$lc/$$fig"; \
+	    else \
+	      figsymlink=true; \
+	    fi; \
+	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+	    figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
+	    if ! test -d "$$figdir"; then \
+	      echo "$(mkinstalldirs) $$figdir"; \
+	      $(mkinstalldirs) "$$figdir"; \
+	    fi; \
+	    figbase=`echo $$fig | sed -e 's/^.*\///'`; \
+	    if $$figsymlink; then \
+	      echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
+	      ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
+	    else \
+	      echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
+	      $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
+	    fi; \
+	  done; \
+	done
+
+install-doc-html:
+	echo install-html
+
+install-doc-omf:
+	$(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
+	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
+	  echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+	  $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
+	done
+	@if test "x$(_ENABLE_SK)" = "xtrue"; then \
+	  echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
+	  scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
+	fi;
+
+install-doc-dsk:
+	echo install-dsk
+
+
+
+################################################################################
+## Uninstall
+
+.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
+uninstall-local:					\
+	$(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs)	\
+	$(if $(_DOC_HTML_ALL),uninstall-doc-html)	\
+	$(if $(_DOC_C_FIGURES),uninstall-doc-figs)	\
+	$(if $(_DOC_OMF_IN),uninstall-doc-omf)
+#	$(if $(_DOC_DSK_IN),uninstall-doc-dsk)
+
+uninstall-doc-docs:
+	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
+	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+	done
+
+uninstall-doc-figs:
+	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
+	  echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
+	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
+	done;
+
+uninstall-doc-omf:
+	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
+	  if test "x$(_ENABLE_SK)" = "xtrue"; then \
+	    echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+	    scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+	  fi; \
+	  echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+	  rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+	done

=== added file 'libs/mallard-1.0.rng'
--- libs/mallard-1.0.rng	1970-01-01 00:00:00 +0000
+++ libs/mallard-1.0.rng	2011-07-07 14:26:08 +0000
@@ -0,0 +1,2111 @@
+<?xml version="1.0"?>
+<grammar
+    xmlns="http://relaxng.org/ns/structure/1.0"
+    xmlns:mal="http://projectmallard.org/1.0/"
+    ns="http://projectmallard.org/1.0/">
+
+<start>
+  <ref name="mal_page"/>
+</start>
+
+<define name="mal_page">
+  <element name="page">
+    <ref name="mal_page_attr"/>
+      <ref name="mal_info"/>
+    <ref name="mal_block_title"/>
+    <optional>
+      <ref name="mal_block_subtitle"/>
+    </optional>
+    <zeroOrMore>
+      <choice>
+        <ref name="mal_block"/>
+        <ref name="mal_links"/>
+      </choice>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="mal_section"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="mal_links"/>
+    </zeroOrMore>
+  </element>
+</define>
+
+<define name="mal_page_attr">
+  <group>
+    <attribute name="id">
+      <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+    </attribute>
+    <optional>
+      <attribute name="type">
+        <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="version">
+        <text/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_section">
+  <element name="section">
+    <ref name="mal_section_attr"/>
+    <optional>
+      <ref name="mal_info"/>
+    </optional>
+    <ref name="mal_block_title"/>
+    <optional>
+      <ref name="mal_block_subtitle"/>
+    </optional>
+    <zeroOrMore>
+      <choice>
+        <ref name="mal_block"/>
+        <ref name="mal_links"/>
+      </choice>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="mal_section"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="mal_links"/>
+    </zeroOrMore>
+  </element>
+</define>
+
+<define name="mal_section_attr">
+  <group>
+    <attribute name="id">
+      <data type="ID" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+    </attribute>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_info">
+  <element name="info">
+    <ref name="mal_info_attr"/>
+    <ref name="mal_info_content"/>
+  </element>
+</define>
+
+<define name="mal_info_attr">
+  <group>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_info_content">
+  <interleave>
+    <optional>
+      <ref name="mal_info_desc"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_info_credit"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="mal_info_license"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="mal_info_link"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="mal_info_title"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="mal_info_revision"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="mal_external"/>
+    </zeroOrMore>
+  </interleave>
+</define>
+
+<define name="mal_info_credit">
+  <element name="credit">
+    <ref name="mal_info_credit_attr"/>
+    <ref name="mal_info_credit_content"/>
+  </element>
+</define>
+
+<define name="mal_info_credit_attr">
+  <group>
+    <optional>
+      <attribute name="type">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_info_credit_content">
+  <interleave>
+    <ref name="mal_info_name"/>
+    <zeroOrMore>
+      <ref name="mal_info_email"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="mal_info_years"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_external"/>
+    </zeroOrMore>
+  </interleave>
+</define>
+
+<define name="mal_info_link">
+  <element name="link">
+    <ref name="mal_info_link_attr"/>
+    <zeroOrMore>
+      <ref name="mal_info_link_content"/>
+    </zeroOrMore>
+  </element>
+</define>
+
+<define name="mal_info_link_attr">
+  <group>
+    <attribute name="type">
+      <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+    </attribute>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <oneOrMore>
+      <ref name="mal_attr_link"/>
+    </oneOrMore>
+    <optional>
+      <attribute name="group">
+        <text/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_info_link_content">
+  <ref name="mal_external"/>
+</define>
+
+<define name="mal_info_title">
+  <element name="title">
+    <ref name="mal_info_title_attr"/>
+    <ref name="mal_info_title_inline"/>
+  </element>
+</define>
+
+<define name="mal_info_title_attr">
+  <group>
+    <attribute name="type">
+      <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+    </attribute>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="role">
+        <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_info_title_inline">
+  <ref name="mal_inline"/>
+</define>
+
+<define name="mal_info_license">
+  <element name="license">
+    <ref name="mal_info_license_attr"/>
+    <oneOrMore>
+      <ref name="mal_info_license_content"/>
+    </oneOrMore>
+  </element>
+</define>
+
+<define name="mal_info_license_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="href">
+        <text/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_info_license_content">
+  <ref name="mal_block"/>
+</define>
+
+<define name="mal_info_desc">
+  <element name="desc">
+    <ref name="mal_info_desc_attr"/>
+    <ref name="mal_info_desc_inline"/>
+  </element>
+</define>
+
+<define name="mal_info_desc_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_info_desc_inline">
+  <ref name="mal_inline"/>
+</define>
+
+<define name="mal_info_revision">
+  <element name="revision">
+    <ref name="mal_info_revision_attr"/>
+    <optional>
+      <ref name="mal_block_title"/>
+    </optional>
+    <optional>
+      <ref name="mal_block_desc"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_info_revision_content"/>
+    </zeroOrMore>
+  </element>
+</define>
+
+<define name="mal_info_revision_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="version">
+        <text/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="docversion">
+        <text/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="pkgversion">
+        <text/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="date">
+        <data type="date" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="status">
+        <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_info_revision_content">
+  <ref name="mal_external"/>
+</define>
+
+<define name="mal_info_years">
+  <element name="years">
+    <ref name="mal_info_years_attr"/>
+    <ref name="mal_info_years_inline"/>
+  </element>
+</define>
+
+<define name="mal_info_years_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_info_years_inline">
+  <ref name="mal_inline"/>
+</define>
+
+<define name="mal_info_email">
+  <element name="email">
+    <ref name="mal_info_email_attr"/>
+    <ref name="mal_info_email_inline"/>
+  </element>
+</define>
+
+<define name="mal_info_email_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_info_email_inline">
+  <ref name="mal_inline"/>
+</define>
+
+<define name="mal_info_name">
+  <element name="name">
+    <ref name="mal_info_name_attr"/>
+    <ref name="mal_info_name_inline"/>
+  </element>
+</define>
+
+<define name="mal_info_name_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_info_name_inline">
+  <ref name="mal_inline"/>
+</define>
+
+<define name="mal_links">
+  <element name="links">
+    <ref name="mal_links_attr"/>
+    <optional>
+      <ref name="mal_block_title"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_links_content"/>
+    </zeroOrMore>
+  </element>
+</define>
+
+<define name="mal_links_attr">
+  <group>
+    <attribute name="type">
+      <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+    </attribute>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="groups">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_links_content">
+  <ref name="mal_external"/>
+</define>
+
+<define name="mal_block">
+  <choice>
+    <ref name="mal_block_elements"/>
+    <element>
+      <anyName>
+        <except>
+          <nsName ns="http://projectmallard.org/1.0/"/>
+          <nsName ns=""/>
+        </except>
+      </anyName>
+      <zeroOrMore>
+        <attribute>
+          <anyName/>
+          <text/>
+        </attribute>
+      </zeroOrMore>
+      <interleave>
+        <zeroOrMore>
+          <ref name="mal_external"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="mal_block_elements"/>
+        </zeroOrMore>
+      </interleave>
+    </element>
+  </choice>
+</define>
+
+<define name="mal_block_elements">
+  <choice>
+    <ref name="mal_block_code"/>
+    <ref name="mal_block_comment"/>
+    <ref name="mal_block_example"/>
+    <ref name="mal_block_figure"/>
+    <ref name="mal_block_list"/>
+    <ref name="mal_block_listing"/>
+    <ref name="mal_block_media"/>
+    <ref name="mal_block_note"/>
+    <ref name="mal_block_p"/>
+    <ref name="mal_block_quote"/>
+    <ref name="mal_block_screen"/>
+    <ref name="mal_block_steps"/>
+    <ref name="mal_block_synopsis"/>
+    <ref name="mal_block_terms"/>
+    <ref name="mal_block_tree"/>
+    <ref name="mal_table"/>
+  </choice>
+</define>
+
+<define name="mal_block_code">
+  <element name="code">
+    <ref name="mal_block_code_attr"/>
+    <ref name="mal_block_code_inline"/>
+  </element>
+</define>
+
+<define name="mal_block_code_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="mime">
+        <text/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_code_inline">
+  <ref name="mal_inline"/>
+</define>
+
+<define name="mal_block_example">
+  <element name="example">
+    <ref name="mal_block_example_attr"/>
+    <oneOrMore>
+      <ref name="mal_block_example_content"/>
+    </oneOrMore>
+  </element>
+</define>
+
+<define name="mal_block_example_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_example_content">
+  <ref name="mal_block"/>
+</define>
+
+<define name="mal_block_media">
+  <element name="media">
+    <ref name="mal_block_media_attr"/>
+    <zeroOrMore>
+      <ref name="mal_block_media_content"/>
+    </zeroOrMore>
+  </element>
+</define>
+
+<define name="mal_block_media_attr">
+  <group>
+    <optional>
+      <attribute name="type">
+        <choice>
+          <value>image</value>
+          <value>video</value>
+          <value>audio</value>
+          <value>application</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="mime">
+        <text/>
+      </attribute>
+    </optional>
+    <attribute name="src">
+      <text/>
+    </attribute>
+    <optional>
+      <attribute name="height">
+        <text/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <text/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_media_content">
+  <ref name="mal_block"/>
+</define>
+
+<define name="mal_block_p">
+  <element name="p">
+    <ref name="mal_block_p_attr"/>
+    <ref name="mal_block_p_inline"/>
+  </element>
+</define>
+
+<define name="mal_block_p_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_p_inline">
+  <ref name="mal_inline"/>
+</define>
+
+<define name="mal_block_screen">
+  <element name="screen">
+    <ref name="mal_block_screen_attr"/>
+    <ref name="mal_block_screen_inline"/>
+  </element>
+</define>
+
+<define name="mal_block_screen_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="mime">
+        <text/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_screen_inline">
+  <ref name="mal_inline"/>
+</define>
+
+<define name="mal_block_quote">
+  <element name="quote">
+    <ref name="mal_block_quote_attr"/>
+    <optional>
+      <ref name="mal_block_title"/>
+    </optional>
+    <optional>
+      <ref name="mal_block_cite"/>
+    </optional>
+    <oneOrMore>
+      <ref name="mal_block_quote_content"/>
+    </oneOrMore>
+  </element>
+</define>
+
+<define name="mal_block_quote_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_quote_content">
+  <ref name="mal_block"/>
+</define>
+
+<define name="mal_block_comment">
+  <element name="comment">
+    <ref name="mal_block_comment_attr"/>
+    <optional>
+      <ref name="mal_block_title"/>
+    </optional>
+    <optional>
+      <ref name="mal_block_cite"/>
+    </optional>
+    <oneOrMore>
+      <ref name="mal_block_comment_content"/>
+    </oneOrMore>
+  </element>
+</define>
+
+<define name="mal_block_comment_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_comment_content">
+  <ref name="mal_block"/>
+</define>
+
+<define name="mal_block_figure">
+  <element name="figure">
+    <ref name="mal_block_figure_attr"/>
+    <optional>
+      <ref name="mal_block_title"/>
+    </optional>
+    <optional>
+      <ref name="mal_block_desc"/>
+    </optional>
+    <oneOrMore>
+      <ref name="mal_block_figure_content"/>
+    </oneOrMore>
+  </element>
+</define>
+
+<define name="mal_block_figure_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_figure_content">
+  <ref name="mal_block"/>
+</define>
+
+<define name="mal_block_listing">
+  <element name="listing">
+    <ref name="mal_block_listing_attr"/>
+    <optional>
+      <ref name="mal_block_title"/>
+    </optional>
+    <optional>
+      <ref name="mal_block_desc"/>
+    </optional>
+    <oneOrMore>
+      <ref name="mal_block_listing_content"/>
+    </oneOrMore>
+  </element>
+</define>
+
+<define name="mal_block_listing_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_listing_content">
+  <ref name="mal_block"/>
+</define>
+
+<define name="mal_block_note">
+  <element name="note">
+    <ref name="mal_block_note_attr"/>
+    <optional>
+      <ref name="mal_block_title"/>
+    </optional>
+    <oneOrMore>
+      <ref name="mal_block_note_content"/>
+    </oneOrMore>
+  </element>
+</define>
+
+<define name="mal_block_note_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_note_content">
+  <ref name="mal_block"/>
+</define>
+
+<define name="mal_block_synopsis">
+  <element name="synopsis">
+    <ref name="mal_block_synopsis_attr"/>
+    <optional>
+      <ref name="mal_block_title"/>
+    </optional>
+    <optional>
+      <ref name="mal_block_desc"/>
+    </optional>
+    <oneOrMore>
+      <ref name="mal_block_synopsis_content"/>
+    </oneOrMore>
+  </element>
+</define>
+
+<define name="mal_block_synopsis_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_synopsis_content">
+  <ref name="mal_block"/>
+</define>
+
+<define name="mal_block_list">
+  <element name="list">
+    <ref name="mal_block_list_attr"/>
+    <optional>
+      <ref name="mal_block_title"/>
+    </optional>
+    <oneOrMore>
+      <ref name="mal_block_list_item"/>
+    </oneOrMore>
+  </element>
+</define>
+
+<define name="mal_block_list_attr">
+  <group>
+    <optional>
+      <attribute name="type">
+        <data type="NMTOKEN" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_list_item">
+  <element name="item">
+    <ref name="mal_block_list_item_attr"/>
+    <oneOrMore>
+      <ref name="mal_block_list_item_content"/>
+    </oneOrMore>
+  </element>
+</define>
+
+<define name="mal_block_list_item_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_list_item_content">
+  <ref name="mal_block"/>
+</define>
+
+<define name="mal_block_steps">
+  <element name="steps">
+    <ref name="mal_block_steps_attr"/>
+    <optional>
+      <ref name="mal_block_title"/>
+    </optional>
+    <oneOrMore>
+      <ref name="mal_block_steps_item"/>
+    </oneOrMore>
+  </element>
+</define>
+
+<define name="mal_block_steps_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_steps_item">
+  <element name="item">
+    <ref name="mal_block_steps_item_attr"/>
+    <oneOrMore>
+      <ref name="mal_block_steps_item_content"/>
+    </oneOrMore>
+  </element>
+</define>
+
+<define name="mal_block_steps_item_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_steps_item_content">
+  <ref name="mal_block"/>
+</define>
+
+<define name="mal_block_terms">
+  <element name="terms">
+    <ref name="mal_block_terms_attr"/>
+    <optional>
+      <ref name="mal_block_title"/>
+    </optional>
+    <oneOrMore>
+      <ref name="mal_block_terms_item"/>
+    </oneOrMore>
+  </element>
+</define>
+
+<define name="mal_block_terms_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_terms_item">
+  <element name="item">
+    <ref name="mal_block_terms_item_attr"/>
+    <oneOrMore>
+      <ref name="mal_block_title"/>
+    </oneOrMore>
+    <oneOrMore>
+      <ref name="mal_block_terms_item_content"/>
+    </oneOrMore>
+  </element>
+</define>
+
+<define name="mal_block_terms_item_attr">
+  <group>
+    <optional>
+      <attribute name="style">
+        <data type="NMTOKENS" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
+      </attribute>
+    </optional>
+    <zeroOrMore>
+      <ref name="mal_attr_external"/>
+    </zeroOrMore>
+  </group>
+</define>
+
+<define name="mal_block_terms_item_content">
+  <ref name="mal_block"/>
+</define>
+
+<define name="mal_block_tree">
+  <element name="tree">
+    <ref name="mal_block_tree_attr"/>
+    <optional>
+      <ref name="mal_block_title"/>
+    </optional>
+    <oneOrMore>
+      <ref name="mal_block_tree_item"/>
+    </oneOrMore>
+  </element>
+</define>