(split) LDP: Update release pages based on LDP 3.54 release

[linuxjm/LDP_man-pages.git] / release / man7 / mailaddr.7

diff --git a/release/man7/mailaddr.7 b/release/man7/mailaddr.7
index 8050f30..6d94a7a 100644 (file)
--- a/release/man7/mailaddr.7
+++ b/release/man7/mailaddr.7
@@ -1,7 +1,16 @@
-.\"
 .\" Copyright (c) 1983, 1987 The Regents of the University of California.
 .\" All rights reserved.
 .\"
+.\"    @(#)mailaddr.7  6.5 (Berkeley) 2/14/89
+.\"
+.\" Extensively rewritten by Arnt Gulbrandsen <agulbra@troll.no>.  My
+.\" changes are placed under the same copyright as the original BSD page.
+.\"
+.\" Adjusted by Arnt Gulbrandsen <arnt@gulbrandsen.priv.no> in 2004 to
+.\" account for changes since 1995. Route-addrs are now even less
+.\" common, etc. Some minor wording improvements. Same copyright.
+.\"
+.\" %%%LICENSE_START(PERMISSIVE_MISC)
 .\" Redistribution and use in source and binary forms are permitted
 .\" provided that the above copyright notice and this paragraph are
 .\" duplicated in all such forms and that any documentation,
@@ -13,21 +22,19 @@
 .\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 .\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-.\"
-.\"    @(#)mailaddr.7  6.5 (Berkeley) 2/14/89
-.\"
-.\" Extensively rewritten by Arnt Gulbrandsen <agulbra@troll.no>.  My
-.\" changes are placed under the same copyright as the original BSD page.
-.\"
-.\" Adjusted by Arnt Gulbrandsen <arnt@gulbrandsen.priv.no> in 2004 to
-.\" account for changes since 1995. Route-addrs are now even less
-.\" common, etc. Some minor wording improvements. Same copyright.
+.\" %%%LICENSE_END
 .\"
 .\"*******************************************************************
 .\"
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
+.\"
+.\" Japanese Version Copyright (c) 1997 HANATAKA Shinya
+.\"         all rights reserved.
+.\" Translated 1997-06-03, HANATAKA Shinya <hanataka@abyss.rim.or.jp>
+.\" Modified 2005-02-21, Akihiro MOTOKI <amotoki@dd.iij4u.or.jp>
+.\"
 .TH MAILADDR 7 2004\-09\-15 Linux "Linux User's Manual"
 .UC 5
 .SH 名前
@@ -99,6 +106,6 @@ mailaddr \- メール・アドレスの説明
 
 RFC\ 2822 (Internet Message Format)
 .SH この文書について
-この man ページは Linux \fIman\-pages\fP プロジェクトのリリース 3.40 の一部
+この man ページは Linux \fIman\-pages\fP プロジェクトのリリース 3.54 の一部
 である。プロジェクトの説明とバグ報告に関する情報は
 http://www.kernel.org/doc/man\-pages/ に書かれている。