2003-12-04  Geert Stappers <stappers@stappers.nl>

	* conglomerate.xml

	The FAQ is in this directory, not in ../../documentation.
	Fixes bugzilla #123131.

	* Makefile.am

	Added omf include file.

2003-11-10  David Malcolm <david@davemalcolm.demon.co.uk>

	* faq.xml

	Added a link to the website's generated list of dispspec files.

2003-11-03  David Malcolm <david@davemalcolm.demon.co.uk>

	* faq.xml

	Added information on supporting new document types

2003-10-21  David Malcolm <david@davemalcolm.demon.co.uk>

	* faq.xml

	New content, based mostly on a patch by Jeff Martin

2003-10-16  David Malcolm <david@davemalcolm.demon.co.uk>

	* faq.xml
	Started a major rewrite of the FAQ

2003-07-28  Geert Stappers <Stappers@Stappers.nl>

	* README
	Added information on files like faq.xml.
	Added the Unix manual page information.

	* conglomerate-refentry.xml, manpage.make, conglomerate.1
	New files, man page stuff.

	* Makefile.am
	Added the new files.

2003-07-19  Geert Stappers <Geert.Stappers@xs4all.nl>

	* conglomerate-C.omf
	Removed the hard coded path.

	* README
	Removed the hard coded path reminder.
	Made reference to scrollkeeper and omf.

2003-07-07  Geert Stappers <Geert.Stappers@xs4all.nl>

	* faq.xml
	Moved from old documentation directory into here.

	* Makefile.am 
	Told that there is a faq.xml for the distribution.

2003-07-03  Geert Stappers <Geert.Stappers@xs4all.nl>

	* ChangeLog
	Created.
