Integrate:

[ 21464]
Subject: perl -h tweak [PATCH]
From: Gisle Aas <gisle@ActiveState.com>
Date: 16 Oct 2003 02:49:39 -0700
Message-Id: <lrn0c11pho.fsf@caliper.activestate.com>

[ 21466]
Further tweak on change #21464.

[ 21473]
-u is deprecated.
Subject: Re: why PERL5LIB is ignored when -T is in effect
From: Slaven Rezic <slaven@rezic.de>
Date: Fri, 17 Oct 2003 10:02:31 +0000
Message-Id: <1066384951.4964@devpc01.iconmobile.de>
p4raw-link: @21473 on //depot/perl: 11fb18989d618390167cc3df6954c38cecff5bad
p4raw-link: @21466 on //depot/perl: fb3560eea7ab14f0a8edc924380f6da1cc8aa74c
p4raw-link: @21464 on //depot/perl: 90490ea37d61f90b0b2139a2d0285dc6e6aeee8b

p4raw-id: //depot/maint-5.8/perl@21482
p4raw-integrated: from //depot/perl@21481 'edit in' perl.c (@21471..)

diff --git a/perl.c b/perl.c
index 94be454..9e12d4e 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -2371,11 +2371,11 @@ S_usage(pTHX_ char *name)               /* XXX move this out into a module ? */
     static char *usage_msg[] = {
 "-0[octal]       specify record separator (\\0, if no argument)",
 "-a              autosplit mode with -n or -p (splits $_ into @F)",
-"-C              enable native wide character system interfaces",
+"-C[number/list] enables the listed Unicode features",
 "-c              check syntax only (runs BEGIN and CHECK blocks)",
 "-d[:debugger]   run program under debugger",
 "-D[number/list] set debugging flags (argument is a bit mask or alphabets)",
-"-e 'command'    one line of program (several -e's allowed, omit programfile)",
+"-e program      one line of program (several -e's allowed, omit programfile)",
 "-F/pattern/     split() pattern for -a switch (//'s are optional)",
 "-i[extension]   edit <> files in place (makes backup if extension supplied)",
 "-Idirectory     specify @INC/#include directory (several -I's allowed)",
@@ -2386,16 +2386,16 @@ S_usage(pTHX_ char *name)               /* XXX move this out into a module ? */
 "-P              run program through C preprocessor before compilation",
 "-s              enable rudimentary parsing for switches after programfile",
 "-S              look for programfile using PATH environment variable",
-"-T              enable tainting checks",
 "-t              enable tainting warnings",
+"-T              enable tainting checks",
 "-u              dump core after parsing program",
 "-U              allow unsafe operations",
 "-v              print version, subversion (includes VERY IMPORTANT perl info)",
 "-V[:variable]   print configuration summary (or a single Config.pm variable)",
 "-w              enable many useful warnings (RECOMMENDED)",
 "-W              enable all warnings",
-"-X              disable all warnings",
 "-x[directory]   strip off text before #!perl line and perhaps cd to directory",
+"-X              disable all warnings",
 "\n",
 NULL
 };
@@ -3358,7 +3358,7 @@ S_validate_suid(pTHX_ char *validarg, char *scriptname, int fdscript)
            PL_euid == PL_statbuf.st_uid)
            if (!PL_do_undump)
                Perl_croak(aTHX_ "YOU HAVEN'T DISABLED SET-ID SCRIPTS IN THE KERNEL YET!\n\
-FIX YOUR KERNEL, PUT A C WRAPPER AROUND THIS SCRIPT, OR USE -u AND UNDUMP!\n");
+FIX YOUR KERNEL, OR PUT A C WRAPPER AROUND THIS SCRIPT!\n");
 #endif /* IAMSUID */
 
        if (PL_euid) {  /* oops, we're not the setuid root perl */