From 2860b67d20a4f73f3cb8bdf5e0d5f542f7c138c8 Mon Sep 17 00:00:00 2001
From: Michael Kerrisk <mtk.manpages@gmail.com>
Date: Tue, 8 Jul 2008 10:19:18 +0000
Subject: [PATCH] sync

---
 Changes | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/Changes b/Changes
index b9ced1673..6b15b9af7 100644
--- a/Changes
+++ b/Changes
@@ -10,7 +10,7 @@ The following people contributed notes, ideas, or patches that have
 been incorporated in changes in this release:
 
 Alain Portal <aportal@univ-montp2.fr>
-Bruno Haible <bruno@clisp.org>
+Nikanth Karthikesan <knikanth@suse.de>
 Vincent Lefevre <vincent@vinc17.org>
 
 Apologies if I missed anyone!
@@ -37,6 +37,20 @@ Newly documented interfaces in existing pages
 New links
 ---------
 
+getdate_err.3
+    mtk
+	Link to getdate.3.
+
+h_errno.3
+    mtk
+        Link to gethsotbyname.3.
+
+optarg.3
+opterr.3
+optind.3
+optopt.3
+    mtk
+        Link to getopt.3.
 
 
 Global changes
@@ -47,6 +61,15 @@ Global changes
 Changes to individual pages
 ---------------------------
 
+clock_nanosleep.2
+    mtk
+        Add "Link with -lrt" to SYNOPSIS.
+
+ioprio_set.2
+    Nikanth Karthikesan
+        Since Linux 2.6.25, CAP_SYS_ADMIN is longer required to set
+	a low priority (IOPRIO_CLASS_IDLE).
+
 sigaction.2
     mtk
         Document si_overrun and si_tid fields of siginfo structure.
@@ -61,7 +84,7 @@ signalfd.2
 
 swapon.2
     mtk
-        Fix 2 * version number typo for MAX_SWAPFILES discussion:
+        Fix two version number typos for MAX_SWAPFILES discussion:
 	s/2.6.10/2.4.10/
 
 dl_iterate_phdr.3
@@ -73,4 +96,8 @@ scanf.3
         Clarify treatment of intial white space by %% conversion
 	specification.
         as per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=435648.
-        
+
+capabilities.7
+    mtk
+        Since Linux 2.6.25, CAP_SYS_ADMIN is no longer required for
+	ioprio_set() to set IOPRIO_CLASS_IDLE class.