04/06: doc: Update exim service documentation.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 63422bbb0a874b74fd0462e5c44b11f10669ef8d
Author: Carlo Zancanaro <address@hidden>
Date:   Wed Apr 19 23:58:24 2017 +1000

    doc: Update exim service documentation.
    
    * doc/guix.texi (Mail Services): Update exim service documentation to remove
    mail-aliases, add mail-aliases-service-type documentation.
    
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 doc/guix.texi | 52 ++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index a482bee..753c399 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -12654,19 +12654,26 @@ remote servers.  Run @command{man smtpd.conf} for 
more information.
 
 @subsubheading Exim Service
 
address@hidden mail transfer agent (MTA)
address@hidden MTA (mail transfer agent)
address@hidden SMTP
+
 @deffn {Scheme Variable} exim-service-type
-This is the type of the @uref{https://exim.org, Exim} service, whose value
-should be an @code{exim-configuration} object as in this example:
+This is the type of the @uref{https://exim.org, Exim} mail transfer
+agent (MTA), whose value should be an @code{exim-configuration} object
+as in this example:
 
 @example
 (service exim-service-type
          (exim-configuration
-           (config-file (local-file "./my-exim.conf"))
-           (aliases '(("postmaster" "bob")
-                      ("bob" "bob@@example.com" "bob@@example2.com")))))
+           (config-file (local-file "./my-exim.conf"))))
 @end example
 @end deffn
 
+In order to use an @code{exim-service-type} service you must also have a
address@hidden service present in your
address@hidden (even if it has no aliases).
+
 @deftp {Data Type} exim-configuration
 Data type representing the configuration of exim.
 
@@ -12681,16 +12688,37 @@ provided in @code{package}. The resulting 
configuration file is loaded
 after setting the @code{exim_user} and @code{exim_group} configuration
 variables.
 
address@hidden @code{aliases} (default: @code{'()})
-List of aliases to use when delivering mail on this system. The
address@hidden of each list is used to match incoming mail, with the
address@hidden of each list designating how to deliver it. There may be many
-delivery methods provided, in which case the mail is delivered to them
-all.
-
 @end table
 @end deftp
 
address@hidden Mail Aliases Service
+
address@hidden email aliases
address@hidden aliases, for email addresses
+
address@hidden {Scheme Variable} mail-aliases-service-type
+This is the type of the service which provides @code{/etc/aliases},
+specifying how to deliver mail to users on this system.
+
address@hidden
+(service mail-aliases-service-type
+         '(("postmaster" "bob")
+           ("bob" "bob@@example.com" "bob@@example2.com")))
address@hidden example
address@hidden deffn
+
+The configuration for a @code{mail-aliases-service-type} service is an
+association list denoting how to deliver mail that comes to this
+system. Each entry is of the form @code{(alias addresses ...)}, with
address@hidden specifying the local alias and @code{addresses} specifying
+where to deliver this user's mail.
+
+The aliases aren't required to exist as users on the local system. In
+the above example, there doesn't need to be a @code{postmaster} entry in
+the @code{operating-system}'s @code{user-accounts} in order to deliver
+the @code{postmaster} mail to @code{bob} (which subsequently would
+deliver mail to @code{bob@@example.com} and @code{bob@@example2.com}).
+
 @node Messaging Services
 @subsubsection Messaging Services