Merge branch 'ObiWahn-master'

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

diff --cc man/sar.in
index 46bc7ecda0b49e13a5ce9e550e2a0a6dcd8c8176,150be018089958449a3960703449646ed7602706..b266c214170ae4302f19a1dc094f902c1d96f9ad
--- 1/man/sar.in
--- 2/man/sar.in
+++ b/man/sar.in
@@@ -1,5 -1,5 +1,5 @@@
  .\" sar manual page - (C) 1999-2022 Sebastien Godard (sysstat <at> orange.fr)
--.TH SAR 1 "AUGUST 2022" Linux "Linux User's Manual" -*- nroff -*-
++.TH SAR 1 "SEPTEMBER 2022" Linux "Linux User's Manual" -*- nroff -*-
  .SH NAME
  sar \- Collect, report, or save system activity information.
  
@@@ -1650,10 -1650,10 +1650,10 @@@ The timestamp will also be compliant wi
  .B sar -u 2 5
  Report CPU utilization for each 2 seconds. 5 lines are displayed.
  .TP
- .B sar -I 14 -o int14.file 2 10
 -.B sar -I ALL -o int_all.file 2 10
++.B sar -I --int=14 -o int14.file 2 10
  Report statistics on IRQ 14 for each 2 seconds. 10 lines are displayed.
  Data are stored in a file called
 -.IR "int_all.file" "."
 +.IR "int14.file" "."
  .TP
  .B sar -r -n DEV -f @SA_DIR@/sa16
  .RI "Display memory and network statistics saved in daily data file " "sa16" "."

diff --cc sar.c
index 1335e13d2844a09b1e15bdc21e0e6f3fb6165ade,5b9beaccd04944edabc39355920b0fc5a23fc504..ee9b97e9ce4f17ca31024b8a9dfe2ad74f30eb7b
--- 1/sar.c
--- 2/sar.c
+++ b/sar.c
@@@ -123,7 -123,7 +123,7 @@@ void usage(char *progname
                          "[ -A ] [ -B ] [ -b ] [ -C ] [ -D ] [ -d ] [ -F [ MOUNT ] ] [ -H ] [ -h ]\n"
                          "[ -p ] [ -r [ ALL ] ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -V ]\n"
                          "[ -v ] [ -W ] [ -w ] [ -y ] [ -z ]\n"
-                         "[ -I { <int_list> | SUM | ALL } ] [ -P { <cpu_list> | ALL } ]\n"
 -                        "[ -I { SUM | ALL } ] [ -P { <cpu_list> | ALL } ]\n"
++                        "[ -I [ SUM | ALL ] ] [ -P { <cpu_list> | ALL } ]\n"
                          "[ -m { <keyword> [,...] | ALL } ] [ -n { <keyword> [,...] | ALL } ]\n"
                          "[ -q [ <keyword> [,...] | ALL ] ]\n"
                          "[ --dev=<dev_list> ] [ --fs=<fs_list> ] [ --iface=<iface_list> ] "
@@@ -153,7 -153,7 +153,7 @@@ void display_help(char *progname
        printf(_("\t-F [ MOUNT ]\n"));
        printf(_("\t\tFilesystems statistics [A_FS]\n"));
        printf(_("\t-H\tHugepages utilization statistics [A_HUGE]\n"));
-       printf(_("\t-I { <int_list> | SUM | ALL }\n"
 -      printf(_("\t-I { SUM | ALL }\n"
++      printf(_("\t-I [ SUM | ALL ]\n"
                 "\t\tInterrupts statistics [A_IRQ]\n"));
        printf(_("\t-m { <keyword> [,...] | ALL }\n"
                 "\t\tPower management statistics [A_PWR_...]\n"