Merge branch 'legacy_63'

diff --git a/NEWS b/NEWS
index 3942d4333d758845aa98710887d38ecc6eb64a78..f44f15e7454b7c82ee1f2b951a5c39425a67f89a 100644 (file)
--- 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 5433220e8f4b7f03f532f948182ee254d5d1890a..5a62cbe8d13983951fc27d17aa63d04a862cbbd9 100644 (file)
--- a/fetchmail-FAQ.html
+++ b/fetchmail-FAQ.html
@@ -688,7 +688,7 @@ client machine had when it started up.</p>
 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!</p>
 
 <p>Use the <code>smtpaddress</code> option to force the appended

diff --git a/fetchmail.h b/fetchmail.h
index 8b5fea90a961f46b10739140a9b34fc8ebf6d86f..10f5be1e5f7576b72c88980368d815eeab451a3c 100644 (file)
--- 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;