Blame SOURCES/postfix-2.10.1-canonical-maps-doc-fix.patch

e61286
diff --git a/conf/canonical b/conf/canonical
e61286
index 720db18..26937ce 100644
e61286
--- a/conf/canonical
e61286
+++ b/conf/canonical
e61286
@@ -82,9 +82,14 @@
e61286
 # 
e61286
 # TABLE SEARCH ORDER
e61286
 #        With lookups from indexed files such as DB or DBM, or from
e61286
-#        networked  tables  such  as NIS, LDAP or SQL, patterns are
e61286
-#        tried in the order as listed below:
e61286
-# 
e61286
+#        networked   tables   such   as  NIS,  LDAP  or  SQL,  each
e61286
+#        user@domain query produces a sequence of query patterns as
e61286
+#        described below.
e61286
+#
e61286
+#        Each  query pattern is sent to each specified lookup table
e61286
+#        before trying the next query pattern,  until  a  match  is
e61286
+#        found.
e61286
+#
e61286
 #        user@domain address
e61286
 #               Replace user@domain by address. This form  has  the
e61286
 #               highest precedence.
e61286
diff --git a/conf/generic b/conf/generic
e61286
index d5ab42a..f66c2f4 100644
e61286
--- a/conf/generic
e61286
+++ b/conf/generic
e61286
@@ -72,9 +72,14 @@
e61286
 # 
e61286
 # TABLE SEARCH ORDER
e61286
 #        With lookups from indexed files such as DB or DBM, or from
e61286
-#        networked  tables  such  as NIS, LDAP or SQL, patterns are
e61286
-#        tried in the order as listed below:
e61286
-# 
e61286
+#        networked   tables   such   as  NIS,  LDAP  or  SQL,  each
e61286
+#        user@domain query produces a sequence of query patterns as
e61286
+#        described below.
e61286
+#
e61286
+#        Each  query pattern is sent to each specified lookup table
e61286
+#        before trying the next query pattern,  until  a  match  is
e61286
+#        found.
e61286
+#
e61286
 #        user@domain address
e61286
 #               Replace user@domain by address. This form  has  the
e61286
 #               highest precedence.
e61286
diff --git a/conf/virtual b/conf/virtual
e61286
index 3be6ab9..1843622 100644
e61286
--- a/conf/virtual
e61286
+++ b/conf/virtual
e61286
@@ -81,9 +81,14 @@
e61286
 # 
e61286
 # TABLE SEARCH ORDER
e61286
 #        With lookups from indexed files such as DB or DBM, or from
e61286
-#        networked tables such as NIS, LDAP or  SQL,  patterns  are
e61286
-#        tried in the order as listed below:
e61286
-# 
e61286
+#        networked  tables  such  as  NIS,  LDAP   or   SQL,   each
e61286
+#        user@domain query produces a sequence of query patterns as
e61286
+#        described below.
e61286
+#
e61286
+#        Each query pattern is sent to each specified lookup  table
e61286
+#        before  trying  the  next  query pattern, until a match is
e61286
+#        found.
e61286
+#
e61286
 #        user@domain address, address, ...
e61286
 #               Redirect  mail  for  user@domain  to address.  This
e61286
 #               form has the highest precedence.
e61286
diff --git a/html/canonical.5.html b/html/canonical.5.html
e61286
index c97f910..1ef4aac 100644
e61286
--- a/html/canonical.5.html
e61286
+++ b/html/canonical.5.html
e61286
@@ -87,9 +87,12 @@ CANONICAL(5)                                                      CANONICAL(5)
e61286
               cal line.
e61286
 
e61286
 TABLE SEARCH ORDER
e61286
-       With lookups from indexed files such as DB or DBM, or from
e61286
-       networked  tables  such  as NIS, LDAP or SQL, patterns are
e61286
-       tried in the order as listed below:
e61286
+       With lookups from indexed files such as DB or DBM, or from networked
e61286
+       tables  such  as  NIS,  LDAP  or SQL, each user@domain query produces a
e61286
+       sequence of query patterns as described below.
e61286
+
e61286
+       Each query pattern is sent to each specified lookup table before trying
e61286
+       the next query pattern, until a match is found.
e61286
 
e61286
        user@domain address
