1.1 --- a/man/masqmail.8	Thu Jul 15 11:48:33 2010 +0200
     1.2 +++ b/man/masqmail.8	Thu Jul 15 14:24:40 2010 +0200
     1.3 @@ -14,10 +14,6 @@
     1.4  
     1.5  \fB/usr/sbin/masqmail \fR[\fB\-qo \fR[\fIname\fR]]
     1.6  
     1.7 -\fB/usr/sbin/masqmail \fR[\fB\-odq\fR] [\fB\-g \fR[\fIname\fR]]
     1.8 -
     1.9 -\fB/usr/sbin/masqmail \fR[\fB\-odq\fR] [\fB\-go \fR[\fIname\fR]]
    1.10 -
    1.11  \fB/usr/sbin/masqmail \fR[\fB\-t\fR] [\fB\-oi\fR] [\fB\-f \fIaddress\fR] [\fB\-\-\fR] \fIaddress...
    1.12  
    1.13  \fB/usr/sbin/mailq\fR
    1.14 @@ -29,8 +25,6 @@
    1.15  e.g. a home network or a single host at home.
    1.16  It has special support for connections to different ISPs.
    1.17  It replaces sendmail or other MTAs such as qmail or exim.
    1.18 -It can also act as a POP3 client (if this functionality has not been disabled at
    1.19 -build configuration time).
    1.20  
    1.21  
    1.22  .SH OPTIONS
    1.23 @@ -117,32 +111,6 @@
    1.24  Set the full sender name (in the From: header) to \fIstring\fR.
    1.25  
    1.26  .TP
    1.27 -\fB\-g [\fIname\fB]\fR
    1.28 -
    1.29 -Get mail (using pop3 or apop),
    1.30 -using the configurations given with get.\fIname\fR in the main configuration.
    1.31 -Without \fIname\fR, all get configurations will be used.
    1.32 -See also \fBmasqmail.get(5)\fR
    1.33 -
    1.34 -.TP
    1.35 -\fB\-go [\fIinterval\fB] [\fIname\fB]\fR
    1.36 -
    1.37 -Can be followed by a connection name.
    1.38 -Use this option in your script which starts as soon as a link to the internet
    1.39 -has been set up (usually ip-up).
    1.40 -When masqmail is called with this option, the specified get configuration(s)
    1.41 -is(are) read and mail will be retrieved from servers on the internet.
    1.42 -The \fIname\fR is defined in the configuration (see \fBonline_gets.\fIname\fR).
    1.43 -
    1.44 -If called with an interval option (recognized by a digit as the first characater),
    1.45 -masqmail starts as a daemon and tries to get mail in these intervals.
    1.46 -It checks for the online status first.
    1.47 -Example: `masqmail \-go 5m' will retrieve mail every five minutes.
    1.48 -
    1.49 -If called without \fIname\fR, the online status is determined with the configured method
    1.50 -(see \fBonline_detect\fR in \fBmasqmail.conf(5)\fR).
    1.51 -
    1.52 -.TP
    1.53  \fB\-i\fR
    1.54  
    1.55  Same as \fB\-oi\fR, see below.
    1.56 @@ -263,7 +231,7 @@
    1.57  files in \fI/etc/masqmail/\fR.
    1.58  
    1.59  \fI/var/spool/masqmail/\fR is the spool directory where masqmail stores
    1.60 -its spooled messages and the uniq pop ids.
    1.61 +its spooled messages.
    1.62  
    1.63  \fI/var/spool/mail/\fR is the directory where locally delivered mail will be put,
    1.64  if not configured differently in \fImasqmail.conf\fR.
    1.65 @@ -276,8 +244,6 @@
    1.66  
    1.67  RFC 821, 822, 1869, 1870, 2197, 2554 (SMTP)
    1.68  
    1.69 -RFC 1725, 1939 (POP3)
    1.70 -
    1.71  RFC 1321 (MD5)
    1.72  
    1.73  RFC 2195 (CRAM-MD5)
    1.74 @@ -299,4 +265,4 @@
    1.75  
    1.76  .SH SEE ALSO
    1.77  
    1.78 -\fBmasqmail.conf(5)\fR, \fBmasqmail.route(5)\fR, \fBmasqmail.get(5)\fR, \fBmasqmail.aliases(5)\fR
    1.79 +\fBmasqmail.conf(5)\fR, \fBmasqmail.route(5)\fR, \fBmasqmail.aliases(5)\fR