From 5426d7874796ebe473959b8adc7f9ca6294ad0c9 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Wed, 23 Sep 2009 23:11:12 +0000
Subject: Fetchmailconf: Fix descriptions for smtpaddress and smtpname options

Smtpaddress is for RCPT TO, not MAIL FROM.  Found by Gerard Seibert.
'Append to MAIL FROM line:' => 'Use domain on RCPT TO line:'
'Set RCPT To address:' => 'Set fixed RCPT TO address:'

svn path=/branches/BRANCH_6-3/; revision=5433
---
 NEWS             | 2 ++
 fetchmailconf.py | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 3ed6160d..4feaac77 100644
--- a/NEWS
+++ b/NEWS
@@ -69,6 +69,8 @@ fetchmail 6.3.12 (released XXXX-XX-XX - not yet):
 * Report multiline SMTP errors properly, reported by Earl Chew; fixes Debian Bug
   #569899, reported by Akihiro Terasaki.
 * Replace control characters in SMTP replies by '?'.
+* Fetchmailconf: Fix descriptions for smtpaddress and smtpname options;
+  smtpaddress is for RCPT TO, not MAIL FROM. Found by Gerard Seibert.
 
 # TRANSLATION UPDATES AND ADDITIONS (ordered by language name):
 * [ca]    Catalan (Ernest Adrogué Calveras)
diff --git a/fetchmailconf.py b/fetchmailconf.py
index 5af382c7..90a2dea5 100755
--- a/fetchmailconf.py
+++ b/fetchmailconf.py
@@ -5,7 +5,7 @@
 # Matthias Andree <matthias.andree@gmx.de>
 # Requires Python with Tkinter, and the following OS-dependent services:
 #	posix, posixpath, socket
-version = "1.55 $Revision$"
+version = "1.56 $Revision$"
 
 from Tkinter import *
 from Dialog import *
@@ -1689,9 +1689,9 @@ class UserEdit(Frame, MyWidget):
 	    Label(targwin, text="Domains to fetch from (ODMR/ETRN only)").pack(side=TOP)
 	    ListEdit("Domains:",
 		     self.user.fetchdomains, None, None, targwin, None)
-	    LabeledEntry(targwin, 'Append to MAIL FROM line:',
+	    LabeledEntry(targwin, 'Use domain on RCPT TO line:',
 		     self.smtpaddress, '26').pack(side=TOP, fill=X)
-	    LabeledEntry(targwin, 'Set RCPT To address:',
+	    LabeledEntry(targwin, 'Set fixed RCPT TO address:',
 		     self.smtpname, '26').pack(side=TOP, fill=X)
 	    LabeledEntry(targwin, 'Connection setup command:',
 		     self.preconnect, '26').pack(side=TOP, fill=X)
-- 
cgit v1.2.3