2004-12-04  Michèle Garoche  <michele.garoche@easyconnect.fr>

	* conglomerate-sections.txt: various changes to remove warnings
	at doc build time

2004-11-27  David Malcolm  <david@davemalcolm.demon.co.uk>

	* conglomerate-docs.sgml: added another tip for debugging the
	layout code
	
	* conglomerate-docs.sgml: word-wrapped the document

2004-11-16  Nickolay & Geert

	* bugzilla 158334

2004-10-27  Frederic Brin  <duckx@mezimail.com>

	* Makefile.am
	
	Added Enchant libs to the GTKDOC_LIBS
	
2004-10-27  Michèle Garoche  <michele.garoche@easyconnect.fr>

	* conglomerate-sections.txt:
	
	Removed section fo
	
	* conglomerate-docs.sgml:
	
	Removed &fo entity


2004-10-09  Michèle Garoche  <michele.garoche@easyconnect.fr>

	* conglomerate.types:
	
	Removed reference to fo.h

2004-09-23  David Malcolm  <david@davemalcolm.demon.co.uk>

	* conglomerate.types: 

	Added the various plugin/service GObject types

	* conglomerate-sections.txt: 

	Added titles for various sections

	* conglomerate-docs.sgml: 

	Reorganisation, mainly of plugins section

2004-09-07 Douglas Burke <dburke@cfa.harvard.edu>

	* conglomerate-docs.sgml

	Converted to match GTK+ docs (use of part rather than chapter
	to provide document structure). Added an index.
	
2004-09-02 Douglas Burke <dburke@cfa.harvard.edu>

	* conglomerate-docs.sgml

	Corrected a typo in a link attribute added in previous change.
	Added sect1 around initial text in the "The Editow Widget"
	chapter to match docbook DTD.

2004-09-01 Douglas Burke <dburke@cfa.harvard.edu>

	* conglomerate-docs.sgml

	Added missing pages (some may not be added to the best
	section) and updated the existing text to include links
	to pages.

	* conglomerate.types

	Added some missing include files/_get_type() functions.
	
2004-06-23 Nickolay V. Shmyrev <nshmyrev@yandex.ru>

	* README: Update.

	* conglomerate-sections.txt, conglomerate-types.txt:
	* conglomerate-overrides.txt: Update for recent sources.

	* conglomerate-docs.sgml: XInclude replaced with external
	entities. This is common practice of gtk-doc usage.

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

	* Makefile.am:
	- Added --main-sgml-file to gtkdoc-mkdb (as found in upstream example)
	- Minor cosmetic changes

2003-11-04  Boris Goldowsky  <boris@alum.mit.edu>

	* Makefile.am: don't die if index.sgml is missing.

2003-10-28  Geert Stappers <stappers@stappers.nl>

	* Makefile.am:
	- Removed calling the upstream mkgtkdoc scripts.
	- DOC_OVERRIDES only defined once.
	- original 'dist-hook directories'

2003-10-26  Robert Varga <frozenfingers@home.ro>

	* conglomerate-docs.sgml:
	
	Syncronized with source - added missing includes

2003-10-25  Geert Stappers <stappers@stappers.nl>

	* Makefile.am:
	Renaming upstreamscripts

2003-10-23  Robert Varga <frozenfingers@xs4all.nl>

	* Makefile.am:
	
	Removed included shell scripts; replaced by actual scripts in uss.

2003-10-19  Robert Varga <frozenfingers@xs4all.nl>

	* Makefile.am
	
	Object declarations and signals in documentation
	
	* conglomerate-docs.sgml
	
	Object tree in documentation
	
	* README
	
	Added information about changing conglomerate-docs.sgml
	
2003-10-15  Robert Varga <frozenfingers@xs4all.nl>

	* Makefile.am
	Maintenance free GTKDOC_LIBS that works with make distcheck

2003-10-11  Robert Varga <frozenfingers@xs4all.nl>

	* Makefile.am
	Maintiance free definition of GTKDOC_LIBS

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

	* Makefile.am

	Make object paths in GTKDOC_LIBS relative to current build location in another attempt to try to get make distcheck to work

	* Makefile.am

	Explicitly list all object files in GTKDOC_LIBS (was failing a make distcheck)

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

	* conglomerate-docs.sgml

	Added a hand-written version containing overviews of how the major parts of the program work

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

	* Makefile.am

	Added $(GTKSOURCEVIEW_LIBS) and $(PRINTING_LIBS) to GTKDOC_LIBS

2003-10-06  Robert Varga

	* Makefile.am
	Generate conglomerate-docs.sgml,
	cleaner definition of source files
	and a hack that generates conglomerate.types

	* conglomerate.types.bkp is dropped

2003-10-02  Geert Stappers <stappers@stappers.nl>

	* README
	new file

2003-09-26  David Malcolm <david@davemalcolm.demon.co.uk>

	* conglomerate-docs.sgml

	Fixed typo in title
	
	* Makefile.am, conglomerate-docs.sgml, conglomerate.types.bkp, version.xml.in

	Created the reference directory and added these files (from a patch by Varga Robert for bug #122900)