e61286
               Replace user@domain by address. This form  has  the
e61286
diff --git a/html/generic.5.html b/html/generic.5.html
e61286
index debee93..3294832 100644
e61286
--- a/html/generic.5.html
e61286
+++ b/html/generic.5.html
e61286
@@ -77,9 +77,12 @@ GENERIC(5)                                                          GENERIC(5)
e61286
               cal line.
e61286
 
e61286
 TABLE SEARCH ORDER
e61286
-       With lookups from indexed files such as DB or DBM, or from
e61286
-       networked  tables  such  as NIS, LDAP or SQL, patterns are
e61286
-       tried in the order as listed below:
e61286
+       With lookups from indexed files such as DB or DBM, or from networked
e61286
+       tables such as NIS, LDAP or SQL,  each  user@domain  query  produces  a
e61286
+       sequence of query patterns as described below.
e61286
+
e61286
+       Each query pattern is sent to each specified lookup table before trying
e61286
+       the next query pattern, until a match is found.
e61286
 
e61286
        user@domain address
e61286
               Replace user@domain by address. This form  has  the
e61286
diff --git a/html/virtual.5.html b/html/virtual.5.html
e61286
index c92826c..7fa6329 100644
e61286
--- a/html/virtual.5.html
e61286
+++ b/html/virtual.5.html
e61286
@@ -86,9 +86,12 @@ VIRTUAL(5)                                                          VIRTUAL(5)
e61286
               cal line.
e61286
 
e61286
 TABLE SEARCH ORDER
e61286
-       With lookups from indexed files such as DB or DBM, or from
e61286
-       networked tables such as NIS, LDAP or  SQL,  patterns  are
e61286
-       tried in the order as listed below:
e61286
+       With lookups from indexed files such as DB or DBM, or from networked
e61286
+       tables  such  as  NIS,  LDAP  or SQL, each user@domain query produces a
e61286
+       sequence of query patterns as described below.
e61286
+
e61286
+       Each query pattern is sent to each specified lookup table before trying
e61286
+       the next query pattern, until a match is found.
e61286
 
e61286
        user@domain address, address, ...
e61286
               Redirect  mail  for  user@domain  to address.  This
e61286
diff --git a/man/man5/canonical.5 b/man/man5/canonical.5
e61286
index 1bf8d53..267495f 100644
e61286
--- a/man/man5/canonical.5
e61286
+++ b/man/man5/canonical.5
e61286
@@ -88,8 +88,12 @@ starts with whitespace continues a logical line.
e61286
 .ad
e61286
 .fi
e61286
 With lookups from indexed files such as DB or DBM, or from networked
e61286
-tables such as NIS, LDAP or SQL, patterns are tried in the order as
e61286
-listed below:
e61286
+tables such as NIS, LDAP or SQL, each \fIuser\fR@\fIdomain\fR
e61286
+query produces a sequence of query patterns as described below.
e61286
+
e61286
+Each query pattern is sent to each specified lookup table
e61286
+before trying the next query pattern, until a match is
e61286
+found.
e61286
 .IP "\fIuser\fR@\fIdomain address\fR"
e61286
 Replace \fIuser\fR@\fIdomain\fR by \fIaddress\fR. This form
e61286
 has the highest precedence.
e61286
diff --git a/man/man5/generic.5 b/man/man5/generic.5
e61286
index 13b9dd0..1153f58 100644
e61286
--- a/man/man5/generic.5
e61286
+++ b/man/man5/generic.5
e61286
@@ -80,8 +80,12 @@ starts with whitespace continues a logical line.
e61286
 .ad
e61286
 .fi
e61286
 With lookups from indexed files such as DB or DBM, or from networked
e61286
-tables such as NIS, LDAP or SQL, patterns are tried in the order as
e61286
-listed below:
e61286
+tables such as NIS, LDAP or SQL, each \fIuser\fR@\fIdomain\fR
e61286
+query produces a sequence of query patterns as described below.
e61286
+
e61286
+Each query pattern is sent to each specified lookup table
e61286
+before trying the next query pattern, until a match is
e61286
+found.
e61286
 .IP "\fIuser\fR@\fIdomain address\fR"
e61286
 Replace \fIuser\fR@\fIdomain\fR by \fIaddress\fR. This form
