# HG changeset patch
# User Lars Magne Ingebrigtsen <larsi@gnus.org>
# Date 1284311785 -7200
# Node ID 5988195cbf4cb7b83ea147e9fdbd431ed5eb0809
# Parent  405e3949f5806c9a6c49e5149d861ad7d8e8c983
* xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.

diff -r 405e3949f580 -r 5988195cbf4c src/ChangeLog
--- a/src/ChangeLog	Sun Sep 12 16:35:37 2010 +0200
+++ b/src/ChangeLog	Sun Sep 12 19:16:25 2010 +0200
@@ -1,3 +1,7 @@
+2010-09-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* xml.c (Fhtml_parse_string, Fxml_parse_string): Mention BASE-URL.
+
 2010-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* fns.c (Fy_or_n_p): Move to lisp/subr.el.
diff -r 405e3949f580 -r 5988195cbf4c src/xml.c
--- a/src/xml.c	Sun Sep 12 16:35:37 2010 +0200
+++ b/src/xml.c	Sun Sep 12 19:16:25 2010 +0200
@@ -109,7 +109,9 @@
 
 DEFUN ("html-parse-string", Fhtml_parse_string, Shtml_parse_string,
        0, 2, 0,
-       doc: /* Parse the string as an HTML document and return the parse tree.*/)
+       doc: /* Parse the string as an HTML document and return the parse tree.
+If BASE-URL is non-nil, it will be used to expand relative URLs in
+the HTML document.*/)
   (Lisp_Object string, Lisp_Object base_url)
 {
   return parse_buffer (string, base_url, 1);
@@ -117,7 +119,9 @@
 
 DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string,
        0, 2, 0,
-       doc: /* Parse the string as an XML document and return the parse tree.*/)
+       doc: /* Parse the string as an XML document and return the parse tree.
+If BASE-URL is non-nil, it will be used to expand relative URLs in
+the XML document.*/)
   (Lisp_Object string, Lisp_Object base_url)
 {
   return parse_buffer (string, base_url, 0);