From 816f6f0bb26da2b3852d5bcc6dada3730d77fb98 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Thu, 27 Nov 2014 10:40:33 -0500 Subject: [PATCH] Update cabal description, and make minor documentation fixes. --- doc/list-remote-forwardsrc.example | 5 ++++- doc/man1/list-remote-forwards.1 | 2 ++ list-remote-forwards.cabal | 22 +++++++++++++++++++--- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/doc/list-remote-forwardsrc.example b/doc/list-remote-forwardsrc.example index 6f11869..3e43560 100644 --- a/doc/list-remote-forwardsrc.example +++ b/doc/list-remote-forwardsrc.example @@ -18,13 +18,16 @@ # domain_query = "SELECT DISTINCT domain FROM alias;" -# The name of a mail exchange, the forwards of whose domains we should +# The name of a mail exchanger, the forwards of whose domains we should # ignore. For example, if one mail exchanger, mx1.example.com, has # strict spam filtering, it may be acceptable to have remote forwarding # for domains that have mx1.example.com as their mail exchanger (MX # record). In that case, you might want to exclude those domains from # the report, by naming mx1.example.com here. # +# Given as a list, it can be used to exclude more than one mail +# exchanger. +# # Default: [] (empty) # # exclude_mx = ["mx1.example.com"] diff --git a/doc/man1/list-remote-forwards.1 b/doc/man1/list-remote-forwards.1 index bcc7b9c..13ebb4a 100644 --- a/doc/man1/list-remote-forwards.1 +++ b/doc/man1/list-remote-forwards.1 @@ -57,6 +57,8 @@ for domains that have mx1.example.com as their mail exchanger (MX record). In that case, you might want to exclude those domains from the report by naming mx1.example.com here. +Can be repeated to exclude more than one mail exchanger. + Default: [] (empty) .IP \fB\-\-forward-query\fR,\ \fB-f\fR diff --git a/list-remote-forwards.cabal b/list-remote-forwards.cabal index 6b85533..4718b35 100644 --- a/list-remote-forwards.cabal +++ b/list-remote-forwards.cabal @@ -73,7 +73,22 @@ description: Default: \"SELECT domain FROM domain WHERE domain <> 'ALL' ORDER BY domain;\" . @ - \--forward-query + \--exclude-mx, -e + @ + . + The name of a mail exchanger, the forwards of whose domains we should + ignore. For example, if one mail exchanger, mx1.example.com, has + strict spam filtering, it may be acceptable to have remote forwarding + for domains that have mx1.example.com as their mail exchanger (MX + record). In that case, you might want to exclude those domains from + the report by naming mx1.example.com here. + . + Can be repeated to exclude more than one mail exchanger. + . + Default: [] (empty) + . + @ + \--forward-query, -f @ . SQL query used to produce a list of all forwards on the mail @@ -85,7 +100,7 @@ description: Default: \"SELECT address,goto FROM alias ORDER BY address;\" . @ - \--host + \--host, -h @ . Hostname where the database is located (Postgres-only). @@ -108,7 +123,7 @@ description: Default: None, a UNIX domain socket connection is attempted (Postgres only) . @ - \--username + \--username, -u @ . Username used to connect to the database (Postgres-only). @@ -123,6 +138,7 @@ description: user2@example.com -> user1@example.org user2@example.com -> user2@example.org user2@example.com -> user3@example.org + user7@example.com -> user8@example.net @ executable list-remote-forwards -- 2.43.2