1.1 --- a/INSTALL	Wed Jul 14 00:55:22 2010 +0200
     1.2 +++ b/INSTALL	Wed Jul 14 12:15:45 2010 +0200
     1.3 @@ -1,5 +1,5 @@
     1.4  Additional information may be available in docs/ or on the website.
     1.5 -For installing on GNU/Linux distributions read docs/linux-distris.
     1.6 +For installing on GNU/Linux distributions read docs/INSTALL.linux.
     1.7  
     1.8  
     1.9  Installation instructions
    1.10 @@ -26,7 +26,7 @@
    1.11  and the group `trusted'.
    1.12  
    1.13  
    1.14 -Compliling is a matter of the usual procedure. In the source directory,
    1.15 +Compiling is a matter of the usual procedure. In the source directory,
    1.16  after unpacking do:
    1.17  
    1.18  	./configure
    1.19 @@ -73,20 +73,20 @@
    1.20  enables qmail style Maildir support (disabled by default)
    1.21  
    1.22  --enable-ident
    1.23 -enable RFC 1413 support. If you have the libident dynamic library
    1.24 +enables RFC 1413 support. If you have the libident dynamic library
    1.25  installed, this will be linked, otherwise it will be statically linked
    1.26  using the sources included in the package.
    1.27  
    1.28  --enable-pop3
    1.29 -enables pop3 support (disabled by default)
    1.30 +enables POP3 support (disabled by default)
    1.31  
    1.32  --disable-resolver
    1.33 -disable resolver support. Without the resolver functions, masqmail
    1.34 +disables resolver support. Without the resolver functions, masqmail
    1.35  uses only gethostbyname() to resolve DNS names, and you cannot send
    1.36  mail without a smart host. Not recommended.
    1.37  
    1.38  --disable-smtp-server
    1.39 -disable SMTP server support. You may want this if you do not need
    1.40 +disables SMTP server support. You may want this if you do not need
    1.41  masqmail to listen. In this case, you cannot use masqmail as a smart
    1.42  host for other hosts on your LAN, you cannot use mail clients that
    1.43  send SMTP, you cannot even use pine. In short, use of this option is
    1.44 @@ -95,21 +95,21 @@
    1.45  
    1.46  --with-libcryto
    1.47  instead of using the md5 and hmac functions within the package, link
    1.48 -dynamically with libcrypto. This applies only if you have pop3 or SMTP
    1.49 -AUTH enabled. Makes only sense if your resources are limited and you
    1.50 +dynamically with libcrypto. This applies only if you have POP3 or SMTP
    1.51 +AUTH enabled. Only makes sense if your resources are limited and you
    1.52  have libcrypto installed. Untested.
    1.53  
    1.54  --with-glib-static
    1.55 -link with glib statically. This makes the binary larger by around 30K
    1.56 +links with glib statically. This makes the binary larger by around 30K
    1.57  (i386 architecture), but if masqmail is the only binary using glib,
    1.58  you save some space in total, because you do not need the shared glib
    1.59  library installed.
    1.60  
    1.61  
    1.62  --disable-debug
    1.63 -disable debugging, setting it on by command line or configuration has
    1.64 -no effect. Strongly discouraged, since you miss valuable information
    1.65 -if something goes wrong.
    1.66 +disables debugging; setting it on the command line or in the
    1.67 +configuration has no effect. Strongly discouraged, since you miss
    1.68 +valuable information if something goes wrong.
    1.69  
    1.70  
    1.71  
    1.72 @@ -118,8 +118,8 @@
    1.73  
    1.74  Check that 'make install' worked correctly. The following command:
    1.75  
    1.76 -	ls -ld /usr/local/sbin/masqmail /etc/masqmail /var/log/masqmail/ \
    1.77 -	       /var/run/masqmail /var/spool/masqmail/ /var/spool/masqmail/* 
    1.78 +	ls -ld /usr/sbin/masqmail /etc/masqmail /var/log/masqmail/ \
    1.79 +	       /var/run/masqmail /var/spool/masqmail/ /var/spool/masqmail/*
    1.80  
    1.81  should give output similar to
    1.82  

     2.1 --- a/configure	Wed Jul 14 00:55:22 2010 +0200
     2.2 +++ b/configure	Wed Jul 14 12:15:45 2010 +0200
     2.3 @@ -5356,6 +5356,9 @@
     2.4    withval=$with_liblockfile;
     2.5  fi
     2.6  
     2.7 +if test "x$with_liblockfile" = 'xno'; then
     2.8 +	with_liblockfile=''
     2.9 +fi
    2.10  if test "x$with_liblockfile" != 'x'; then
    2.11  	with_liblockfile='yes'
    2.12  fi

     3.1 --- a/configure.ac	Wed Jul 14 00:55:22 2010 +0200
     3.2 +++ b/configure.ac	Wed Jul 14 12:15:45 2010 +0200
     3.3 @@ -220,6 +220,9 @@
     3.4  AC_ARG_WITH(liblockfile,
     3.5  	[  --with-liblockfile       use liblock (for Debian)],
     3.6  	)
     3.7 +if test "x$with_liblockfile" = 'xno'; then
     3.8 +	with_liblockfile=''
     3.9 +fi
    3.10  if test "x$with_liblockfile" != 'x'; then
    3.11  	with_liblockfile='yes'
    3.12  fi

     4.1 --- a/man/masqmail.8	Wed Jul 14 00:55:22 2010 +0200
     4.2 +++ b/man/masqmail.8	Wed Jul 14 12:15:45 2010 +0200
     4.3 @@ -29,7 +29,8 @@
     4.4  e.g. a home network or a single host at home.
     4.5  It has special support for connections to different ISPs.
     4.6  It replaces sendmail or other MTAs such as qmail or exim.
     4.7 -It can also act as a pop3 client.
     4.8 +It can also act as a POP3 client (if this functionality has not been disabled at
     4.9 +build configuration time).
    4.10  
    4.11  
    4.12  .SH OPTIONS
    4.13 @@ -138,7 +139,7 @@
    4.14  It checks for the online status first.
    4.15  Example: `masqmail \-go 5m' will retrieve mail every five minutes.
    4.16  
    4.17 -If called without \fIname\fR the online status is determined with the configured method
    4.18 +If called without \fIname\fR, the online status is determined with the configured method
    4.19  (see \fBonline_detect\fR in \fBmasqmail.conf(5)\fR).
    4.20  
    4.21  .TP

     5.1 --- a/man/masqmail.conf.5	Wed Jul 14 00:55:22 2010 +0200
     5.2 +++ b/man/masqmail.conf.5	Wed Jul 14 12:15:45 2010 +0200
     5.3 @@ -16,22 +16,22 @@
     5.4  Where \fBval\fR is a variable name and \fIexpression\fR a string,
     5.5  which can be quoted with double quotes `"'.
     5.6  If the expression is on multiple lines or contains characters other than letters,
     5.7 -digits or the characters `.', `-', `_', `/', ';', '@', ':' it must be quoted.
     5.8 +digits or the characters `.', `-', `_', `/', ';', '@', ':', it must be quoted.
     5.9  You can use quotes inside quotes by escaping them with a backslash.
    5.10  
    5.11 -Each val has a type, which can be boolean, numeric, string or list.
    5.12 +Each \fBval\fP has a type, which can be boolean, numeric, string or list.
    5.13  A boolean variable can be set with one of the values `on', `yes', and `true' or `off', `no' and `false'.
    5.14  List items are separated with semicolons `;'.
    5.15 -For some values patterns (like `*',`?') can be used.
    5.16 -The spaces before and after the equal sign `=' are optional.
    5.17 +For some values, patterns (like `*',`?') can be used.
    5.18 +The spaces in front of and after the equal sign `=' are optional.
    5.19  
    5.20  Most lists (exceptions: \fBlocal_hosts\fR, \fBlocal_nets\fR, \fBlisten_addresses\fR,
    5.21   \fBonline_routes\fR, and \fBonline_gets\fR) accept files.
    5.22  These will be recognized by a leading slash `/'.
    5.23  The contents of these files will be included at the position of the file name,
    5.24  there can be items or other files before and after the file entry.
    5.25 -The format of the files is different though, within these files each entry is on another line.
    5.26 -(And not separated by semicolons).
    5.27 +The format of the files is different though, within these files each entry is on another line
    5.28 +and the entries are not separated by semicolons.
    5.29  This makes it easy to include large lists which are common in different configuration files,
    5.30  so they do not have to appear in every configuration file.
    5.31  
    5.32 @@ -65,8 +65,8 @@
    5.33  .TP
    5.34  \fBlog_dir = \fIfile\fR
    5.35  
    5.36 -The directory where log are stored, if syslog is not used.
    5.37 -Debug files are stored in this directory anyways.
    5.38 +The directory where logs are stored, if syslog is not used.
    5.39 +Debug files are always stored in this directory if debugging is enabled.
    5.40  \fIfile\fR must be an absolute path.
    5.41  
    5.42  Default: \fI/var/log/masqmail\fR