From b4226ebc3ddb02fd2aa54b7e01d9a4dfb27efe53 Mon Sep 17 00:00:00 2001 From: seb Date: Thu, 25 Apr 2013 13:04:17 +0200 Subject: [PATCH] Cosmetic fix in pidstat manual page. Starting 10.1.6 version. Cosmetic fix in pidstat manual page ("username" in synopsis section wasn't underlined). --- CHANGES | 5 +- configure | 18 +++---- configure.in | 2 +- man/pidstat.1 | 4 +- nls/sysstat.pot | 130 ++++++++++++++++++++++++------------------------ 5 files changed, 82 insertions(+), 77 deletions(-) diff --git a/CHANGES b/CHANGES index b559c57..53a1f97 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ Changes: +xxxx/xx/xx: Version 10.1.6 - Sebastien Godard (sysstat orange.fr) + * Yet another cosmetic fix in pidstat manual page. + 2013/03/31: Version 10.1.5 - Sebastien Godard (sysstat orange.fr) * mpstat now takes into account every interrupt per processor so that their number adds up to the number displayed for CPU "all". @@ -9,7 +12,7 @@ Changes: * [Benno Schulenberg]: Fixed a small inconsistency in pidstat usage message. * Cosmetic fixes in pidstat manual page. - * NLS updated (de, eo, fi, fr, ja, nb, nl, ru, uk, vi) + * NLS updated (de, eo, fi, fr, ja, nb, nl, ru, uk, vi). * CREDITS file updated. 2013/03/08: Version 10.1.4 - Sebastien Godard (sysstat orange.fr) diff --git a/configure b/configure index b964cde..94a3caf 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for sysstat 10.1.5. +# Generated by GNU Autoconf 2.69 for sysstat 10.1.6. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sysstat' PACKAGE_TARNAME='sysstat' -PACKAGE_VERSION='10.1.5' -PACKAGE_STRING='sysstat 10.1.5' +PACKAGE_VERSION='10.1.6' +PACKAGE_STRING='sysstat 10.1.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1301,7 +1301,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sysstat 10.1.5 to adapt to many kinds of systems. +\`configure' configures sysstat 10.1.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1362,7 +1362,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysstat 10.1.5:";; + short | recursive ) echo "Configuration of sysstat 10.1.6:";; esac cat <<\_ACEOF @@ -1478,7 +1478,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysstat configure 10.1.5 +sysstat configure 10.1.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1897,7 +1897,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sysstat $as_me 10.1.5, which was +It was created by sysstat $as_me 10.1.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5937,7 +5937,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sysstat $as_me 10.1.5, which was +This file was extended by sysstat $as_me 10.1.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5990,7 +5990,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sysstat config.status 10.1.5 +sysstat config.status 10.1.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index d182027..ddebf6c 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ # Modified by Sebastien Godard (sysstat orange.fr) # Initialization of $PACKAGE_VERSION and $PACKAGE_NAME variables -AC_INIT(sysstat, 10.1.5) +AC_INIT(sysstat, 10.1.6) # Ensure that a recent enough version of Autoconf is being used AC_PREREQ(2.53) diff --git a/man/pidstat.1 b/man/pidstat.1 index 4e43c9e..1f44505 100644 --- a/man/pidstat.1 +++ b/man/pidstat.1 @@ -2,7 +2,9 @@ .SH NAME pidstat \- Report statistics for Linux tasks. .SH SYNOPSIS -.B pidstat [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -s ] [ -t ] [ -U [ username ] ] [ -u ] [ -V ] +.B pidstat [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -s ] [ -t ] [ -U [ +.I username +.B ] ] [ -u ] [ -V ] .B [ -w ] [ -C .I comm .B ] [ -p { diff --git a/nls/sysstat.pot b/nls/sysstat.pot index 07381a7..981c375 100644 --- a/nls/sysstat.pot +++ b/nls/sysstat.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sysstat orange.fr\n" -"POT-Creation-Date: 2013-03-16 21:12+0100\n" +"POT-Creation-Date: 2013-03-23 17:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,29 +17,40 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: sadf_misc.c:596 +#: iostat.c:85 cifsiostat.c:70 mpstat.c:89 sar.c:94 pidstat.c:82 +#: nfsiostat.c:69 #, c-format -msgid "System activity data file: %s (%#x)\n" +msgid "Usage: %s [ options ] [ [ ] ]\n" msgstr "" -#: sadf_misc.c:605 +#: iostat.c:88 #, c-format -msgid "Host: " +msgid "" +"Options are:\n" +"[ -c ] [ -d ] [ -h ] [ -k | -m ] [ -N ] [ -t ] [ -V ] [ -x ] [ -y ] [ -z ]\n" +"[ -j { ID | LABEL | PATH | UUID | ... } ]\n" +"[ [ -T ] -g ] [ -p [ [,...] | ALL ] ]\n" +"[ [...] | ALL ] [ --debuginfo ]\n" msgstr "" -#: sadf_misc.c:611 +#: iostat.c:94 #, c-format -msgid "Size of a long int: %d\n" +msgid "" +"Options are:\n" +"[ -c ] [ -d ] [ -h ] [ -k | -m ] [ -N ] [ -t ] [ -V ] [ -x ] [ -y ] [ -z ]\n" +"[ -j { ID | LABEL | PATH | UUID | ... } ]\n" +"[ [ -T ] -g ] [ -p [ [,...] | ALL ] ]\n" +"[ [...] | ALL ]\n" msgstr "" -#: sadf_misc.c:613 +#: iostat.c:329 #, c-format -msgid "List of activities:\n" +msgid "Cannot find disk data\n" msgstr "" -#: sadf_misc.c:626 +#: iostat.c:1392 sa_common.c:1300 #, c-format -msgid "\t[Unknown activity format]" +msgid "Invalid type of persistent device name\n" msgstr "" #: sadc.c:84 @@ -81,12 +92,6 @@ msgstr "" msgid "sysstat version %s\n" msgstr "" -#: cifsiostat.c:70 mpstat.c:89 sar.c:94 pidstat.c:82 iostat.c:85 -#: nfsiostat.c:69 -#, c-format -msgid "Usage: %s [ options ] [ [ ] ]\n" -msgstr "" - #: cifsiostat.c:74 nfsiostat.c:73 #, c-format msgid "" @@ -101,20 +106,6 @@ msgid "" "[ -h ] [ -k | -m ] [ -t ] [ -V ]\n" msgstr "" -#: sadf.c:86 -#, c-format -msgid "Usage: %s [ options ] [ [ ] ] [ ]\n" -msgstr "" - -#: sadf.c:89 -#, c-format -msgid "" -"Options are:\n" -"[ -C ] [ -d | -j | -p | -x ] [ -H ] [ -h ] [ -T | -t | -U ] [ -V ]\n" -"[ -P { [,...] | ALL } ] [ -s [ ] ] [ -e [ ] ]\n" -"[ -- ]\n" -msgstr "" - #: mpstat.c:92 #, c-format msgid "" @@ -132,6 +123,45 @@ msgstr "" msgid "Not that many processors!\n" msgstr "" +#: sadf_misc.c:596 +#, c-format +msgid "System activity data file: %s (%#x)\n" +msgstr "" + +#: sadf_misc.c:605 +#, c-format +msgid "Host: " +msgstr "" + +#: sadf_misc.c:611 +#, c-format +msgid "Size of a long int: %d\n" +msgstr "" + +#: sadf_misc.c:613 +#, c-format +msgid "List of activities:\n" +msgstr "" + +#: sadf_misc.c:626 +#, c-format +msgid "\t[Unknown activity format]" +msgstr "" + +#: sadf.c:86 +#, c-format +msgid "Usage: %s [ options ] [ [ ] ] [ ]\n" +msgstr "" + +#: sadf.c:89 +#, c-format +msgid "" +"Options are:\n" +"[ -C ] [ -d | -j | -p | -x ] [ -H ] [ -h ] [ -T | -t | -U ] [ -V ]\n" +"[ -P { [,...] | ALL } ] [ -s [ ] ] [ -e [ ] ]\n" +"[ -- ]\n" +msgstr "" + #: sar.c:109 #, c-format msgid "" @@ -309,14 +339,6 @@ msgstr "" msgid "Cannot handle so many processors!\n" msgstr "" -#: pr_stats.c:2348 pr_stats.c:2361 -msgid "Summary" -msgstr "" - -#: pr_stats.c:2399 -msgid "Other devices not listed here" -msgstr "" - #: sa_common.c:917 #, c-format msgid "Error while reading system activity file: %s\n" @@ -348,11 +370,6 @@ msgstr "" msgid "Requested activities not available in file %s\n" msgstr "" -#: sa_common.c:1300 iostat.c:1392 -#, c-format -msgid "Invalid type of persistent device name\n" -msgstr "" - #: pidstat.c:85 #, c-format msgid "" @@ -363,27 +380,10 @@ msgid "" "[ -T { TASK | CHILD | ALL } ]\n" msgstr "" -#: iostat.c:88 -#, c-format -msgid "" -"Options are:\n" -"[ -c ] [ -d ] [ -h ] [ -k | -m ] [ -N ] [ -t ] [ -V ] [ -x ] [ -y ] [ -z ]\n" -"[ -j { ID | LABEL | PATH | UUID | ... } ]\n" -"[ [ -T ] -g ] [ -p [ [,...] | ALL ] ]\n" -"[ [...] | ALL ] [ --debuginfo ]\n" -msgstr "" - -#: iostat.c:94 -#, c-format -msgid "" -"Options are:\n" -"[ -c ] [ -d ] [ -h ] [ -k | -m ] [ -N ] [ -t ] [ -V ] [ -x ] [ -y ] [ -z ]\n" -"[ -j { ID | LABEL | PATH | UUID | ... } ]\n" -"[ [ -T ] -g ] [ -p [ [,...] | ALL ] ]\n" -"[ [...] | ALL ]\n" +#: pr_stats.c:2348 pr_stats.c:2361 +msgid "Summary" msgstr "" -#: iostat.c:329 -#, c-format -msgid "Cannot find disk data\n" +#: pr_stats.c:2399 +msgid "Other devices not listed here" msgstr "" -- 2.40.0