Mark docbook symbols as removed

3 files changed, 28 insertions, 74 deletions

diff --git a/doc/symbols.xml b/doc/symbols.xml
index a52202a2..2b667e0a 100644
--- a/doc/symbols.xml
+++ b/doc/symbols.xml
@@ -60,7 +60,7 @@
     <symbol file="SAX">characters</symbol>
     <symbol file="SAX">checkNamespace</symbol>
     <symbol file="SAX">comment</symbol>
-    <symbol file="SAX2">docbDefaultSAXHandlerInit</symbol>
+    <symbol file="SAX2" removed="2.10.0">docbDefaultSAXHandlerInit</symbol>
     <symbol file="SAX">elementDecl</symbol>
     <symbol file="SAX">endDocument</symbol>
     <symbol file="SAX">endElement</symbol>
@@ -78,7 +78,7 @@
     <symbol file="SAX">hasInternalSubset</symbol>
     <symbol file="SAX2">htmlDefaultSAXHandlerInit</symbol>
     <symbol file="SAX">ignorableWhitespace</symbol>
-    <symbol file="SAX">initdocbDefaultSAXHandler</symbol>
+    <symbol file="SAX" removed="2.10.0">initdocbDefaultSAXHandler</symbol>
     <symbol file="SAX">inithtmlDefaultSAXHandler</symbol>
     <symbol file="SAX">initxmlDefaultSAXHandler</symbol>
     <symbol file="SAX">internalSubset</symbol>
@@ -401,16 +401,16 @@
     <symbol file="nanoftp">xmlNanoFTPRead</symbol>
     <symbol file="nanoftp">xmlNanoFTPScanProxy</symbol>
     <symbol file="nanoftp">xmlNanoFTPUpdateURL</symbol>
-    <symbol file="DOCBparser">docbCreateFileParserCtxt</symbol>
-    <symbol file="DOCBparser">docbCreatePushParserCtxt</symbol>
-    <symbol file="DOCBparser">docbEncodeEntities</symbol>
-    <symbol file="DOCBparser">docbFreeParserCtxt</symbol>
-    <symbol file="DOCBparser">docbParseChunk</symbol>
-    <symbol file="DOCBparser">docbParseDoc</symbol>
-    <symbol file="DOCBparser">docbParseDocument</symbol>
-    <symbol file="DOCBparser">docbParseFile</symbol>
-    <symbol file="DOCBparser">docbSAXParseDoc</symbol>
-    <symbol file="DOCBparser">docbSAXParseFile</symbol>
+    <symbol file="DOCBparser" removed="2.10.0">docbCreateFileParserCtxt</symbol>
+    <symbol file="DOCBparser" removed="2.10.0">docbCreatePushParserCtxt</symbol>
+    <symbol file="DOCBparser" removed="2.10.0">docbEncodeEntities</symbol>
+    <symbol file="DOCBparser" removed="2.10.0">docbFreeParserCtxt</symbol>
+    <symbol file="DOCBparser" removed="2.10.0">docbParseChunk</symbol>
+    <symbol file="DOCBparser" removed="2.10.0">docbParseDoc</symbol>
+    <symbol file="DOCBparser" removed="2.10.0">docbParseDocument</symbol>
+    <symbol file="DOCBparser" removed="2.10.0">docbParseFile</symbol>
+    <symbol file="DOCBparser" removed="2.10.0">docbSAXParseDoc</symbol>
+    <symbol file="DOCBparser" removed="2.10.0">docbSAXParseFile</symbol>
     <symbol file="xpath">xmlXPathCastBooleanToNumber</symbol>
     <symbol file="xpath">xmlXPathCastBooleanToString</symbol>
     <symbol file="xpath">xmlXPathCastNodeSetToBoolean</symbol>
@@ -726,7 +726,7 @@
     <symbol file="xmlreader">xmlTextReaderRead</symbol>
     <symbol file="xmlreader">xmlTextReaderValue</symbol>
     <symbol file="xmlreader">xmlTextReaderXmlLang</symbol>
-    <symbol file="globals">docbDefaultSAXHandler</symbol>
+    <symbol file="globals" removed="2.10.0">docbDefaultSAXHandler</symbol>
     <symbol file="globals">htmlDefaultSAXHandler</symbol>
     <symbol file="globals">xmlDefaultSAXHandler</symbol>
     <symbol file="globals">xmlDefaultSAXLocator</symbol>
@@ -1285,7 +1285,7 @@
     <symbol file="SAX2">xmlSAX2HasInternalSubset</symbol>
     <symbol file="SAX2">xmlSAX2IgnorableWhitespace</symbol>
     <symbol file="SAX2">xmlSAX2InitDefaultSAXHandler</symbol>
-    <symbol file="SAX2">xmlSAX2InitDocbDefaultSAXHandler</symbol>
+    <symbol file="SAX2" removed="2.10.0">xmlSAX2InitDocbDefaultSAXHandler</symbol>
     <symbol file="SAX2">xmlSAX2InitHtmlDefaultSAXHandler</symbol>
     <symbol file="SAX2">xmlSAX2InternalSubset</symbol>
     <symbol file="SAX2">xmlSAX2IsStandalone</symbol>
