Merge changes made in Gnus trunk.

shr.el: Start implementation.
shr.el: Continue implementation.
gnus-gravatar.el (gnus-gravatar-insert): Adjust character where we should go backward.
shr.el: Minimally useful state achieved.
mm-decode.el (mm-text-html-renderer): Switch to using shr.el for HTML rendering.
shr.el: (shr-insert): Add a newline after every picture before text.
gnus.texi (Splitting Mail): Really fix the @ref syntax.
shr.el (shr-add-font): Use overlays for combining faces.
shr.el (shr-add-font): Use overlays for combining faces.
shr.el (shr-insert): Pass upwards the text start point.
gnus-util.el: Reintroduce multiple completion functions.

2 files changed, 2 insertions, 1 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 299f29166ea..0b2c79088ac 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,6 +1,7 @@
 2010-10-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.texi (Splitting Mail): Fix @xref syntax.
+        (Splitting Mail): Really fix the @ref syntax.
 
 2010-10-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 5431a57dc5a..00f58b2307a 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -15111,7 +15111,7 @@ message.  The function should return a list of group names that it
 thinks should carry this mail message.
 
 This variable can also be a fancy split method.  For the syntax,
-@pxref{Fancy Mail Splitting}.
+see @ref{Fancy Mail Splitting}.
 
 Note that the mail back ends are free to maul the poor, innocent,
 incoming headers all they want to.  They all add @code{Lines} headers;