doc update: mention account-hook in the docs for $tunnel (Closes: 504530)

diff --git a/debian/changelog b/debian/changelog
index e7218bb85703bfd6eacad1a801918fa552655d0d..f9842eec1d84dd00d67672feea2b9777d3595f5c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ mutt (1.5.19-4) unstable; urgency=low
     + display bcc for postponed message if there is no To (Closes: 350957)
   * patches/upstream/502628-attach_charset-doc.patch
     + doc update: clarify what attach_charset does (Closes: 502628)
+  * patches/upstream/504530-stunnel-account_hook-doc.patch 
+    + doc update: mention account-hook in the docs for $tunnel (Closes: 504530)
 
  -- Antonio Radici <antonio@dyne.org>  Tue, 26 May 2009 23:42:51 +0100
 

diff --git a/debian/patches/series b/debian/patches/series
index 5e4b601b0926a7236c5c9146f98b1d0218e82dc4..13d5da80898e4d57e27b909db4ebf028869adb6b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,6 +36,7 @@ upstream/514960-certificate-insecure-algorithm.patch
 upstream/524420-segfault-reconnect-sasl.patch
 upstream/350957-postponed-to-bcc.patch
 upstream/502628-attach_charset-doc.patch
+upstream/504530-stunnel-account_hook-doc.patch
 
 misc/hyphen-as-minus.patch
 misc/manpage-typos.patch

diff --git a/debian/patches/upstream/504530-stunnel-account_hook-doc.patch b/debian/patches/upstream/504530-stunnel-account_hook-doc.patch
new file mode 100644 (file)
index 0000000..7fea22f
--- /dev/null
+++ b/debian/patches/upstream/504530-stunnel-account_hook-doc.patch
@@ -0,0 +1,16 @@
+Mention account-hook in the docs for $tunnel, see http://bugs.mutt.org/3237
+and http://bugs.debian.org/504530
+
+--- a/init.h
++++ b/init.h
+@@ -2410,6 +2410,10 @@
+   ** .pp
+   ** Note: For this example to work, you must be able to log in to the
+   ** remote machine without having to enter a password.
++  ** .pp
++  ** When set, Mutt uses the tunnel for all remote connections.
++  ** Please see ``$account-hook'' in the manual for how to use different
++  ** tunnel commands per connection.
+   */
+ #endif /* USE_SOCKET */
+   { "print",          DT_QUAD, R_NONE, OPT_PRINT, M_ASKNO },