[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 6.0-61-g47d5a62

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 11533756ab6feb5616ef40f9bd535cf48c6f4323
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Oct 4 22:05:56 2011 +0200

    clarify TLS question in --configure and the manpage entry for conf file; thanks to Jakob Bohm for the report; Closes: #642554

diff --git a/bin/reportbug b/bin/reportbug
index c23d322..76c2b0e 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -621,7 +621,9 @@ def offer_configuration(options):
 
     if smtphost:
         smtptls = ui.yes_no(
-            'Does your SMTP host require TLS authentication?', 'Yes', 'No', default=False)
+            'Do you want to encrypt the SMTP connection with TLS (only '
+            'available if the SMTP host supports it)?', 'Yes', 'No',
+            default=False)
 
     http_proxy = ui.get_string(
        'Please enter the name of your proxy server.  It should only '
diff --git a/debian/changelog b/debian/changelog
index 448d8bf..900f4e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,11 @@ reportbug (6.2.2) UNRELEASED; urgency=low
     - when searching thru the bugs list, return a Bugreport instance instead of
       the bug number; thanks to Olivier Berger for reopening the bug; hopefully
       completely Closes: #640196
+  * bin/reportbug, man/reportbug.conf.5
+    - clarify TLS question in --configure and the manpage entry for conf file;
+      thanks to Jakob Bohm for the report; Closes: #642554
 
- -- Sandro Tosi <morph at debian.org>  Tue, 04 Oct 2011 21:47:32 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 04 Oct 2011 22:05:04 +0200
 
 reportbug (6.2.1) unstable; urgency=low
 
diff --git a/man/reportbug.conf.5 b/man/reportbug.conf.5
index ad5b582..915793e 100644
--- a/man/reportbug.conf.5
+++ b/man/reportbug.conf.5
@@ -240,7 +240,7 @@ The username to use for SMTP. Example:
 
 .TP
 .B smtptls
-Enables TLS encryption.
+Enables TLS encryption for the SMTP connection.
 .TP
 .B submit
 Use \fIsubmit\fP as the bug submission address.

-- 
Reportbug - reports bugs in the Debian distribution