misc. stuff, and 3.1.5 -> 3.1.6 version number

Makefile

@@ -18,9 +18,9 @@
 
 VERSION      := 3
 SUBVERSION   := 1
-MINORVERSION := 5
-TARVERSION   := 3.1.5
-LIBVERSION   := 3.1.5
+MINORVERSION := 6
+TARVERSION   := 3.1.6
+LIBVERSION   := 3.1.6
 
 ############ vars
 

proc/procps.h

@@ -22,9 +22,9 @@
 //
 // PowerPC: Big ugly problem! Macs are popular. :-/
 //
-// Unknown: HP-PA-RISC, zSeries, and x86-64
+// Unknown: PA-RISC, zSeries, and x86-64
 //
-#if defined(__sparc__)      // || defined(__mips__) || defined(__powerpc__)
+#if defined(k64test) || defined(__sparc__)  // || defined(__mips__) || defined(__powerpc__)
 #define KLONG long long    // not typedef; want "unsigned KLONG" to work
 #define KLF "L"
 #define STRTOUKL strtoull

procps.lsm

@@ -1,6 +1,6 @@
 Begin4
 Title: procps
-Version: 3.1.5
+Version: 3.1.6
 Entered-date: 2002-12-14
 Description: Linux system utilities
 Keywords: procps /proc libproc sysctl pmap
@@ -8,8 +8,8 @@ Keywords: procps /proc libproc sysctl pmap
 Author: Albert Cahalan, Michael K. Johnson, Jim Warner, etc.
 Maintained-by: various <procps-feedback@lists.sf.net>
 Primary-site: http://procps.sf.net/
-	236kB procps-3.1.5.tar.gz
+	236kB procps-3.1.6.tar.gz
 Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html
-	236kB procps-3.1.5.tar.gz
+	236kB procps-3.1.6.tar.gz
 Copying-policy: mixed
 End

procps.spec

@@ -3,7 +3,7 @@ Summary: System and process monitoring utilities
 Name: procps
 %define major_version 3
 %define minor_version 1
-%define revision 5
+%define revision 6
 %define version %{major_version}.%{minor_version}.%{revision}
 Version: %{version}
 Release: 1

ps/ps.1

@@ -96,9 +96,8 @@ s            display signal format
 u            display user-oriented format
 v            display virtual memory format
 --format     user-defined format
---context    (SELinux only) Display security context format; implies --SID
---secsid     (SELinux only) Display Security ID (SID)
---SID	     (SELinux only) Display Security ID (SID)
+--context    (SELinux only) Display security context format; implies --secsid
+--secsid     (SELinux only) Display Security ID
 
 OUTPUT MODIFIERS
 -H           show process hierarchy (forest)