diff --git a/libxml2.syms b/libxml2.syms
index 33bc112c..f692a1c7 100644
--- a/libxml2.syms
+++ b/libxml2.syms
@@ -76,7 +76,7 @@ LIBXML2_2.4.30 {
   comment;
 
 # SAX2
-  docbDefaultSAXHandlerInit;
+# docbDefaultSAXHandlerInit; removed in 2.10.0
 
 # SAX
   elementDecl;
@@ -100,7 +100,7 @@ LIBXML2_2.4.30 {
 
 # SAX
   ignorableWhitespace;
-  initdocbDefaultSAXHandler;
+# initdocbDefaultSAXHandler; removed in 2.10.0
   inithtmlDefaultSAXHandler;
   initxmlDefaultSAXHandler;
   internalSubset;
@@ -453,16 +453,16 @@ LIBXML2_2.4.30 {
   xmlNanoFTPUpdateURL;
 
 # DOCBparser
-  docbCreateFileParserCtxt;
-  docbCreatePushParserCtxt;
-  docbEncodeEntities;
-  docbFreeParserCtxt;
-  docbParseChunk;
-  docbParseDoc;
-  docbParseDocument;
-  docbParseFile;
-  docbSAXParseDoc;
-  docbSAXParseFile;
+# docbCreateFileParserCtxt; removed in 2.10.0
+# docbCreatePushParserCtxt; removed in 2.10.0
+# docbEncodeEntities; removed in 2.10.0
+# docbFreeParserCtxt; removed in 2.10.0
+# docbParseChunk; removed in 2.10.0
+# docbParseDoc; removed in 2.10.0
+# docbParseDocument; removed in 2.10.0
+# docbParseFile; removed in 2.10.0
+# docbSAXParseDoc; removed in 2.10.0
+# docbSAXParseFile; removed in 2.10.0
 
 # xpath
   xmlXPathCastBooleanToNumber;
@@ -818,7 +818,7 @@ LIBXML2_2.4.30 {
   xmlTextReaderXmlLang;
 
 # globals
-  docbDefaultSAXHandler; # variable
+# docbDefaultSAXHandler; removed in 2.10.0
   htmlDefaultSAXHandler; # variable
   xmlDefaultSAXHandler; # variable
   xmlDefaultSAXLocator; # variable
@@ -1503,7 +1503,7 @@ LIBXML2_2.6.0 {
   xmlSAX2HasInternalSubset;
   xmlSAX2IgnorableWhitespace;
   xmlSAX2InitDefaultSAXHandler;
-  xmlSAX2InitDocbDefaultSAXHandler;
+# xmlSAX2InitDocbDefaultSAXHandler; removed in 2.10.0
   xmlSAX2InitHtmlDefaultSAXHandler;
   xmlSAX2InternalSubset;
   xmlSAX2IsStandalone;
diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src
index c50d6498..d83dbf4a 100644
--- a/win32/libxml2.def.src
+++ b/win32/libxml2.def.src
@@ -2,15 +2,6 @@
 #include "../include/libxml/xmlversion.h"
 LIBRARY libxml2
 EXPORTS
-#ifdef LIBXML_THREAD_ENABLED
-#ifdef LIBXML_DOCB_ENABLED
-__docbDefaultSAXHandler
-#endif
-#else
-#ifdef LIBXML_DOCB_ENABLED
-docbDefaultSAXHandler DATA
-#endif
-#endif
 #ifdef LIBXML_REGEXP_ENABLED
 emptyExp DATA
 #endif
@@ -191,39 +182,6 @@ cdataBlock
 characters
 checkNamespace
 comment
-#ifdef LIBXML_DOCB_ENABLED
-docbCreateFileParserCtxt
-#endif
-#ifdef LIBXML_DOCB_ENABLED
-docbCreatePushParserCtxt
-#endif
-#ifdef LIBXML_DOCB_ENABLED
-docbDefaultSAXHandlerInit
-#endif
-#ifdef LIBXML_DOCB_ENABLED
-docbEncodeEntities
-#endif
-#ifdef LIBXML_DOCB_ENABLED
-docbFreeParserCtxt
-#endif
-#ifdef LIBXML_DOCB_ENABLED
-docbParseChunk
-#endif
-#ifdef LIBXML_DOCB_ENABLED
-docbParseDoc
-#endif
-#ifdef LIBXML_DOCB_ENABLED
-docbParseDocument
-#endif
-#ifdef LIBXML_DOCB_ENABLED
-docbParseFile
-#endif
-#ifdef LIBXML_DOCB_ENABLED
-docbSAXParseDoc
-#endif
-#ifdef LIBXML_DOCB_ENABLED
-docbSAXParseFile
-#endif
 elementDecl
 endDocument
 endElement
@@ -415,9 +373,6 @@ htmlTagLookup
 #endif
 ignorableWhitespace
 initGenericErrorDefaultFunc
-#ifdef LIBXML_DOCB_ENABLED
-initdocbDefaultSAXHandler
-#endif
 #ifdef LIBXML_HTML_ENABLED
 inithtmlDefaultSAXHandler
 #endif
@@ -1580,7 +1535,6 @@ xmlSAX2HasExternalSubset
 xmlSAX2HasInternalSubset
 xmlSAX2IgnorableWhitespace
 xmlSAX2InitDefaultSAXHandler
-xmlSAX2InitDocbDefaultSAXHandler
 xmlSAX2InitHtmlDefaultSAXHandler
 xmlSAX2InternalSubset
 xmlSAX2IsStandalone