Partially, a follow-up of 81d7a8245cf9a31a49499a5a195c2b89e6f91180.
Signed-off-by: Jan Pokorný <jpoko...@redhat.com>
---
ChangeLog | 2 +-
include/libxml/entities.h | 2 +-
parser.c | 2 +-
xmllint.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 36045e6..08725dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8139,7 +8139,7 @@ Wed Dec 10 11:16:29 CET 2003 Daniel Veillard
<dan...@veillard.com>
Tue Dec 9 23:50:23 CET 2003 Daniel Veillard <dan...@veillard.com>
- * 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 <dan...@veillard.com>
diff --git a/include/libxml/entities.h b/include/libxml/entities.h
index 1e91189..0ee56df 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 4739add..d9844be 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 ebd36ab..7e79070 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");
--
1.8.1.4
_______________________________________________
xml mailing list, project page http://xmlsoft.org/
xml@gnome.org
https://mail.gnome.org/mailman/listinfo/xml
