From: Matthias Andree
Date: Sat, 11 May 2013 11:23:01 +0000 (+0200)
Subject: Merge branch 'legacy_63'
X-Git-Url: http://pileus.org/git/?p=~andy%2Ffetchmail;a=commitdiff_plain;h=a23a8cf8ee1da51c4392b9f52e6b72b0c01e3b5e;hp=ad5ca720795a2f55474a22b63f3a26c2470dd3f2
Merge branch 'legacy_63'
---
diff --git a/NEWS b/NEWS
index 3942d433..f44f15e7 100644
--- a/NEWS
+++ b/NEWS
@@ -143,6 +143,12 @@ NOTE THIS IS AN ALPHA RELEASE THAT HAS NOT BEEN THOROUGHLY TESTED!
--------------------------------------------------------------------------------
+fetchmail-6.3.27 (not yet released, if ever):
+
+# FIXES
+* Fix a typo in the FAQ. Submitted by David Lawyer, Debian Bug#706776.
+
+
fetchmail-6.3.26 (released 2013-04-23, 26180 LoC):
# NOTE THAT FETCHMAIL IS NO LONGER PUBLISHED THROUGH IBIBLIO.
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index 5433220e..5a62cbe8 100644
--- a/fetchmail-FAQ.html
+++ b/fetchmail-FAQ.html
@@ -688,7 +688,7 @@ client machine had when it started up.
time) doesn't match the original, the most benign possible result
is that your MTA thinks it's seeing a relaying attempt and refuses.
More frequently, fetchmail will try to connect to a nonexistent
-host address and time out. Worst case, you could up forwarding your
+host address and time out. Worst case, you could end up forwarding your
mail to the wrong machine!
Use the smtpaddress
option to force the appended
diff --git a/fetchmail.h b/fetchmail.h
index 8b5fea90..10f5be1e 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -208,7 +208,7 @@ UID_SEEN= 1, /**< id was seen, but not deleted */
UID_DELETED= 2, /**< this message has been marked deleted */
UID_EXPUNGED= 3 /**< this message has been expunged */
};
-/*@}*/
+/**/
struct query;