Merging upstream version 6.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 14 insertions, 14 deletions

diff --git a/man7/mailaddr.7 b/man7/mailaddr.7
index 8218daa..f2da7da 100644
--- a/man7/mailaddr.7
+++ b/man7/mailaddr.7
@@ -24,7 +24,7 @@
 .\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\" %%%LICENSE_END
 .\"
-.TH mailaddr 7 2023-02-05 "Linux man-pages 6.05.01"
+.TH mailaddr 7 2023-10-31 "Linux man-pages 6.7"
 .UC 5
 .SH NAME
 mailaddr \- mail addressing description
@@ -33,16 +33,16 @@ mailaddr \- mail addressing description
 This manual page gives a brief introduction to SMTP mail addresses,
 as used on the Internet.
 These addresses are in the general format
-.PP
+.P
 .in +4n
 .EX
 user@domain
 .EE
 .in
-.PP
+.P
 where a domain is a hierarchical dot-separated list of subdomains.
 These examples are valid forms of the same address:
-.PP
+.P
 .in +4n
 .EX
 john.doe@monet.example.com
@@ -50,11 +50,11 @@ John Doe <john.doe@monet.example.com>
 john.doe@monet.example.com (John Doe)
 .EE
 .in
-.PP
+.P
 The domain part ("monet.example.com") is a mail-accepting domain.
 It can be a host and in the past it usually was, but it doesn't have to be.
 The domain part is not case sensitive.
-.PP
+.P
 The local part ("john.doe") is often a username,
 but its meaning is defined by the local software.
 Sometimes it is case sensitive,
@@ -62,7 +62,7 @@ although that is unusual.
 If you see a local-part that looks like garbage,
 it is usually because of a gateway between an internal e-mail
 system and the net, here are some examples:
-.PP
+.P
 .in +4n
 .EX
 "surname/admd=telemail/c=us/o=hp/prmd=hp"@some.where
@@ -71,17 +71,17 @@ machine!machine!name@some.where
 I2461572@some.where
 .EE
 .in
-.PP
+.P
 (These are, respectively, an X.400 gateway, a gateway to an arbitrary
 internal mail system that lacks proper internet support, an UUCP
 gateway, and the last one is just boring username policy.)
-.PP
+.P
 The real-name part ("John Doe") can either be placed before
 <>, or in () at the end.
 (Strictly speaking the two aren't the same,
 but the difference is beyond the scope of this page.)
 The name may have to be quoted using "", for example, if it contains ".":
-.PP
+.P
 .in +4n
 .EX
 "John Q. Doe" <john.doe@monet.example.com>
@@ -99,17 +99,17 @@ In the past, sometimes one had to route a message through
 several hosts to get it to its final destination.
 Addresses which show these relays are termed "route-addrs".
 These use the syntax:
-.PP
+.P
 .in +4n
 .EX
 <@hosta,@hostb:user@hostc>
 .EE
 .in
-.PP
+.P
 This specifies that the message should be sent to hosta,
 from there to hostb, and finally to hostc.
 Many hosts disregard route-addrs and send directly to hostc.
-.PP
+.P
 Route-addrs are very unusual now.
 They occur sometimes in old mail archives.
 It is generally possible to ignore all but the "user@hostc"
@@ -128,7 +128,7 @@ The "postmaster" address is not case sensitive.
 .BR aliases (5),
 .BR forward (5),
 .BR sendmail (8)
-.PP
+.P
 .UR http://www.ietf.org\:/rfc\:/rfc5322.txt
 IETF RFC\ 5322
 .UE