preparing 2.4.11 better --catalogs description Daniel
* configure.in include/libxml/xmlwin32version.h: preparing 2.4.11
* xmllint.c: better --catalogs description
Daniel
diff --git a/ChangeLog b/ChangeLog
index 48e57ab..6db302d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 26 11:31:36 CET 2001 Daniel Veillard <daniel@veillard.com>
+
+ * configure.in include/libxml/xmlwin32version.h: preparing 2.4.11
+ * xmllint.c: better --catalogs description
+
Sun Nov 25 11:34:24 CET 2001 Daniel Veillard <daniel@veillard.com>
* tree.c: fixed a couple of problems in xmlSetProp()
diff --git a/configure.in b/configure.in
index 756dd39..b527e75 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@
LIBXML_MAJOR_VERSION=2
LIBXML_MINOR_VERSION=4
-LIBXML_MICRO_VERSION=10
+LIBXML_MICRO_VERSION=11
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
diff --git a/include/libxml/xmlwin32version.h b/include/libxml/xmlwin32version.h
index e6091e9..3d64f05 100644
--- a/include/libxml/xmlwin32version.h
+++ b/include/libxml/xmlwin32version.h
@@ -27,21 +27,21 @@
*
* the version string like "1.2.3"
*/
-#define LIBXML_DOTTED_VERSION "2.4.10"
+#define LIBXML_DOTTED_VERSION "2.4.11"
/**
* LIBXML_VERSION:
*
* the version number: 1.2.3 value is 1002003
*/
-#define LIBXML_VERSION 20410
+#define LIBXML_VERSION 20411
/**
* LIBXML_VERSION_STRING:
*
* the version number string, 1.2.3 value is "1002003"
*/
-#define LIBXML_VERSION_STRING "20410"
+#define LIBXML_VERSION_STRING "20411"
/**
* LIBXML_TEST_VERSION:
@@ -49,7 +49,7 @@
* Macro to check that the libxml version in use is compatible with
* the version the software has been compiled against
*/
-#define LIBXML_TEST_VERSION xmlCheckVersion(20410);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20411);
#if 0
/**
diff --git a/xmllint.c b/xmllint.c
index 5255356..11d16df 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -853,8 +853,9 @@
printf("\t--testIO : test user I/O support\n");
printf("\t--encode encoding : output in the given encoding\n");
#ifdef LIBXML_CATALOG_ENABLED
- printf("\t--catalogs : use the catalogs from $SGML_CATALOG_FILES\n");
- printf("\t otherwise /etc/xml/catalog is activated by default\n");
+ printf("\t--catalogs : use SGML catalogs from $SGML_CATALOG_FILES\n");
+ printf("\t otherwise XML Catalogs starting from \n");
+ printf("\t file:///etc/xml/catalog are activated by default\n");
printf("\t--nocatalogs: deactivate all catalogs\n");
#endif
printf("\t--auto : generate a small doc on the fly\n");
