aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2007-07-18 21:46:04 +0000
committerMatthias Andree <matthias.andree@gmx.de>2007-07-18 21:46:04 +0000
commit06d467ca575d4fafe05f5e868bc7423dcc26747b (patch)
treebadfdb30490d71599d6aa82b75119879d39b0156
parent8eb1e68fc5b495d9bf6d3117d9c2c957b1d43fd8 (diff)
downloadfetchmail-06d467ca575d4fafe05f5e868bc7423dcc26747b.tar.gz
fetchmail-06d467ca575d4fafe05f5e868bc7423dcc26747b.tar.bz2
fetchmail-06d467ca575d4fafe05f5e868bc7423dcc26747b.zip
Re-add two lines to the manual page that had accidentally become comments.
svn path=/branches/BRANCH_6-3/; revision=5116
-rw-r--r--NEWS3
-rw-r--r--fetchmail.man4
2 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index ddd32d40..54916571 100644
--- a/NEWS
+++ b/NEWS
@@ -57,6 +57,9 @@ fetchmail 6.3.9 (not yet released):
Thanks to Matthias Strauß for a configuration to reproduce the issue.
# DOCUMENTATION:
+* Re-add two lines to the manual page that had accidentally become comments
+ to nroff. One was part of the --sslproto documentation, and one in the
+ "Awakening the background daemon" section.
* The manual page no longer asserts that .fetchids were for exclusive POP3 use,
since it is planned to use the file with IMAP4 later.
diff --git a/fetchmail.man b/fetchmail.man
index f729b046..b1f2d265 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -411,7 +411,7 @@ server. This can cause some complications in daemon mode.
Forces an SSL or TLS protocol. Possible values are '\fBSSL2\fR',
\&'\fBSSL3\fR', '\fBSSL23\fR', and '\fBTLS1\fR'. Try this if the default
handshake does not work for your server. Use this option with
-'\fBTLS1\fR' to enforce a TLS connection. To defeat opportunistic TLSv1
+\&'\fBTLS1\fR' to enforce a TLS connection. To defeat opportunistic TLSv1
negotiation when the server advertises STARTTLS or STLS, use \fB''\fR.
This option, even if the argument is the empty string, will also
suppress the diagnostic 'SERVER: opportunistic upgrade to TLS.' message
@@ -1171,7 +1171,7 @@ Normally, calling fetchmail with a daemon in the background sends a
wake-up signal to the daemon and quits without output. The background
daemon then starts its next poll cycle immediately. The wake-up signal,
SIGUSR1, can also be sent manually. The wake-up action also clears any
-'wedged' flags indicating that connections have wedged due to failed
+\&'wedged' flags indicating that connections have wedged due to failed
authentication or multiple timeouts.
.SS Terminating the background daemon
.PP