diff --git a/doc/apibuild.py b/doc/apibuild.py
index 7641dd1f..dbe9e12a 100755
--- a/doc/apibuild.py
+++ b/doc/apibuild.py
@@ -21,6 +21,7 @@ debugsym=None
 ignored_files = {
   "config.h": "generated portability layer",
   "libxml.h": "internal only",
+  "lintmain.c": "executable",
   "testModule.c": "test tool",
   "testapi.c": "generated regression tests",
   "runtest.c": "regression tests program",
@@ -33,6 +34,8 @@ ignored_files = {
   "nanoftp.h": "empty",
   "SAX.h": "empty",
   "xmlunicode.h": "empty",
+  "xmllint.c": "executable",
+  "xmlcatalog.c": "executable",
 }
 
 ignored_words = {
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index fb95c15d..980e755e 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -5724,10 +5724,6 @@ crash if you try to modify the tree)'/>
     <typedef name='xmlCharEncoding' file='encoding' type='enum'/>
     <struct name='xmlCharEncodingHandler' file='encoding' type='struct _xmlCharEncodingHandler'>
       <field name='name' type='char *'/>
-      <field name='input' type='xmlCharEncodingInputFunc'/>
-      <field name='output' type='xmlCharEncodingOutputFunc'/>
-      <field name='iconv_in' type='void *'/>
-      <field name='iconv_out' type='void *'/>
       <field name='inputCtxt' type='void *'/>
       <field name='outputCtxt' type='void *'/>
       <field name='ctxtDtor' type='xmlCharEncConvCtxtDtor'/>
@@ -12263,14 +12259,14 @@ crash if you try to modify the tree)'/>
       <return type='void'/>
     </function>
     <functype name='xmlResourceLoader' file='parser' module='parser'>
-      <info></info>
-      <return type='int' info=''/>
-      <arg name='ctxt' type='void *' info=''/>
-      <arg name='url' type='const char *' info=''/>
-      <arg name='publicId' type='const char *' info=''/>
-      <arg name='type' type='xmlResourceType' info=''/>
-      <arg name='flags' type='int' info=''/>
-      <arg name='out' type='xmlParserInputPtr *' info=''/>
+      <info>Callback for custom resource loaders.  @flags can contain XML_INPUT_UNZIP and XML_INPUT_NETWORK.</info>
+      <return type='int' info='an xmlParserError code.'/>
+      <arg name='ctxt' type='void *' info='parser context'/>
+      <arg name='url' type='const char *' info='URL to load'/>
+      <arg name='publicId' type='const char *' info='publid ID from DTD (optional)'/>
+      <arg name='type' type='xmlResourceType' info='resource type'/>
+      <arg name='flags' type='int' info='flags'/>
+      <arg name='out' type='xmlParserInputPtr *' info='result pointer'/>
     </functype>
     <function name='xmlSAX2AttributeDecl' file='SAX2' module='SAX2'>
       <info>An attribute definition has been parsed</info>
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index d78304cb..54f81c95 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -193,6 +193,24 @@ typedef struct _xmlStartTag xmlStartTag;
 typedef struct _xmlParserNsData xmlParserNsData;
 typedef struct _xmlAttrHashBucket xmlAttrHashBucket;
 
+/**
+ * xmlResourceLoader:
+ * @ctxt:  parser context
+ * @url:  URL to load
+ * @publicId:  publid ID from DTD (optional)
+ * @type:  resource type
+ * @flags:  flags
+ * @out:  result pointer
+ *
+ * Callback for custom resource loaders.
+ *
+ * @flags can contain XML_INPUT_UNZIP and XML_INPUT_NETWORK.
+ *
+ * On success, @out should be set to a new parser input object and
+ * XML_ERR_OK should be returned.
+ *
+ * Returns an xmlParserError code.
+ */
 typedef int
 (*xmlResourceLoader)(void *ctxt, const char *url, const char *publicId,
                      xmlResourceType type, int flags, xmlParserInputPtr *out);
diff --git a/xmlIO.c b/xmlIO.c
index b5615c45..b2d86ec9 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -1037,6 +1037,17 @@ xmlIODefaultMatch(const char *filename ATTRIBUTE_UNUSED) {
     return(1);
 }
 
+/**
+ * xmlInputFromFd:
+ * @buf:  parser input buffer
+ * @fd:  file descriptor
+ * @flags:  flags
+ *
+ * Update the buffer to read from @fd. Supports the XML_INPUT_UNZIP
+ * flag.
+ *
+ * Returns an xmlParserError code.
+ */
 int
 xmlInputFromFd(xmlParserInputBufferPtr buf, int fd, int flags) {
     xmlFdIOCtxt *fdctxt;