Merge changes made in Gnus trunk.

shr.el: Use defface to create shr-tag-h[1-6] faces to fontify h[1-6] tags.
mml-smime.el (mml-smime-use): Make it a defcustom and default to 'epg if EPG is loaded.
message.texi (IDNA): Explain what it is.
gnus.texi (The Empty Backend): Document nnnil (bug #7653).
gnus-agent.el (gnus-agent-prompt-send-queue): Whitespace fix.
shr.el (shr-expand-newlines): Proof of concept implemantation of boxy backgrounds.
 (shr-expand-newlines): Switch to using overlays to enable kill'n'yank in a more sensible manner.

3 files changed, 30 insertions, 0 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 805a048ee2f..cafa02356a9 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-24  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * message.texi (IDNA): Explain what it is.
+
+2011-01-24  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (The Empty Backend): Document nnnil (bug #7653).
+
 2011-01-23  Werner Lemberg  <wl@gnu.org>
 
         * Makefile.in (MAKEINFO): Now controlled by `configure'.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 21f65e7c407..df6d212d2f5 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -704,6 +704,7 @@ Other Sources
 * Anything Groups::             Dired?  Who needs dired?
 * Document Groups::             Single files can be the basis of a group.
 * Mail-To-News Gateways::       Posting articles via mail-to-news gateways.
+* The Empty Backend::           The backend that never has any news.
 
 Document Groups
 
@@ -17127,6 +17128,7 @@ newsgroups.
 * Anything Groups::             Dired?  Who needs dired?
 * Document Groups::             Single files can be the basis of a group.
 * Mail-To-News Gateways::       Posting articles via mail-to-news gateways.
+* The Empty Backend::           The backend that never has any news.
 @end menu
 
 
@@ -17574,6 +17576,22 @@ So, to use this, simply say something like:
 @end lisp
 
 
+@node The Empty Backend
+@subsection The Empty Backend
+@cindex nnnil
+
+@code{nnnil} is a backend that can be used as a placeholder if you
+have to specify a backend somewhere, but don't really want to.  The
+classical example is if you don't want to have a primary select
+methods, but want to only use secondary ones:
+
+@lisp
+(setq gnus-select-method '(nnnil ""))
+(setq gnus-secondary-select-methods
+      '((nnimap "foo")
+        (nnml "")))
+@end lisp
+
 
 @node Combined Groups
 @section Combined Groups
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 39ca57f6103..45cfe75da83 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -886,6 +886,10 @@ Manual}).
 @cindex internationalized domain names
 @cindex non-ascii domain names
 
+@acronym{IDNA} is a standard way to encode non-@acronym{ASCII} domain
+names into a readable @acronym{ASCII} string.  The details can be
+found in RFC 3490.
+
 Message is a @acronym{IDNA}-compliant posting agent.  The user
 generally doesn't have to do anything to make the @acronym{IDNA}
 happen---Message will encode non-@acronym{ASCII} domain names in @code{From},