crossed the Rubicon, and no, it wasn't fun

12 files changed, 28 insertions, 38 deletions

diff --git a/AUTHORS b/AUTHORS
index 3e47666..dd2ad4f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,10 +8,10 @@ Michael K. Johnson <johnsonm@redhat.com>
 Michael Shields <mjshield@nyx.cs.du.edu>
 Charles Blake <cblake@bbn.com>
 David Mossberger-Tang
-Albert Cahalan <acahalan@cs.uml.edu>
+Albert Cahalan <albert@users.sf.net>
 
 skill/kill/snice:
-Albert Cahalan <acahalan@cs.uml.edu>
+Albert Cahalan <albert@users.sf.net>
 
 tload:
 Branko Lankester
diff --git a/BUGS b/BUGS
index df7ced4..1264340 100644
--- a/BUGS
+++ b/BUGS
@@ -9,16 +9,21 @@ documentation!
 
 Where to send
 =============
-Send comments, bug reports, patches, etc., to acahalan@cs.uml.edu
+Send comments, bug reports, patches, etc., to albert@users.sf.net
 
 
 What to send
 ============
-It is much more useful to me if a program really crases to recompile it
+It is much more useful to me if a program really crashes to recompile it
 with make "CC=gcc -ggdb -O", run it with "gdb prog" and "run" and send
 me a stack trace ('bt' command).  That said, any bug report is still
 better than none.
 
+strace and ltrace output are very helpful:
+
+        strace -o output-file ps --blah
+        bzip2 output-file
+
 It might be nice to get rid of miscellaneous compiler warnings, but
 don't bend over backwards to do it.
 
@@ -33,29 +38,20 @@ code was compiled.
 
 A macro is provide in libproc/version.h to construct the code from its
 components, e.g.
-  if (linux_version_code < LINUX_VERSION(1,1,30))
-     /* tty field is only a minor */
+  if (linux_version_code < LINUX_VERSION(2,5,41))
+     /* blah blah blah */
 A startup call to set_linux_version may also be necessary.
 
 Of course, if a bug is due to a change in kernel file formats, it would
 be best to first try to generalize the parsing, since the code is then
 more resilient against future change.
 
-If you send me patches which are specific to *compiling* on a particular
-version of Linux include a "#if LINUX_VERSION_CODE > 1*0x10000+3*0x100+54"
-markup of the patch so that the package may be compiled with older
-kernels as well as the "latest and greatest".  LINUX_VERSION_CODE is
-#define'd in <linux/version.h>.
-
-Note that you should not make patches specific to *compiling* on a
-particular version of Linux unless there is nothing else you can do.
-
 Also unified diffs (diff -u) are my preference, context diffs (diff -c )
 are kind of usable, and standard diffs (diff) are more useless than a
 generic text description of what you did.  Just use
-	diff -u oldfile newfile
+	diff -Naurd oldfile newfile
 or
-	diff -Naur old-procps-dir new-procps-dir
+	diff -Naurd old-procps-dir new-procps-dir
 to create your diffs and you will make me happy.  Also make sure to
 include a description of what the diff is for or I'm likely to ignore
 it because of general lack of time...
@@ -63,12 +59,8 @@ it because of general lack of time...
 
 Code Structure
 ==============
-My ultimate goal for this package is to be compilable with any kernel
-headers and to be able to run under any kernel's /proc.  (Don't bother
-telling me that I'm not especially close to my ultimate goal... who
-is? :-)
 
-Anyhow, another goal is to encapsulate *all* parsing dependent on /proc
+A goal is to encapsulate *all* parsing dependent on /proc
 file formats into the libproc library.  If the API is general enough
 it can hopefully stabilize and then /proc changes might only require
 updating libproc.so.  Beyond that having the set of utilities be simple
diff --git a/free.1 b/free.1
index f33b8d1..cc69004 100644
--- a/free.1
+++ b/free.1
@@ -41,5 +41,5 @@ The \fB\-V\fP displays version information.
 .SH AUTHORS
 Written by Brian Edmonds. 
 
-Send bug reports to <acahalan@cs.uml.edu>
+Send bug reports to <albert@users.sf.net>
 
diff --git a/kill.1 b/kill.1
index f6870b8..a2b8df6 100644
--- a/kill.1
+++ b/kill.1
@@ -90,8 +90,8 @@ top(1) skill(1) kill(2) renice(1) nice(1)
 This command meets appropriate standards. The -L flag is Linux-specific.
 
 .SH AUTHOR
-Albert Cahalan <acahalan@cs.uml.edu> wrote kill in 1999 to replace the
+Albert Cahalan <albert@users.sf.net> wrote kill in 1999 to replace the
 version that was not standards compliant. Michael K. Johnson
 <johnsonm@redhat.com> is the current maintainer of the procps collection.
 
