From: David Golden <dagolden@cpan.org>
Date: Wed, 14 Apr 2010 01:36:01 +0000 (-0400)
Subject: revert "revert perl -h changes"
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=664b43951970bc09e0a4aff7d8e6ce0f08fe8a02;p=p5sagit%2Fp5-mst-13.2.git

revert "revert perl -h changes"

Reapplies commit 482d21b3db741a7f6b59279ab7ad289307e2186b
that was reverted in commit bb87c82accf79d3e15da7fc9b646232a4c2bd47c
---

diff --git a/perl.c b/perl.c
index dfb549d..6824835 100644
--- a/perl.c
+++ b/perl.c
@@ -2835,11 +2835,11 @@ S_usage(pTHX_ const char *name)		/* XXX move this out into a module ? */
 "-T                enable tainting checks",
 "-u                dump core after parsing program",
 "-U                allow unsafe operations",
-"-v                print version, subversion (includes VERY IMPORTANT perl info)",
+"-v                print version, patchlevel and license",
 "-V[:variable]     print configuration summary (or a single Config.pm variable)",
 "-w                enable many useful warnings (RECOMMENDED)",
 "-W                enable all warnings",
-"-x[directory]     strip off text before #!perl line and perhaps cd to directory",
+"-x[directory]     ignore text before #!perl line (optionally cd to directory)",
 "-X                disable all warnings",
 "\n",
 NULL
@@ -2853,6 +2853,10 @@ NULL
 		  name);
     while (*p)
 	PerlIO_printf(PerlIO_stdout(), "\n  %s", *p++);
+
+    PerlIO_printf(PerlIO_stdout(),
+		  "Run 'perldoc perl' for more help with Perl.\n\n"
+		  );
 }
 
 /* convert a string of -D options (or digits) into an int.