1.1 --- a/docs/masqmail.8	Thu Nov 06 09:18:38 2008 +0100
     1.2 +++ b/docs/masqmail.8	Thu Nov 06 09:33:32 2008 +0100
     1.3 @@ -2,21 +2,21 @@
     1.4  .SH NAME
     1.5  masqmail \- An offline Mail Transfer Agent
     1.6  .SH SYNOPSIS
     1.7 -\fB/usr/sbin/masqmail [-C \fIfile\f1\fB] [-odq] [-bd] [-q\fIinterval\f1\fB]
     1.8 +\fB/usr/sbin/masqmail [\-C \fIfile\f1\fB] [\-odq] [\-bd] [\-q\fIinterval\f1\fB]
     1.9  
    1.10 -\fB/usr/sbin/masqmail [-odq] [-bs]
    1.11 +\fB/usr/sbin/masqmail [\-odq] [\-bs]
    1.12  
    1.13 -\fB/usr/sbin/masqmail [-bp]
    1.14 +\fB/usr/sbin/masqmail [\-bp]
    1.15  
    1.16 -\fB/usr/sbin/masqmail [-q]
    1.17 +\fB/usr/sbin/masqmail [\-q]
    1.18  
    1.19 -\fB/usr/sbin/masqmail [-qo [\fIname\f1\fB]]
    1.20 +\fB/usr/sbin/masqmail [\-qo [\fIname\f1\fB]]
    1.21  
    1.22 -\fB/usr/sbin/masqmail [-odq] [-g [\fIname\f1\fB]]
    1.23 +\fB/usr/sbin/masqmail [\-odq] [\-g [\fIname\f1\fB]]
    1.24  
    1.25 -\fB/usr/sbin/masqmail [-odq] [-go [\fIname\f1\fB]]
    1.26 +\fB/usr/sbin/masqmail [\-odq] [\-go [\fIname\f1\fB]]
    1.27  
    1.28 -\fB/usr/sbin/masqmail [-t] [-oi] [-f \fIaddress\f1\fB] [--] \fIaddress...\f1\fB
    1.29 +\fB/usr/sbin/masqmail [\-t] [\-oi] [\-f \fIaddress\f1\fB] [\-\-] \fIaddress...\f1\fB
    1.30  
    1.31  \fB/usr/sbin/mailq
    1.32  
    1.33 @@ -27,130 +27,130 @@
    1.34  
    1.35  .SH OPTIONS
    1.36  
    1.37 -Since masqmail is intended to replace sendmail, it uses the same command line options, but not all are implemented. There are also two additional options, which are unique to masqmail (-qo \fIconnection\f1 and -g)
    1.38 +Since masqmail is intended to replace sendmail, it uses the same command line options, but not all are implemented. There are also two additional options, which are unique to masqmail (\-qo \fIconnection\f1 and \-g)
    1.39  .TP
    1.40  
    1.41 -\fB--\f1
    1.42 +\fB\-\-\f1
    1.43  
    1.44 -Not a 'real' option, it means that all following arguments are to be understood as arguments and not as options even if they begin with a leading dash '-'. Mutt is known to call sendmail with this option.
    1.45 +Not a 'real' option, it means that all following arguments are to be understood as arguments and not as options even if they begin with a leading dash '\-'. Mutt is known to call sendmail with this option.
    1.46  .TP
    1.47  
    1.48 -\fB-bd\f1
    1.49 +\fB\-bd\f1
    1.50  
    1.51 -Run as daemon, accepting connections, usually on port 25 if not configured differently. This is usually used in the startup script at system boot and together with the -q option (see below).
    1.52 +Run as daemon, accepting connections, usually on port 25 if not configured differently. This is usually used in the startup script at system boot and together with the \-q option (see below).
    1.53  .TP
    1.54  
    1.55 -\fB-bi\f1
    1.56 +\fB\-bi\f1
    1.57  
    1.58  Old sendmail rebuilds its alias database when invoked with this option. Masqmail ignores it. Masqmail reads directly from the file given with alias_file in the config file.
    1.59  .TP
    1.60  
    1.61 -\fB-bp\f1
    1.62 +\fB\-bp\f1
    1.63  
    1.64  Show the messages in the queue. Same as calling masqmail as 'mailq'.
    1.65  .TP
    1.66  
    1.67 -\fB-bs\f1
    1.68 +\fB\-bs\f1
    1.69  
    1.70  Accept SMTP commands from stdin. Some mailers (eg pine) use this option as an interface. It can also be used to call masqmail from inetd.
    1.71  .TP
    1.72  
    1.73 -\fB-B \fIarg\f1\fB\f1
    1.74 +\fB\-B \fIarg\f1\fB\f1
    1.75  
    1.76  \fIarg\f1 is usually 8BITMIME. Some mailers use this to indicate that the message contains characters > 127. Masqmail is 8-bit clean and ignores this, so you do not have to recompile elm, which is very painful ;-). Note though that this violates some conventions: masqmail does not convert 8 bit messages to any MIME format if it encounters a mail server which does not advertise its 8BITMIME capability, masqmail does not advertise this itself. This is the same practice as that of exim (but different to sendmail).
    1.77  .TP
    1.78  
    1.79 -\fB-bV \f1
    1.80 +\fB\-bV \f1
    1.81  
    1.82  Show version information.
    1.83  .TP
    1.84  
    1.85 -\fB-C \f1\fIfilename\f1
    1.86 +\fB\-C \f1\fIfilename\f1
    1.87  
    1.88  Use another configuration than \fI/etc/masqmail/masqmail.conf\f1. Useful for debugging purposes. If not invoked by a privileged user, masqmail will drop all privileges.
    1.89  .TP
    1.90  
    1.91 -\fB-d \fInumber\f1\fB\f1
    1.92 +\fB\-d \fInumber\f1\fB\f1
    1.93  
    1.94  Set the debug level. This takes precedence before the value ofdebug_level in the configuration file. Read the warning in the description of the latter.
    1.95  .TP
    1.96  
    1.97 -\fB-f [\fIaddress\f1\fB]\f1
    1.98 +\fB\-f [\fIaddress\f1\fB]\f1
    1.99  
   1.100 -Set the return path address to \fIaddress\f1. Only root, the user mail and anyoune in group trusted is allowed to do that.
   1.101 +Set the return path address to \fIaddress\f1. Only root, the user mail and anyone in group mail is allowed to do that.
   1.102  .TP
   1.103  
   1.104 -\fB-F [\fIstring\f1\fB]\f1
   1.105 +\fB\-F [\fIstring\f1\fB]\f1
   1.106  
   1.107  Set the full sender name (in the From: header) to \fIstring\f1.
   1.108  .TP
   1.109  
   1.110 -\fB-g [\fIname\f1\fB]\f1
   1.111 +\fB\-g [\fIname\f1\fB]\f1
   1.112  
   1.113  Get mail (using pop3 or apop), using the configurations given with get.\fIname\f1 in the main configuration. Without \fIname\f1, all get configurations will be used. See also \fBmasqmail.get (5)\f1
   1.114  .TP
   1.115  
   1.116 -\fB-go [\fIinterval\f1\fB] [\fIname\f1\fB]\f1
   1.117 +\fB\-go [\fIinterval\f1\fB] [\fIname\f1\fB]\f1
   1.118  
   1.119  Can be followed by a connection name. Use this option in your script which starts as soon as a link to the internet has been set up (usually ip-up). When masqmail is called with this option, the specified get configuration(s) is(are) read and mail will be retrieved from servers on the internet. The \fIname\f1 is defined in the configuration (see \fBonline_gets.\fIname\f1\fB\f1).
   1.120  
   1.121 -If called with an interval option (recognized by a digit as the first characater), masqmail starts as a daemon and tries to get mail in these intervals. It checks for the online status first. Example: masqmail -go 5m will retrieve mail all five minutes.
   1.122 +If called with an interval option (recognized by a digit as the first characater), masqmail starts as a daemon and tries to get mail in these intervals. It checks for the online status first. Example: masqmail \-go 5m will retrieve mail every five minutes.
   1.123  
   1.124 -If called without \fIname\f1 the online status is determined with the configured method (see \fBonline_detect\f1 in config.html).
   1.125 +If called without \fIname\f1 the online status is determined with the configured method (see \fBonline_detect\f1 in \fBmasqmail.conf (5)\f1).
   1.126  .TP
   1.127  
   1.128 -\fB-i\f1
   1.129 +\fB\-i\f1
   1.130  
   1.131 -Same as -oi, see below.
   1.132 +Same as \-oi, see below.
   1.133  .TP
   1.134  
   1.135 -\fB-Mrm \fIlist\f1\fB\f1
   1.136 +\fB\-Mrm \fIlist\f1\fB\f1
   1.137  
   1.138  Remove given messages from the queue. Only allowed for privileged users.
   1.139  .TP
   1.140  
   1.141 -\fB-oem\f1
   1.142 +\fB\-oem\f1
   1.143  
   1.144 -If the -oi ist not also given, always return with a non zero return code. Maybe someone tells me what this is good for...
   1.145 +If the \-oi ist not also given, always return with a non zero return code. Maybe someone tells me what this is good for...
   1.146  .TP
   1.147  
   1.148 -\fB-odb\f1
   1.149 +\fB\-odb\f1
   1.150  
   1.151  Deliver in background. Masqmail always does this, which makes this option pretty much useless.
   1.152  .TP
   1.153  
   1.154 -\fB-odq\f1
   1.155 +\fB\-odq\f1
   1.156  
   1.157  Do not attempt to deliver immediately. Any messages will be queued until the next queue running process picks them up and delivers them. You get the same effect by setting the do_queue option in /etc/masqmail/masqmail.conf.
   1.158  .TP
   1.159  
   1.160 -\fB-oi\f1
   1.161 +\fB\-oi\f1
   1.162  
   1.163  A dot as a single character in a line does not terminate the message.
   1.164  .TP
   1.165  
   1.166 -\fB-q [\fIinterval\f1\fB]\f1
   1.167 +\fB\-q [\fIinterval\f1\fB]\f1
   1.168  
   1.169 -If not given with an argument, run a queue process, ie. try to deliver all messages in the queue. Masqmail sends only to those addresses that are on the local net, not to those that are outside. Use -qo for those.
   1.170 +If not given with an argument, run a queue process, ie. try to deliver all messages in the queue. Masqmail sends only to those addresses that are on the local net, not to those that are outside. Use \-qo for those.
   1.171  
   1.172 -If you have configured inetd to start masqmail, you can use this option in a cron job which starts in regular time intervals, to mimic the same effect as starting masqmail with -bd -q30m.
   1.173 +If you have configured inetd to start masqmail, you can use this option in a cron job which starts in regular time intervals, to mimic the same effect as starting masqmail with \-bd \-q30m.
   1.174  
   1.175 -An argument may be a time interval ie. a numerical value followed by one of the letters. s,m,h,d,w which are interpreted as seconds, minutes, hours, days or weeks respectively. Example: -q30m. Masqmail starts as a daemon and a queue runner process will be started automatically once in this time interval. This is usually used together with -bd (see above).
   1.176 +An argument may be a time interval ie. a numerical value followed by one of the letters. s,m,h,d,w which are interpreted as seconds, minutes, hours, days or weeks respectively. Example: \-q30m. Masqmail starts as a daemon and a queue runner process will be started automatically once in this time interval. This is usually used together with \-bd (see above).
   1.177  .TP
   1.178  
   1.179 -\fB-qo [\fIname\f1\fB]\f1
   1.180 +\fB\-qo [\fIname\f1\fB]\f1
   1.181  
   1.182  Can be followed by a connection name. Use this option in your script which starts as soon as a link to the internet has been set up (usually ip-up). When masqmail is called with this option, the specified route configuration is read and the queued mail with destinations on the internet will be sent. The \fIname\f1 is defined in the configuration (see \fBonline_routes.\fIname\f1\fB\f1).
   1.183  
   1.184 -If called without \fIname\f1 the online status is determined with the configured method (see \fBonline_detect\f1 in config.html)
   1.185 +If called without \fIname\f1 the online status is determined with the configured method (see \fBonline_detect\f1 in \fBmasqmail.conf (5)\f1)
   1.186  .TP
   1.187  
   1.188 -\fB-t\f1
   1.189 +\fB\-t\f1
   1.190  
   1.191  Read recipients from headers. Delete 'Bcc:' headers. If any arguments are given, these are interpreted as recipient addresses and the message will not be sent to these.
   1.192  .TP
   1.193  
   1.194 -\fB-v\f1
   1.195 +\fB\-v\f1
   1.196  
   1.197  Log also to stdout. Currently, some log messages are marked as 'write to stdout' and additionally, all messages with priority 'LOG_ALERT' and 'LOG_WARNING' will be written to stdout if this option is given. It is disabled in daemon mode.
   1.198  .SH ENVIRONMENT FOR PIPES AND MDAS
   1.199 @@ -175,8 +175,6 @@
   1.200  
   1.201  \fI/etc/masqmail/masqmail.conf\f1 is the main configuration for masqmail. Depending on the settings in this file, you will also have other configuration files in \fI/etc/masqmail/\f1.
   1.202  
   1.203 -\fI/etc/aliases\f1 is the alias file, if not set differently in \fI/etc/masqmail/masqmail.conf\f1.
   1.204 -
   1.205  \fI/var/spool/masqmail/\f1 is the spool directory where masqmail stores its spooled messages and the uniq pop ids.
   1.206  
   1.207  \fI/var/spool/mail/\f1 is the directory where locally delivered mail will be put, if not configured differently in \fImasqmail.conf\f1.
   1.208 @@ -197,7 +195,7 @@
   1.209  
   1.210  masqmail was written by Oliver Kurth <oku@masqmail.cx>
   1.211  
   1.212 -You will find the newest version of masqmail at \fBhttp://masqmail.cx/masqmail/\f1 or search for it in freshmeat (\fBhttp://www.freshmeat.net\f1). There is also a mailing list, you will find information about it at masqmails main site.
   1.213 +You will find the newest version of masqmail at \fBhttp://masqmail.cx/masqmail/\f1 or search for it in freshmeat (\fBhttp://www.freshmeat.net\f1). There is also a mailing list, you will find information about it at masqmail's main site.
   1.214  
   1.215  .SH BUGS
   1.216  

     2.1 --- a/docs/masqmail.conf.5	Thu Nov 06 09:18:38 2008 +0100
     2.2 +++ b/docs/masqmail.conf.5	Thu Nov 06 09:33:32 2008 +0100
     2.3 @@ -86,7 +86,7 @@
     2.4  
     2.5  A semicolon ';' separated list of fully qualified email-addresses which are considered not local although their domain name part is in the list of \fBlocal_hosts\f1. 
     2.6  
     2.7 -This ist the opposite of the previous case. The majority of addresses of a specific domain are local. But some users are not. With this option you can easily exclude these users.
     2.8 +This is the opposite of the previous case. The majority of addresses of a specific domain are local. But some users are not. With this option you can easily exclude these users.
     2.9  
    2.10  Example:
    2.11  
    2.12 @@ -122,18 +122,18 @@
    2.13  
    2.14  \fBdo_queue = \fIboolean\f1\fB\f1
    2.15  
    2.16 -If this is set, mail will not be delivered immediately when accepted. Same as calling masqmail with the \fB-odq\f1 option.
    2.17 +If this is set, mail will not be delivered immediately when accepted. Same as calling masqmail with the \fB\-odq\f1 option.
    2.18  .TP
    2.19  
    2.20  \fBonline_routes.\fIname\f1\fB = \fIlist\f1\fB\f1
    2.21  
    2.22 -Replace \fIname\f1 with a name to identify a connection. Set this to a filename (or a list of filenames) for the special route configuration for that connection. You will use that name to call masqmail with the\fB-qo\f1 option every time a connection to your ISP is set up.
    2.23 +Replace \fIname\f1 with a name to identify a connection. Set this to a filename (or a list of filenames) for the special route configuration for that connection. You will use that name to call masqmail with the \fB\-qo\f1 option every time a connection to your ISP is set up.
    2.24  
    2.25  Example: Your ISP has the name FastNet. Then you write the following line in the main configuration:
    2.26  
    2.27  \fBonline_routes.FastNet\f1 = \fI"/etc/masqmail/fastnet.route"\f1
    2.28  
    2.29 -\fI/etc/masqmail/fastnet.route\f1 is the route configuration file, see \fBmasqmail.route (5)\f1. As soon as a link to FastNet has been set up, you call masqmail \fB-qo\f1 \fIFastNet\f1. Masqmail will then read the specified file and send the mails.
    2.30 +\fI/etc/masqmail/fastnet.route\f1 is the route configuration file, see \fBmasqmail.route (5)\f1. As soon as a link to FastNet has been set up, you call masqmail \fB\-qo\f1 \fIFastNet\f1. Masqmail will then read the specified file and send the mails.
    2.31  .TP
    2.32  
    2.33  \fBconnect_route.\fIname\f1\fB = \fIlist\f1\fB\f1
    2.34 @@ -210,7 +210,7 @@
    2.35  
    2.36  Example:
    2.37  
    2.38 -mda="/usr/bin/procmail -Y -d ${rcpt_local}"
    2.39 +mda="/usr/bin/procmail \-Y \-d ${rcpt_local}"
    2.40  
    2.41  For the mda, as for pipe commands, a few environment variables will be set as well. See \fBmasqmail (8)\f1. To use environment variables for the mda, the '$' sign has to be escaped with a backslash, otherwise they will be tried to be expanded with the internal variables.
    2.42  .TP
    2.43 @@ -235,14 +235,14 @@
    2.44  
    2.45  When it is set to \fBmserver\f1, MasqMail connects to the masqdialer server using the value of \fBmserver_iface\f1 and asks it whether a connection exists and for the name, which should be the name of the current connection as defined with \fBconnect_route.\fIname\f1\fB\f1.
    2.46  
    2.47 -No matter how MasqMail detects the online status, only messages that are accepted at online time will be delivered using the connection. The spool still has to be emptied with masqmail \fB-qo\f1\fIconnection\f1.
    2.48 +No matter how MasqMail detects the online status, only messages that are accepted at online time will be delivered using the connection. The spool still has to be emptied with masqmail \fB\-qo\f1\fIconnection\f1.
    2.49  .TP
    2.50  
    2.51  \fBonline_file = \fIfile\f1\fB\f1
    2.52  
    2.53  This is the name of the file checked for when MasqMail determines whether it is online. The file should only exist when there is currently a connection. Create it in your ip-up script with eg.
    2.54  
    2.55 -echo -n <name> > /tmp/connect_route
    2.56 +echo \-n <name> > /tmp/connect_route
    2.57  
    2.58  chmod 0644 /tmp/connect_route
    2.59  
    2.60 @@ -257,7 +257,7 @@
    2.61  
    2.62  
    2.63  
    2.64 -[ -e /tmp/connect_route ] || exit 1
    2.65 +[ \-e /tmp/connect_route ] || exit 1
    2.66  
    2.67  cat /tmp/connect_route
    2.68  
    2.69 @@ -273,12 +273,12 @@
    2.70  
    2.71  \fBget.\fIname\f1\fB = \fIfile\f1\fB\f1
    2.72  
    2.73 -Replace \fIname\f1 with a name to identify a get configuration. Set this to a filename for the get configuration. These files will be used to retrieve mail when called with the -g option.
    2.74 +Replace \fIname\f1 with a name to identify a get configuration. Set this to a filename for the get configuration. These files will be used to retrieve mail when called with the \-g option.
    2.75  .TP
    2.76  
    2.77  \fBonline_gets.\fIname\f1\fB = \fIlist\f1\fB\f1
    2.78  
    2.79 -Replace \fIname\f1 with a name to identify an online configuration. Set this to a filename (or a list of filenames) for the get configuration. These files will be used to retrieve mail when called with the -go option.
    2.80 +Replace \fIname\f1 with a name to identify an online configuration. Set this to a filename (or a list of filenames) for the get configuration. These files will be used to retrieve mail when called with the \-go option.
    2.81  .TP
    2.82  
    2.83  \fBident_trusted_nets = \fIlist\f1\fB\f1

     3.1 --- a/docs/masqmail.get.5	Thu Nov 06 09:18:38 2008 +0100
     3.2 +++ b/docs/masqmail.get.5	Thu Nov 06 09:33:32 2008 +0100
     3.3 @@ -78,7 +78,7 @@
     3.4  
     3.5  Example for ssl tunneling:
     3.6  
     3.7 -wrapper="/usr/bin/openssl s_client -quiet -connect pop.gmx.net:995 2>/dev/null"
     3.8 +wrapper="/usr/bin/openssl s_client \-quiet \-connect pop.gmx.net:995 2>/dev/null"
     3.9  .SH AUTHOR
    3.10  
    3.11  masqmail was written by Oliver Kurth <oku@masqmail.cx>

     4.1 --- a/docs/masqmail.route.5	Thu Nov 06 09:18:38 2008 +0100
     4.2 +++ b/docs/masqmail.route.5	Thu Nov 06 09:33:32 2008 +0100
     4.3 @@ -174,7 +174,7 @@
     4.4  
     4.5  Example for ssl tunneling:
     4.6  
     4.7 -wrapper="/usr/bin/openssl s_client -quiet -connect pop.gmx.net:995 2>/dev/null"
     4.8 +wrapper="/usr/bin/openssl s_client \-quiet \-connect pop.gmx.net:995 2>/dev/null"
     4.9  .TP
    4.10  
    4.11  \fBpipe\f1 = \fIcommand\f1