From 881663d9c6aa933fc06dcddfae1a2653ece4e503 Mon Sep 17 00:00:00 2001
From: Michael Kerrisk <mtk.manpages@gmail.com>
Date: Mon, 30 Jun 2008 13:14:25 +0000
Subject: [PATCH] sync

---
 Changes | 44 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/Changes b/Changes
index 653463058..aa6c280f8 100644
--- a/Changes
+++ b/Changes
@@ -10,9 +10,11 @@ The following people contributed notes, ideas, or patches that have
 been incorporated in changes in this release:
 
 Alain Portal <aportal@univ-montp2.fr>
+Andries Brouwer <Andries.Brouwer@cwi.nl>
 Reuben Thomas <rrt@sc3d.org>
 Sam Varshavchik <mrsam@courier-mta.com>
 Stephane Chazelas <stephane_chazelas@yahoo.fr>
+WANG Cong <xiyou.wangcong@gmail.com>
 
 Apologies if I missed anyone!
 
@@ -34,6 +36,9 @@ Newly documented interfaces in existing pages
 New links
 ---------
 
+utmpx.5
+    mtk
+        Link to utmp.5.
 
 
 Global changes
@@ -64,15 +69,37 @@ io_setup.2
     Alain Portal
         Remove superfluous text from RETURN VALUE.
 
+sigreturn.2
+    mtk
+        Added a bit more detail on what sigreturn() actually does.
+
 getaddrinfo.3
     mtk, after a note by Stephane Chazelas
         getaddrinfo() supports specifying IPv6 scope-IDs.
 
+getlogin.3
+    mtk
+        ERRORS: add ENOTTY.
+        SEE ALSO: add utmp(5).
 
+getutent.3
+    WANG Cong
+        utmpname() does return a value.
+    mtk
+        Add paragraph to start of DESCRIPTION recommending
+	use of POSIX.1 "utmpx" functions.
+	CONFORMING TO: mention utmpxname().
+	Add an ERRORS section.
+        There are no utmpx equivalents of the _r reentrant functions.
+        Clarify discussion of return values.
+	Add pointer to definition of utmp structure in utmp(5).
+	Clarify discussion of utmpx file on other systems (versus
+	Linux situation).
+    
 inet_pton.3
     Stephane Chazelas
-        Fix error in description of IPv6 presentation format.
-        s/x.x.x.x.x.x.x.x/x:x:x:x:x:x:x:x/
+        Fix error in description of IPv6 presentation format:
+        s/x.x.x.x.x.x.x.x/x:x:x:x:x:x:x:x/.
 
 setbuf.3
     Reuben Thomas / mtk
@@ -81,6 +108,19 @@ setbuf.3
     mtk
         Other minor rewordings.
         
+utmp.5
+    mtk
+        Add discussion of POSIX.1 utmpx specification.
+	Move some text from CONFORMING TO to NOTES.
+        Consolidate duplicated information about ut_tv and ut_session
+	on biarch platforms.
+	Removed some crufty text.
+	Added comments to macros for ut_type field.
+	Correct the description of the ut_id field.
+        Provide a little more detail on fields of utmp structure.
+        SEE ALSO: add login(3), logout(3), logwtmp(3).
+        UT_LINESIZE is 32 (not 12).
+
 man-pages.7
     mtk
         Enhanced the dscussion of font conventions.