Merge changes made in Gnus trunk.

nnir.el: Fix typo in comments.
 (nnir-run-imap): Simplify code. No need to reverse artlist.
 (nnir-run-gmane): Use nnir-tmp-buffer for web results.
gnus-srvr.el (gnus-server-show-server): New command and keystroke.
nnimap.el (nnimap-get-capabilities): Refactor out.
 (nnimap-open-connection): Re-request capabilities after STARTTLS.
gnus.texi (Server Commands): Document gnus-server-show-server.

2 files changed, 9 insertions, 0 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d94044d5b80..38671f1410c 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Server Commands): Document gnus-server-show-server.
+
 2010-11-20  Michael Albinus  <michael.albinus@gmx.de>
 
         Sync with Tramp 2.2.0.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 5ce214a6912..ad9be300a1d 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -13840,6 +13840,11 @@ Add a new server (@code{gnus-server-add-server}).
 @findex gnus-server-edit-server
 Edit a server (@code{gnus-server-edit-server}).
 
+@item S
+@kindex S (Server)
+@findex gnus-server-show-server
+Show the definition of a server (@code{gnus-server-show-server}).
+
 @item SPACE
 @kindex SPACE (Server)
 @findex gnus-server-read-server