--- man-pages-2.54/man5/proc.5	2007-05-16 11:25:50.000000000 -0700
+++ man-pages-2.54/man5/proc.5.new	2007-06-09 10:36:38.000000000 -0700
@@ -255,11 +379,24 @@
 .\" 	  Some information can be found in the 2.6.17-rc1 change log.
 .\"       Added in 2.6.17
 .\"
-.\" FIXME Describe /proc/[number]/oom_adj
-.\"       Added in 2.6.11; updating requires CAP_SYS_RESOURCE
-.\"       Mention OOM_DISABLE (-17)
-.\" FIXME Describe /proc/[number]/oom_score
-.\"       Added in 2.6.11; read-only
+.TP
+.IR /proc/[number]/oom_adj " (Since 2.6.11)"
+This file adjusts the score used to select which processes should be
+killed in an  out-of-memory situation.
+A higher score increases the likelihood of this process being killed by
+the oom-killer.
+Valid values are in the range -16 to +15, plus the special value -17,
+which disables oom-killing altogether for this process.
+Changing this file requires the calling user have the CAP_SYS_RESOURCE
+cability. See
+.BR capabilities (7)
+for more information.
+.TP
+.IR /proc/[number]/oom_score " (Since 2.6.11)"
+This file shows the current score used by the oom-killer for a PID.
+Use it together with /proc/[number]/oom_adj to tune which process should
+be killed in an out-of-memory situation.
+This is read-only and not a tuneable.
 .TP
 .I /proc/[number]/root
 Unix and Linux support the idea of a per-process root of the