merge from no gnus

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 2771ecd..4af56cf 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -13,6 +13,11 @@
 
        * gnus.texi (Key Index): Change encoding to utf-8.
 
+2012-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus.texi (Mail Source Specifiers): Add a pop3 via an SSH tunnel
+       example (modified from an example by Michael Albinus).
+
 2012-01-30  Philipp Haselwarter  <philipp.haselwarter@gmx.de>  (tiny change)
 
        * gnus.texi (Agent Basics): Fix outdated description of

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 343b5f2..ab30503 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -14761,6 +14761,18 @@ corresponding keywords.
 A script to be run before fetching the mail.  The syntax is the same as
 the @code{:program} keyword.  This can also be a function to be run.
 
+One popular way to use this is to set up an SSH tunnel to access the
+@acronym{POP} server.  Here's an example:
+
+@lisp
+(pop :server "127.0.0.1"
+     :port 1234
+     :user "foo"
+     :password "secret"
+     :prescript
+     "nohup ssh -f -L 1234:pop.server:110 remote.host sleep 3600 &")
+@end lisp
+
 @item :postscript
 A script to be run after fetching the mail.  The syntax is the same as
 the @code{:program} keyword.  This can also be a function to be run.