diff --git a/ChangeLog b/ChangeLog
index 3029b53b..6b1604ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 25 14:16:51 CEST 2003 Daniel Veillard <daniel@veillard.com>
+
+	* SAX2.c hash.c parser.c include/libxml/xmlexports.h 
+	  include/libxml/xmlmemory.h include/libxml/xmlversion.h.in:
+	  fixing some comments to avoid warnings from apibuild.py
+
 Wed Sep 24 23:42:08 CEST 2003 Daniel Veillard <daniel@veillard.com>
 
 	* win32/configure.js: patch from Stephane Bidoul for configuring
diff --git a/SAX2.c b/SAX2.c
index f3051587..df1c67ec 100644
--- a/SAX2.c
+++ b/SAX2.c
@@ -1877,7 +1877,7 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt,
  * @nb_namespaces:  number of namespace definitions on that node
  * @namespaces:  pointer to the array of prefix/URI pairs namespace definitions
  * @nb_attributes:  the number of attributes on that node
- * nb_defaulted:  the number of defaulted attributes.
+ * @nb_defaulted:  the number of defaulted attributes.
  * @attributes:  pointer to the array of (localname/prefix/URI/value/end)
  *               attribute values.
  *
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 344009e3..a2a64577 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -1057,6 +1057,7 @@
      <exports symbol='XML_PARSE_DTDLOAD'/>
      <exports symbol='XML_PARSE_DTDVALID'/>
      <exports symbol='XML_PARSE_NOBLANKS'/>
+     <exports symbol='XML_PARSE_NODICT'/>
      <exports symbol='XML_PARSE_NOENT'/>
      <exports symbol='XML_PARSE_NOERROR'/>
      <exports symbol='XML_PARSE_NONET'/>
@@ -1500,6 +1501,7 @@
      <exports symbol='xmlDictOwns'/>
      <exports symbol='xmlDictPtr'/>
      <exports symbol='xmlDictQLookup'/>
+     <exports symbol='xmlDictReference'/>
      <exports symbol='xmlDictSize'/>
     </file>
     <file name='xmlexports'>
@@ -2906,9 +2908,10 @@
     <enum name='XML_PARSE_DTDLOAD' file='parser' value='4' type='xmlParserOption' info='load the external subset'/>
     <enum name='XML_PARSE_DTDVALID' file='parser' value='16' type='xmlParserOption' info='validate with the DTD'/>
     <enum name='XML_PARSE_NOBLANKS' file='parser' value='256' type='xmlParserOption' info='remove blank nodes'/>
+    <enum name='XML_PARSE_NODICT' file='parser' value='4096' type='xmlParserOption' info=' Do not reuse the context dictionnary'/>
     <enum name='XML_PARSE_NOENT' file='parser' value='2' type='xmlParserOption' info='substitute entities'/>
     <enum name='XML_PARSE_NOERROR' file='parser' value='32' type='xmlParserOption' info='suppress error reports'/>
-    <enum name='XML_PARSE_NONET' file='parser' value='2048' type='xmlParserOption' info=' Forbid network access'/>
+    <enum name='XML_PARSE_NONET' file='parser' value='2048' type='xmlParserOption' info='Forbid network access'/>
     <enum name='XML_PARSE_NOWARNING' file='parser' value='64' type='xmlParserOption' info='suppress warning reports'/>
     <enum name='XML_PARSE_PEDANTIC' file='parser' value='128' type='xmlParserOption' info='pedantic error reporting'/>
     <enum name='XML_PARSE_RECOVER' file='parser' value='1' type='xmlParserOption' info='recover on errors'/>
@@ -5891,6 +5894,11 @@ actually an xmlCharEncoding'/>
       <arg name='prefix' type='const xmlChar *' info='the prefix'/>
       <arg name='name' type='const xmlChar *' info='the name'/>
     </function>
+    <function name='xmlDictReference' file='dict'>
+      <info>Increment the reference counter of a dictionary</info>
+      <return type='int' info='0 in case of success and -1 in case of error'/>
+      <arg name='dict' type='xmlDictPtr' info='the dictionnary'/>
+    </function>
     <function name='xmlDictSize' file='dict'>
       <info>Query the number of elements installed in the hash @dict.</info>
       <return type='int' info='the number of elements in the dictionnary or -1 in case of error'/>
