--- a/man/masqmail.conf.5	Fri Oct 22 11:56:47 2010 -0300
+++ b/man/masqmail.conf.5	Mon Oct 25 14:02:18 2010 -0300
@@ -125,17 +125,11 @@
 (if you have set \fBhost_name\fR to \fIfoo.example.org\fR)
 
 .TP
-\fBlocal_nets = \fIlist\fR
-
-A semicolon `;' separated list of hostnames which are on the `local' net.
-Delivery to these hosts is attempted immediately.
-You can use patterns with `*', e.g. "*.bar.com".
-
-.TP
 \fBlocal_addresses = \fIlist\fR
 
 A semicolon `;' separated list of fully qualified email-addresses which are
 considered local although their domain name part is not in the list of \fBlocal_hosts\fR. 
+This list can be seen as an addition to \fBlocal_hosts\fP.
 
 For example: There are two people working at your LAN: person1@yourdomain and person2@yourdomain.
 But there are other persons @yourdomain which are NOT local.
@@ -151,6 +145,7 @@
 
 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\fR. 
+This list can be seen as a substraction to \fBlocal_hosts\fP.
 
 This is the opposite of the previous case.
 The majority of addresses of a specific domain are local.
@@ -164,6 +159,13 @@
 not_local_addresses = "eric@mydomain.net"
 
 .TP
+\fBlocal_nets = \fIlist\fR
+
+A semicolon `;' separated list of hostnames which are on the `local' net.
+Delivery to these hosts is attempted immediately.
+You can use patterns with `*', e.g. "*.bar.com".
+
+.TP
 \fBlisten_addresses = \fIlist\fR
 
 A semicolon `;' separated list of interfaces on which connections will be accepted.
@@ -242,13 +244,17 @@
 \fBalias_file = \fIfile\fR
 
 Set this to the location of your alias file.
-If unset, no aliasing will be done.
+If not set, no aliasing will be done.
+
+Default: <not set> (i.e. no aliasing is done)
 
 .TP
 \fBalias_local_caseless = \fIboolean\fR
 
 If this is set, local parts in the alias file will be matched disregarding upper/lower case.
 
+Default: false
+
 .TP
 \fBpipe_fromline = \fIboolean\fR
 
@@ -269,9 +275,10 @@
 
 The default local delivery method.
 Can be mbox or mda.
-Default is mbox.
 You can override this for each user by using the \fBmbox_users\fR or \fBmda_users\fR (see below).
 
+Default: mbox.
+
 .TP
 \fBmbox_users = \fIlist\fR
 

--- a/src/tables.c	Fri Oct 22 11:56:47 2010 -0300
+++ b/src/tables.c	Mon Oct 25 14:02:18 2010 -0300
@@ -126,11 +126,12 @@
 			}
 		}
 		fclose(fptr);
-		if (list == NULL)
-			logwrite(LOG_NOTICE, "empty table file %s\n", fname);
+		if (!list)
+			logwrite(LOG_NOTICE, "table file %s contained no entries\n", fname);
 		return list;
 	}
-	logwrite(LOG_ALERT, "could not open table file %s: %s. Thus no aliasing is done\n", fname, strerror(errno));
+	logwrite(LOG_ALERT, "could not open table file %s: %s."
+	                    " Thus no aliasing will be done\n", fname, strerror(errno));
 
 	return NULL;
 }