From 3deb88f584df9210cc00011af51c30a73e7b80bb Mon Sep 17 00:00:00 2001
From: Michael Kerrisk <mtk.manpages@gmail.com>
Date: Fri, 9 May 2008 21:25:32 +0000
Subject: [PATCH] sync

---
 Changes            | 15 +++++++++++++--
 man-pages-2.80.lsm |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Changes b/Changes
index e7629510a..d34c33973 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,6 @@
 ==================== Changes in man-pages-2.80 ====================
 
-Released: 2008-04-25
+Released: 2008-05-08
 
 
 Contributors
@@ -19,6 +19,7 @@ Heikki Orsila <shd@modeemi.fi>
 Ingo Molnar <mingo@elte.hu>
 Justin Pryzby <justinpryzby@users.sourceforge.net>
 Karsten Weiss <K.Weiss@science-computing.de>
+Martin Pitt <mpitt@debian.org>
 Marty Leisner <leisner@rochester.rr.com>
 Nicolas François <nicolas.francois@trialog.com>
 Nick Piggin <npiggin@suse.de>
@@ -126,7 +127,7 @@ getpriority.2
 getrlimit.2
 unix.7
     mtk
-        s/since kernel x.y.z/since Linux s.y.z/
+        s/since kernel x.y.z/since Linux x.y.z/
 
 wait.2
 inotify.7
@@ -257,6 +258,11 @@ recv.2
     Felix Kater / mtk
         Improve wording for EAGAIN error in discussion of MSG_DONTWAIT.
 
+rmdir.2
+    Martin Pitt
+        POSIX.1 also allows EEXIST for the ENOTEMPTY error condition.
+        as per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467552.
+        
 utime.2
     Reuben Thomas
         Remove unnecessary subheading for utimes().
@@ -345,6 +351,9 @@ aio_write.3
 backtrace.3
     Nicolas François
         s/backtrace_symbols/backtrace-symbols_fd/ in one sentence.
+    mtk
+        Fix bogus reference to variable 'strings': should be:
+	"the array of pointers".
 
 ctime.3
     mtk
@@ -516,6 +525,8 @@ inotify.7
     mtk
         Note that select()/poll()/epoll_wait() indicate a ready inotify
         file descriptor as readable.
+    mtk
+        Document IN_ATTRIB in a little more detail.
 
 pthreads.7
     Justin Pryzby
diff --git a/man-pages-2.80.lsm b/man-pages-2.80.lsm
index a236bc5e4..f76553e8b 100644
--- a/man-pages-2.80.lsm
+++ b/man-pages-2.80.lsm
@@ -1,13 +1,13 @@
 Begin3
 Title:          Section 2, 3, 4, 5 and 7 man pages for Linux
 Version:        2.80
-Entered-date:   2008-04-25
+Entered-date:   2008-05-08
 Description:    Linux and POSIX manual pages
 Keywords:       man pages
 Author:         several
 Maintained-by:  Michael Kerrisk <mtk.manpages@gmail.com>
 Primary-site:   ftp://ftp.kernel.org/pub/linux/docs/manpages
-                2733k man-pages-2.80.tar.gz
+                2734k man-pages-2.80.tar.gz
 Alternate-site: ftp://ftp.win.tue.nl/pub/linux-local/manpages
 Copying-policy: several; for the POSIX pages, see the file POSIX-COPYRIGHT;
 		the other pages are all freely distributable as long as