Merge trunk rev. 5084 (branches/debian/ rev. 5086) -

fix the comment/uncomment wording in the manual page.

diff --git a/changelog b/changelog
index b607f74f840a25e7dea29b3211056e60a8740bd0..e7107125bd933df6c603244a5cbb1a1b360b0c2f 100644 (file)
--- a/changelog
+++ b/changelog
@@ -57,6 +57,7 @@ dma (0.0.2010.06.17-1) unstable; urgency=low
     - German by Helge Kreutzmann; Closes: #586531
     - Russian by Yuri Kozlov; Closes: #586579
   * Update the smarthost configuration information in README.Debian.
+  * Add the 32-comment-uncomment patch to correct the manual page wording.
 
  -- Peter Pentchev <roam@ringlet.net>  Sat, 19 Jun 2010 16:19:25 +0300
 

diff --git a/patches/32-comment-uncomment.patch b/patches/32-comment-uncomment.patch
new file mode 100644 (file)
index 0000000..5add3c5
--- /dev/null
+++ b/patches/32-comment-uncomment.patch
@@ -0,0 +1,61 @@
+Description: Correct the comment/uncomment logic of the manual page wording.
+ I'll forward this patch real soon now.
+Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
+Forwarded: no
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2010-06-21
+
+--- a/dma.8
++++ b/dma.8
+@@ -207,15 +207,15 @@
+ .It Ic VIRTUAL Xo
+ (boolean, default=commented)
+ .Xc
+-Comment if you want virtual user support.
++Uncomment if you want virtual user support.
+ .It Ic SECURETRANS Xo
+ (boolean, default=commented)
+ .Xc
+-Comment if you want TLS/SSL secured transfer.
++Uncomment if you want TLS/SSL secured transfer.
+ .It Ic STARTTLS Xo
+ (boolean, default=commented)
+ .Xc
+-Comment if you want to use STARTTLS.
++Uncomment if you want to use STARTTLS.
+ Only useful together with
+ .Sq SECURETRANS .
+ .It Ic CERTFILE Xo
+@@ -225,7 +225,7 @@
+ .It Ic SECURE Xo
+ (boolean, default=commented)
+ .Xc
+-Change this entry to
++Uncomment this entry and change it to
+ .Sq INSECURE
+ to use plain text SMTP login over an insecure connection.
+ You have to rename this variable manually to prevent that you send your
+@@ -233,7 +233,7 @@
+ .It Ic DEFER Xo
+ (boolean, default=commented)
+ .Xc
+-Comment if you want that
++Uncomment if you want that
+ .Nm
+ defers your mail.
+ You have to flush your mail queue manually with the
+@@ -243,11 +243,11 @@
+ .It Ic DBOUNCEPROG Xo
+ (string, default=dbounce-simple-safecat)
+ .Xc
+-Comment if you want the default behavior of
++Leave this entry commented if you want the default behavior of
+ .Nm
+ upon double bounces - just abort the delivery.
+-Otherwise, specify the name or full path to a program that will process
+-the bounced bounce message.
++Otherwise, uncomment it and specify the name or full path to a program that
++will process the bounced bounce message.
+ .Pp
+ The program will be invoked with several command-line options:
+ .Pp

diff --git a/patches/series b/patches/series
index c563b2642bb6953cbf1279744df926381b60d61a..ced64136f9edf6f9dd177e18a2bf34c34015246c 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -13,3 +13,4 @@
 29-double-free.patch
 30-ldflags.patch
 31-sigalrm-backoff.patch
+32-comment-uncomment.patch