2004-10-15  Hervé Cauwelier <debian@oursours.net>

	* Makefile.am: Added faq.xml to be deleted on uninstall.

2004-07-24  Geert Stappers <stappers@stappers.nl>

	* conglomerate.1

	Regenerated with manpage.make

2004-07-24  Mich?le Garoche  <michele.garoche@easyconnect.fr>

	* conglomerate-refentry.xml

	Various typo fixes

2004-02-03  David Malcolm <david@davemalcolm.demon.co.uk>

	* faq.xml

	Updated to refer to service-id rather than plugin-id where appropriate

	* faq.xml

	Added TEI to DTD list; added notes about hooking up plugins in xds files

2004-01-14  Jeff Martin <jeff@custommonkey.org>
	
	* Makefile.am

	Add cong_element_map_ref.xml, conventions.xml, doc_type_support.xml, global.ent, glossary.xml, notice_fdl.xml, notice_gpl.xml, row_xml_lang_attrib.xml, tbl_element_attrib.xml to list of entities

2004-01-13  David Malcolm <david@davemalcolm.demon.co.uk>

	* conglomerate.xml

	Committed Sean Wheller's new User Manual over the top of Jeff Martin's old one

	* xds_dtd_def.xml

	Oops; missed one

	* cong_element_map_ref.xml, conventions.xml, doc_type_support.xml, global.ent, glossary.xml, notice_fdl.xml, notice_gpl.xml, row_xml_lang_attrib.xml, tbl_element_attrib.xml

	Added Sean Wheller's new documentation files

2004-01-08  Sean Wheller <sean@enbaya.co.za>

	* faq.xml

	root and DTD name now are matching.

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.
