Updated the doc a bit, Daniel.
diff --git a/ChangeLog b/ChangeLog
index 0906f23..861561b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Aug 19 18:38:53 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
+
+ * doc/xml.html libxml.* structure.*: updated the doc a bit
+
Thu Aug 17 15:50:00 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* testSAX.c testHTML.c result/HTML/: cleanup of the output
@@ -25,6 +29,7 @@
* config.in: Removed @LIBS@ from xml-config because @XML_LIBS@
includes @LIBS@
+>>>>>>> 1.186
Sat Aug 12 23:19:42 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* doc/* : rebuilt the docs