diff --git a/hash.c b/hash.c
index f9fc1619..9f1d3bbf 100644
--- a/hash.c
+++ b/hash.c
@@ -423,7 +423,7 @@ xmlHashQLookup(xmlHashTablePtr table, const xmlChar *prefix,
 }
 
 /**
- * xmlHashLookup2:
+ * xmlHashQLookup2:
  * @table: the hash table
  * @prefix: the prefix of the userdata
  * @name: the name of the userdata
diff --git a/include/libxml/xmlexports.h b/include/libxml/xmlexports.h
index 979103ec..4b40da7d 100644
--- a/include/libxml/xmlexports.h
+++ b/include/libxml/xmlexports.h
@@ -21,10 +21,23 @@
  * platform might need different definitions.
  */
 
-/* Defaults. These will be used on platforms which 
-   do not appear below. */
+/**
+ * XMLPUBFUN:
+ *
+ * Macros which declare an exportable function
+ */
 #define XMLPUBFUN
+/**
+ * XMLPUBVAR:
+ *
+ * Macros which declare an exportable variable
+ */
 #define XMLPUBVAR extern
+/**
+ * XMLCALL:
+ *
+ * Macros which declare the called convention for exported functions
+ */
 #define XMLCALL
 
 /* Windows platform with MS compiler */
diff --git a/include/libxml/xmlmemory.h b/include/libxml/xmlmemory.h
index 3b60a129..c78f65a4 100644
--- a/include/libxml/xmlmemory.h
+++ b/include/libxml/xmlmemory.h
@@ -5,8 +5,8 @@
  */
 
 
-#ifndef _DEBUG_MEMORY_ALLOC_
-#define _DEBUG_MEMORY_ALLOC_
+#ifndef __DEBUG_MEMORY_ALLOC__
+#define __DEBUG_MEMORY_ALLOC__
 
 #include <stdio.h>
 #include <libxml/xmlversion.h>
@@ -207,5 +207,5 @@ XMLPUBFUN char * XMLCALL
 #endif
 #endif
 
-#endif  /* _DEBUG_MEMORY_ALLOC_ */
+#endif  /* __DEBUG_MEMORY_ALLOC__ */
 
diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
index 759f0b98..e5ecc190 100644
--- a/include/libxml/xmlversion.h.in
+++ b/include/libxml/xmlversion.h.in
@@ -201,7 +201,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #endif
 
 /**
- * LIBXML_UNICODE_ENABLED
+ * LIBXML_UNICODE_ENABLED:
  *
  * Whether the Unicode related interfaces are compiled in
  */
@@ -210,7 +210,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #endif
 
 /**
- * LIBXML_REGEXP_ENABLED
+ * LIBXML_REGEXP_ENABLED:
  *
  * Whether the regular expressions interfaces are compiled in
  */
@@ -219,7 +219,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #endif
 
 /**
- * LIBXML_AUTOMATA_ENABLED
+ * LIBXML_AUTOMATA_ENABLED:
  *
  * Whether the automata interfaces are compiled in
  */
@@ -228,7 +228,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #endif
 
 /**
- * LIBXML_SCHEMAS_ENABLED
+ * LIBXML_SCHEMAS_ENABLED:
  *
  * Whether the Schemas validation interfaces are compiled in
  */
diff --git a/parser.c b/parser.c
index eb3a8a0e..30bd308f 100644
--- a/parser.c
+++ b/parser.c
@@ -1675,7 +1675,7 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
 }
 
 /**
- * xmlStringDecodeEntities:
+ * xmlStringLenDecodeEntities:
  * @ctxt:  the parser context
  * @str:  the input string
  * @len: the string length
diff --git a/xmlreader.c b/xmlreader.c
index 4c02a03b..91509320 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -2968,7 +2968,7 @@ xmlTextReaderXmlLang(xmlTextReaderPtr reader) {
 }
 
 /**
- * xmlTextReaderXmlLang:
+ * xmlTextReaderConstXmlLang:
  * @reader:  the xmlTextReaderPtr used
  *
  * The xml:lang scope within which the node resides.