sync

2 files changed, 20 insertions, 9 deletions

diff --git a/Changes b/Changes
index 4f8eca1c8..c69870695 100644
--- a/Changes
+++ b/Changes
@@ -15,6 +15,8 @@ Apologies if I missed anyone!
 New pages
 ---------
 
+Andi Kleen <andi@firstfloor.org>
+John Heffner <jheffner@psc.edu>
 
 Global changes
 --------------
@@ -26,3 +28,12 @@ places.
 Changes to individual pages
 ---------------------------
 
+sched_rr_get_interval.2
+    mtk
+        Remove crufty statement that this system call is not implemented.
+        The nice interval can be used to control the size of
+	the round-robin quantum.
+
+ip.7
+    John Heffner / mtk
+        Document IP_PMTUDISC_PROBE, which will be in 2.6.22.
diff --git a/Changes.old b/Changes.old
index fcc7990ed..b6ddf0218 100644
--- a/Changes.old
+++ b/Changes.old
@@ -5442,6 +5442,7 @@ udp.7
     Andi Kleen
         Describe the correct default for UDP/RAW path MTU discovery.
 
+
 ==================== Changes in man-pages-2.44 ====================
 
 Released: 2007-04-04
@@ -5498,7 +5499,7 @@ Global changes
 --------------
 
 mtk
-    Justin Pryzby / mtk
+    JustinPyzby / mtk
         Add "#define _ATFILE_SOURCE" to SYNOPSIS in following pages:
             faccessat.2
             fchmodat.2
@@ -5610,7 +5611,7 @@ epoll_ctl.2
 faccessat.2
     Justin Pryzby
         Various fixes as per Debian bug 411177.
-        * s/effective/real/ in description test.
+        * s/effective/real/ in description text.
         * added <fcntl.h> to synopsis.
         * various other changes.
 
@@ -5672,7 +5673,7 @@ semop.2
         If sops contains multiple operations, then these are performed
         in array order.  All Unix systems that I know of do this,
         and some Linux applications depend on this behaviour.  SUSv3
-        made no explicit statement here, but SUSv3 will explicitly 
+        made no explicit statement here, but SUSv4 will explicitly 
         require this behaviour.
         Small rewording of explanation of "atomically".
 
@@ -5725,7 +5726,7 @@ ptrace.2
         
 sched_setaffinity.2
     mtk
-        Fix glibc version number in description of cpusetsize argument.
+        Fix glibc version number in description of 'cpusetsize' argument.
    
 vfork.2
     mtk
@@ -5750,8 +5751,9 @@ getopt.3
     mtk
         Added getopt() example program.
     mtk
-        Add a few words to clarify the operation of the GNU-specific double-colon
-        feature, which allows options to have optional arguments.
+        Add a few words to clarify the operation of the GNU-specific 
+        double-colon feature, which allows options to have optional 
+        arguments.
         See Debian bug352139.
 
 glob.3
@@ -5828,7 +5830,7 @@ feature_test_macros.7
     mtk
         The default treatment of _POSIX_C_SOURCE changed in glibc 2.4.
     mtk, after a suggestion by Justin Pryzby
-        Added some text warning that the "__" macros the
+        Added some text warning that the "__" macros that
         <features.h> defines internally should never be
         directly defined by programs.
     mtk, based on notes by Jakub Jelinek
@@ -5850,8 +5852,6 @@ svipc.7
 time.7
     mtk
         Since kernel 2.6.20, the software clock can also be 300 HZ.
-
-
 ==================== Changes in man-pages-2.45 ====================
 
 Released: 2007-04-05