sync

Changes

@@ -10,6 +10,9 @@ The following people contributed notes, ideas, or patches that have
 been incorporated in changes in this release:
 
 Alain Portal <aportal@univ-montp2.fr>
+Reuben Thomas <rrt@sc3d.org>
+Sam Varshavchik <mrsam@courier-mta.com>
+Stephane Chazelas <stephane_chazelas@yahoo.fr>
 
 Apologies if I missed anyone!
 
@@ -17,6 +20,10 @@ Apologies if I missed anyone!
 New and rewritten pages
 -----------------------
 
+clock_nanosleep.2
+    mtk
+        A description of the clock_nanosleep() system call,
+	which was added in kernel 2.6.
 
 
 Newly documented interfaces in existing pages
@@ -32,9 +39,48 @@ New links
 Global changes
 --------------
 
-
+gethostid.2
+gethostname.2
+getaddrinfo.3
+gethostbyname.3
+getipnodebyname.3
+getnameinfo.3
+resolver.3
+hosts.5
+resolv.conf.5
+hostname.7
+    mtk
+        s/host name/hostname/
 
 Changes to individual pages
 ---------------------------
 
+fchmodat.2
+    Alain Portal
+        SEE ALSO: add symlink.7.  (3.01 changelog wrongly said this
+	had been done.)
 
+io_setup.2
+    Alain Portal
+        Remove superfluous text from RETURN VALUE.
+
+getaddrinfo.3
+    mtk, after a note by Stephane Chazelas
+        getaddrinfo() supports specifying IPv6 scope-IDs.
+
+
+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/
+
+setbuf.3
+    Reuben Thomas / mtk
+        Fix confused wording for return value of setvbuf().
+        Fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488104.
+    mtk
+        Other minor rewordings.
+        
+man-pages.7
+    mtk
+        Enhanced the dscussion of font conventions.