diff --git a/doc/apibuild.py b/doc/apibuild.py
index df1d66b9..bc12f01e 100755
--- a/doc/apibuild.py
+++ b/doc/apibuild.py
@@ -47,6 +47,7 @@ ignored_words = {
   "X_IN_Y": (5, "macro function builder"),
   "XSLT_ITEM_COMMON_FIELDS": (0, "Special macro"),
   "CALLBACK": (0, "macro keyword"),
+  "LIBXSLT_ATTR_FORMAT": (5, "macro for gcc printf args checking extension"),
 }
 
 def escape(raw):
diff --git a/doc/newapi.xsl b/doc/newapi.xsl
index 5664e71d..79545be4 100644
--- a/doc/newapi.xsl
+++ b/doc/newapi.xsl
@@ -471,7 +471,7 @@
       <xsl:with-param name="text" select="info"/>
     </xsl:call-template>
     </p>
-    <xsl:if test="arg | return">
+    <xsl:if test="arg | return/@info">
       <div class="variablelist"><table border="0"><col align="left"/><tbody>
       <xsl:for-each select="arg">
         <tr>
diff --git a/doc/symbols.xml b/doc/symbols.xml
index e1bbb38f..02ccf583 100644
--- a/doc/symbols.xml
+++ b/doc/symbols.xml
@@ -314,4 +314,7 @@
     <symbol file="xsltlocale">xsltFreeLocales</symbol>
     <symbol file="xsltutils">xsltXPathCompileFlags</symbol>
   </release>
+  <release version="1.1.30">
+    <symbol file="xsltInternals">xsltFlagRVTs</symbol>
+  </release>
 </symbols>
diff --git a/libxslt/attributes.c b/libxslt/attributes.c
index 9165ab13..5958ef3c 100644
--- a/libxslt/attributes.c
+++ b/libxslt/attributes.c
@@ -742,9 +742,9 @@ xsltResolveStylesheetAttributeSet(xsltStylesheetPtr style) {
 /**
  * xsltAttribute:
  * @ctxt:  a XSLT process context
- * @node:  the current node in the source tree
+ * @contextNode:  the current node in the source tree
  * @inst:  the xsl:attribute element
- * @comp:  precomputed information
+ * @castedComp:  precomputed information
  *
  * Process the xslt attribute node on the source node
  */
diff --git a/libxslt/variables.h b/libxslt/variables.h
index f80eeab6..24acf8d1 100644
--- a/libxslt/variables.h
+++ b/libxslt/variables.h
@@ -38,9 +38,35 @@ extern "C" {
  * Flags for memory management of RVTs
  */
 
+/**
+ * XSLT_RVT_LOCAL:
+ *
+ * RVT is destroyed after the current instructions ends.
+ */
 #define XSLT_RVT_LOCAL       ((void *)1)
+
+/**
+ * XSLT_RVT_VARIABLE:
+ *
+ * RVT is part of a local variable and destroyed after the variable goes out
+ * of scope.
+ */
 #define XSLT_RVT_VARIABLE    ((void *)2)
+
+/**
+ * XSLT_RVT_FUNC_RESULT:
+ *
+ * RVT is part of results returned with func:result. The RVT won't be
+ * destroyed after exiting a template and will be reset to XSLT_RVT_LOCAL or
+ * XSLT_RVT_VARIABLE in the template that receives the return value.
+ */
 #define XSLT_RVT_FUNC_RESULT ((void *)3)
+
+/**
+ * XSLT_RVT_GLOBAL:
+ *
+ * RVT is part of a global variable.
+ */
 #define XSLT_RVT_GLOBAL      ((void *)4)
 
 /*