Sort keywords definition in mpstat and sadc manual pages

Sort keywords associated with mpstat's option -I and sadc's option -S.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/man/mpstat.1 b/man/mpstat.1
index d0168bb087ef22422fe516d0149bf70f227bee92..85c619ff6f19937ff2730d24cc824bd204d9b3fe 100644 (file)
--- a/man/mpstat.1
+++ b/man/mpstat.1
@@ -1,4 +1,4 @@
-.TH MPSTAT 1 "NOVEMBER 2016" Linux "Linux User's Manual" -*- nroff -*-
+.TH MPSTAT 1 "DECEMBER 2016" Linux "Linux User's Manual" -*- nroff -*-
 .SH NAME
 mpstat \- Report processors related statistics.
 .SH SYNOPSIS
@@ -52,10 +52,23 @@ This option is equivalent to specifying
 Report interrupts statistics.
 
 Possible keywords are
-.BR SUM ,
-.BR CPU
+.BR CPU ,
+.BR SCPU ,
 and
-.BR SCPU .
+.BR SUM .
+
+With the
+.B CPU
+keyword, the number of each individual interrupt received per
+second by the CPU or CPUs is displayed. Interrupts are those listed
+in /proc/interrupts file.
+
+With the
+.B SCPU
+keyword, the number of each individual software interrupt received per
+second by the CPU or CPUs is displayed. This option works only
+with kernels 2.6.31 and later. Software interrupts are those listed
+in /proc/softirqs file.
 
 With the
 .B SUM
@@ -79,19 +92,6 @@ Show the total number of interrupts received per second by
 the CPU or CPUs.
 .RE
 
-With the
-.B CPU
-keyword, the number of each individual interrupt received per
-second by the CPU or CPUs is displayed. Interrupts are those listed
-in /proc/interrupts file.
-
-With the
-.B SCPU
-keyword, the number of each individual software interrupt received per
-second by the CPU or CPUs is displayed. This option works only
-with kernels 2.6.31 and later. Software interrupts are those listed
-in /proc/softirqs file.
-
 The
 .B ALL
 keyword is equivalent to specifying all the keywords above and

diff --git a/man/sadc.in b/man/sadc.in
index de6db0e0eaf6fda0d013910b8dffa62e4eda4c89..f29d489324f3225c0f9d9ae1e2e0397d1f05c9bb 100644 (file)
--- a/man/sadc.in
+++ b/man/sadc.in
@@ -1,10 +1,10 @@
-.TH SADC 8 "JANUARY 2015" Linux "Linux User's Manual" -*- nroff -*-
+.TH SADC 8 "DECEMBER 2016" Linux "Linux User's Manual" -*- nroff -*-
 .SH NAME
 sadc \- System activity data collector.
 .SH SYNOPSIS
 .B @SA_LIB_DIR@/sadc [ -C
 .I comment
-.B ] [ -D ] [ -F ] [ -L ] [ -V ] [ -S { INT | DISK | SNMP | IPV6 | POWER | XDISK | ALL | XALL [,...] } ] [
+.B ] [ -D ] [ -F ] [ -L ] [ -V ] [ -S { DISK | INT | IPV6 | POWER | SNMP | XDISK | ALL | XALL [,...] } ] [
 .I interval
 .B [
 .I count
@@ -124,25 +124,23 @@ If the system is under heavy load, an old
 .B sadc
 might still be running when cron starts a new one. Without locking,
 this situation can result in a corrupted system activity file.
-.IP "-S { INT | DISK | SNMP | IPV6 | POWER | XDISK | ALL | XALL [,...] }"
+.IP "-S { DISK | INT | IPV6 | POWER | SNMP | XDISK | ALL | XALL [,...] }"
 Specify which optional activities should be collected by
 .BR sadc .
 Some activities are optional to prevent data files from growing too large.
 The
-.B INT
+.B DISK
 keyword indicates that
 .B sadc
-should collect data for system interrupts.
+should collect data for block devices.
 The
-.B DISK
+.B INT
 keyword indicates that
 .B sadc
-should collect data for block devices.
+should collect data for system interrupts.
 The
-.B SNMP
-and
 .B IPV6
-keywords indicate respectively that SNMP and IPv6 statistics should be
+keyword indicates that IPv6 statistics should be
 collected by
 .BR sadc .
 The
@@ -151,6 +149,11 @@ keyword indicates that
 .B sadc
 should collect power management statistics.
 The
+.B SNMP
+keyword indicates that SNMP statistics should be
+collected by
+.BR sadc .
+The
 .B ALL
 keyword is equivalent to specifying all the keywords above and therefore
 all previous activities are collected.