From 95f5f6d1c3aec1cb62525f5162e71a4157aca717 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 13 Apr 2024 10:42:27 +0200
Subject: Merging upstream version 3.9.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 html/aliases.5.html | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'html/aliases.5.html')

diff --git a/html/aliases.5.html b/html/aliases.5.html
index 27cfe69..79d01b4 100644
--- a/html/aliases.5.html
+++ b/html/aliases.5.html
@@ -14,9 +14,13 @@ ALIASES(5)                                                          ALIASES(5)
        <b>newaliases</b>
 
 <b>DESCRIPTION</b>
-       The  <a href="aliases.5.html"><b>aliases</b>(5)</a> table provides a system-wide mechanism to redirect mail
-       for local recipients. The redirections are  processed  by  the  Postfix
-       <a href="local.8.html"><b>local</b>(8)</a> delivery agent.
+       The  optional  <a href="aliases.5.html"><b>aliases</b>(5)</a>  table  (<a href="postconf.5.html#alias_maps">alias_maps</a>) redirects mail for local
+       recipients. The redirections are  processed  by  the  Postfix  <a href="local.8.html"><b>local</b>(8)</a>
+       delivery agent.
+
+       This  is  unlike <a href="virtual.5.html"><b>virtual</b>(5)</a> aliasing (<a href="postconf.5.html#virtual_alias_maps">virtual_alias_maps</a>) which applies
+       to all recipients: <a href="local.8.html">local(8)</a>, virtual, and remote, and which  is  imple-
+       mented by the <a href="cleanup.8.html"><b>cleanup</b>(8)</a> daemon.
 
        Normally,  the <a href="aliases.5.html"><b>aliases</b>(5)</a> table is specified as a text file that serves
        as input to the <a href="postalias.1.html"><b>postalias</b>(1)</a> command. The result, an  indexed  file  in
@@ -144,7 +148,9 @@ ALIASES(5)                                                          ALIASES(5)
               "<b>newaliases</b>" or with "<b>sendmail -bi</b>".
 
        <b><a href="postconf.5.html#alias_maps">alias_maps</a> (see 'postconf -d' output)</b>
-              The alias databases that are used for <a href="local.8.html"><b>local</b>(8)</a> delivery.
+              Optional lookup tables with aliases that apply only to  <a href="local.8.html"><b>local</b>(8)</a>
+              recipients;  this is unlike <a href="postconf.5.html#virtual_alias_maps">virtual_alias_maps</a> that apply to all
+              recipients: <a href="local.8.html"><b>local</b>(8)</a>, virtual, and remote.
 
        <b><a href="postconf.5.html#allow_mail_to_commands">allow_mail_to_commands</a> (alias, forward)</b>
               Restrict <a href="local.8.html"><b>local</b>(8)</a> mail delivery to external commands.
-- 
cgit v1.2.3