diff --git a/ChangeLog b/ChangeLog index 36045e60..08725dd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8139,7 +8139,7 @@ Wed Dec 10 11:16:29 CET 2003 Daniel Veillard Tue Dec 9 23:50:23 CET 2003 Daniel Veillard - * entities.c: fixed an XML entites content serialization + * entities.c: fixed an XML entities content serialization potentially triggered by XInclude, see #126817 Tue Dec 9 16:12:50 CET 2003 Daniel Veillard diff --git a/include/libxml/entities.h b/include/libxml/entities.h index 1e911897..0ee56df0 100644 --- a/include/libxml/entities.h +++ b/include/libxml/entities.h @@ -57,7 +57,7 @@ struct _xmlEntity { const xmlChar *URI; /* the full URI as computed */ int owner; /* does the entity own the childrens */ int checked; /* was the entity content checked */ - /* this is also used to count entites + /* this is also used to count entities * references done from that entity * and if it contains '<' */ }; diff --git a/parser.c b/parser.c index 4739add7..d9844be5 100644 --- a/parser.c +++ b/parser.c @@ -7757,7 +7757,7 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) { /* - * Predefined entites override any extra definition + * Predefined entities override any extra definition */ if ((ctxt->options & XML_PARSE_OLDSAX) == 0) { ent = xmlGetPredefinedEntity(name); diff --git a/xmllint.c b/xmllint.c index ebd36ab0..7e79070d 100644 --- a/xmllint.c +++ b/xmllint.c @@ -3003,7 +3003,7 @@ static void usage(const char *name) { printf("\t--noenc : ignore any encoding specified inside the document\n"); printf("\t--noout : don't output the result tree\n"); printf("\t--path 'paths': provide a set of paths for resources\n"); - printf("\t--load-trace : print trace of all external entites loaded\n"); + printf("\t--load-trace : print trace of all external entities loaded\n"); printf("\t--nonet : refuse to fetch DTDs or entities over network\n"); printf("\t--nocompact : do not generate compact text nodes\n"); printf("\t--htmlout : output results as HTML\n");