e61286
 has the highest precedence.
e61286
diff --git a/man/man5/virtual.5 b/man/man5/virtual.5
e61286
index da139f8..241bf10 100644
e61286
--- a/man/man5/virtual.5
e61286
+++ b/man/man5/virtual.5
e61286
@@ -86,8 +86,12 @@ starts with whitespace continues a logical line.
e61286
 .ad
e61286
 .fi
e61286
 With lookups from indexed files such as DB or DBM, or from networked
e61286
-tables such as NIS, LDAP or SQL, patterns are tried in the order as
e61286
-listed below:
e61286
+tables such as NIS, LDAP or SQL, each \fIuser\fR@\fIdomain\fR
e61286
+query produces a sequence of query patterns as described below.
e61286
+
e61286
+Each query pattern is sent to each specified lookup table
e61286
+before trying the next query pattern, until a match is
e61286
+found.
e61286
 .IP "\fIuser\fR@\fIdomain address, address, ...\fR"
e61286
 Redirect mail for \fIuser\fR@\fIdomain\fR to \fIaddress\fR.
e61286
 This form has the highest precedence.
e61286
diff --git a/proto/canonical b/proto/canonical
e61286
index cdda918..6255ba2 100644
e61286
--- a/proto/canonical
e61286
+++ b/proto/canonical
e61286
@@ -76,8 +76,12 @@
e61286
 # .ad
e61286
 # .fi
e61286
 #	With lookups from indexed files such as DB or DBM, or from networked
e61286
-#	tables such as NIS, LDAP or SQL, patterns are tried in the order as
e61286
-#	listed below:
e61286
+#	tables such as NIS, LDAP or SQL, each \fIuser\fR@\fIdomain\fR
e61286
+#	query produces a sequence of query patterns as described below.
e61286
+#
e61286
+#	Each query pattern is sent to each specified lookup table
e61286
+#	before trying the next query pattern, until a match is
e61286
+#	found.
e61286
 # .IP "\fIuser\fR@\fIdomain address\fR"
e61286
 #	Replace \fIuser\fR@\fIdomain\fR by \fIaddress\fR. This form
e61286
 #	has the highest precedence.
e61286
diff --git a/proto/generic b/proto/generic
e61286
index b2e730a..25db840 100644
e61286
--- a/proto/generic
e61286
+++ b/proto/generic
e61286
@@ -68,8 +68,12 @@
e61286
 # .ad
e61286
 # .fi
e61286
 #	With lookups from indexed files such as DB or DBM, or from networked
e61286
-#	tables such as NIS, LDAP or SQL, patterns are tried in the order as
e61286
-#	listed below:
e61286
+#	tables such as NIS, LDAP or SQL, each \fIuser\fR@\fIdomain\fR
e61286
+#	query produces a sequence of query patterns as described below.
e61286
+#
e61286
+#	Each query pattern is sent to each specified lookup table
e61286
+#	before trying the next query pattern, until a match is
e61286
+#	found.
e61286
 # .IP "\fIuser\fR@\fIdomain address\fR"
e61286
 #	Replace \fIuser\fR@\fIdomain\fR by \fIaddress\fR. This form
e61286
 #	has the highest precedence.
e61286
diff --git a/proto/virtual b/proto/virtual
e61286
index 8a2d28f..1fc30aa 100644
e61286
--- a/proto/virtual
e61286
+++ b/proto/virtual
e61286
@@ -74,8 +74,12 @@
e61286
 # .ad
e61286
 # .fi
e61286
 #	With lookups from indexed files such as DB or DBM, or from networked
e61286
-#	tables such as NIS, LDAP or SQL, patterns are tried in the order as
e61286
-#	listed below:
e61286
+#	tables such as NIS, LDAP or SQL, each \fIuser\fR@\fIdomain\fR
e61286
+#	query produces a sequence of query patterns as described below.
e61286
+#
e61286
+#	Each query pattern is sent to each specified lookup table
e61286
+#	before trying the next query pattern, until a match is
e61286
+#	found.
e61286
 # .IP "\fIuser\fR@\fIdomain address, address, ...\fR"
e61286
 #	Redirect mail for \fIuser\fR@\fIdomain\fR to \fIaddress\fR.
e61286
 #	This form has the highest precedence.