From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Thu, 20 Aug 2020 11:48:48 +0000 (+0200)
Subject: Merge branch 'NanXiao-patch-1'
X-Git-Tag: v12.5.1~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b15e45f29c947ef4b4079d3eb1c88d8b1bc33f4f;p=sysstat

Merge branch 'NanXiao-patch-1'

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

b15e45f29c947ef4b4079d3eb1c88d8b1bc33f4f
diff --cc mpstat.c
index 14474a3,d2f612a..9071d51
--- a/mpstat.c
+++ b/mpstat.c
@@@ -135,7 -135,7 +135,7 @@@ void usage(char *progname
  		progname);
  
  	fprintf(stderr, _("Options are:\n"
- 			  "[ -A ] [ -n ] [ -u ] [ -V ]\n"
 -			  "[ -A ] [ -n ] [-T] [ -u ] [ -V ]\n"
++			  "[ -A ] [ -n ] [ -T ] [ -u ] [ -V ]\n"
  			  "[ -I { SUM | CPU | SCPU | ALL } ] [ -N { <node_list> | ALL } ]\n"
  			  "[ --dec={ 0 | 1 | 2 } ] [ -o JSON ] [ -P { <cpu_list> | ALL } ]\n"));
  	exit(1);