-Please send bug reports to <acahalan@cs.uml.edu>
+Please send bug reports to <albert@users.sf.net>
diff --git a/procps.lsm b/procps.lsm
index 0d4e9ae..9adc699 100644
--- a/procps.lsm
+++ b/procps.lsm
@@ -7,7 +7,7 @@ Description: Procps is a library which parses the textual /proc filesystem
 Keywords: procps /proc libproc
 	ps uptime tload free w top vmstat watch skill snice kill pgrep pkill
 Author: Michael K. Johnson, Charles Blake, Albert Cahalan, many others.
-Maintained-by: various <acahalan@cs.uml.edu>
+Maintained-by: various <albert@users.sf.net>
 Primary-site: http://procps.sf.net/
 	185kB procps-3.0.0.tar.gz
 Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html
diff --git a/skill.1 b/skill.1
index 5703954..590faea 100644
--- a/skill.1
+++ b/skill.1
@@ -112,8 +112,6 @@ top(1) kill(1) renice(1) nice(1)
 No standards apply.
 
 .SH AUTHOR
-Albert Cahalan <acahalan@cs.uml.edu> wrote skill and snice in 1999 as a
-replacement for a non-free version. Michael K. Johnson <johnsonm@redhat.com>
-is the current maintainer of the procps collection.
-
-Please send bug reports to <acahalan@cs.uml.edu>
+Albert Cahalan <albert@users.sf.net> wrote skill and snice in 1999 as a
+replacement for a non-free version, and is the current maintainer of the
+procps collection. Please send bug reports to <albert@users.sf.net>
diff --git a/tload.1 b/tload.1
index aec34dd..ef82b01 100644
--- a/tload.1
+++ b/tload.1
@@ -47,4 +47,4 @@ and update the display.
 Branko Lankester, David Engel <david@ods.com>, and 
 Michael K. Johnson <johnsonm@redhat.com>.
 
-Please send bug reports to <acahalan@cs.uml.edu>
+Please send bug reports to <albert@users.sf.net>
diff --git a/top.1 b/top.1
index 51a5dff..52238a3 100644
--- a/top.1
+++ b/top.1
@@ -1902,7 +1902,7 @@ them ol' bug-bytes (sic-sic)!
 Bugs?  What bugs?  But, if ever there were, then...
 
 Please send bug reports to:
-   Albert D\. Cahalan, <acahalan@cs.uml.edu>
+   Albert D\. Cahalan, <albert@users.sf.net>
 
 [ thanks Albert, heaven forbid author should be bothered ]
 
@@ -1934,7 +1934,7 @@ This entirely new and enhanced replacement was written by:
 
 With invaluable help from:
    Craig Small, <csmall@small.dropbear.id.au>
-   Albert D\. Cahalan, <acahalan@cs.uml.edu>
+   Albert D\. Cahalan, <albert@users.sf.net>
 
 .ig
 .rj 2
diff --git a/top.c b/top.c
index 2e4aa9f..797b041 100644
--- a/top.c
+++ b/top.c
@@ -15,7 +15,7 @@
  */
 /* For their contributions to this program, the author wishes to thank:
  *    Craig Small, <csmall@small.dropbear.id.au>
- *    Albert D. Cahalan, <acahalan@cs.uml.edu>
+ *    Albert D. Cahalan, <albert@users.sf.net>
  */
 #include <sys/ioctl.h>
 #include <sys/resource.h>
diff --git a/top.h b/top.h
index 9967ae5..49fc86e 100644
--- a/top.h
+++ b/top.h
@@ -15,7 +15,7 @@
  */
 /* For their contributions to this program, the author wishes to thank:
  *    Craig Small, <csmall@small.dropbear.id.au>
- *    Albert D. Cahalan, <acahalan@cs.uml.edu>
+ *    Albert D. Cahalan, <albert@users.sf.net>
  */
 #ifndef _Itop
 #define _Itop
diff --git a/uptime.1 b/uptime.1
index ecb4e70..3aae739 100644
--- a/uptime.1
+++ b/uptime.1
@@ -26,7 +26,7 @@ This is the same information contained in the header line displayed by
 was written by Larry Greenfield <greenfie@gauss.rutgers.edu> and
 Michael K. Johnson <johnsonm@sunsite.unc.edu>.
 
-Please send bug reports to <acahalan@cs.uml.edu>
+Please send bug reports to <albert@users.sf.net>
 .SH "SEE ALSO"
 .BR ps (1),
 .BR top (1),
diff --git a/w.1 b/w.1
index 647d55e..d8a32c0 100644
--- a/w.1
+++ b/w.1
@@ -81,4 +81,4 @@ was re-written almost entirely by Charles Blake, based on the version by Larry
 Greenfield <greenfie@gauss.rutgers.edu> and Michael K. Johnson
 <johnsonm@redhat.com>.
 
-Please send bug reports to <acahalan@cs.uml.edu>
+Please send bug reports to <albert@users.sf.net>