From: Tomas Doran <bobtfish@bobtfish.net>
Date: Thu, 27 Aug 2009 00:24:28 +0000 (+0100)
Subject: Merge
X-Git-Tag: 0.21~8
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMooseX-Getopt.git;a=commitdiff_plain;h=7b87d2979198ecd465510522d30116fda29049fe

Merge
---

7b87d2979198ecd465510522d30116fda29049fe
diff --cc lib/MooseX/Getopt.pm
index 67725e9,8907942..8369321
--- a/lib/MooseX/Getopt.pm
+++ b/lib/MooseX/Getopt.pm
@@@ -429,16 -417,7 +429,16 @@@ reference with an array to use instead 
  If L<Getopt::Long/GetOptions> fails (due to invalid arguments),
  C<new_with_options> will throw an exception.
  
 +If L<Getopt::Long::Descriptive> is installed and any of the following
 +command line params are passed, the program will exit with usage 
 +information. You can add descriptions for each option by including a
 +B<documentation> option for each attribute to document.
 +
 +  --?
 +  --help
 +  --usage
 +
- If you have L<Getopt::Long::Descriptive> a the C<usage> param is also passed to
+ If you have L<Getopt::Long::Descriptive> the C<usage> param is also passed to
  C<new>.
  
  =item B<ARGV>