[orca] Use the argparse help printer; update the epilog

[Joanmarie Diggs <joanied src gnome org>]

commit 2ee173c42689e10301c67580d427a4c1238c4be1
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sat May 12 23:42:10 2012 -0400

    Use the argparse help printer; update the epilog

 docs/man/orca.1          |    4 ++--
 help/C/introduction.page |    2 +-
 src/orca/orca.py         |   23 +++++------------------
 3 files changed, 8 insertions(+), 21 deletions(-)
---
diff --git a/docs/man/orca.1 b/docs/man/orca.1
index 279fa66..27b8191 100644
--- a/docs/man/orca.1
+++ b/docs/man/orca.1
@@ -14,7 +14,7 @@
 .\" along with this; if not write to the Free Software Foundation, Inc.
 .\" 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
 '\"
-.TH orca 1 "10 Nov 2008" "GNOME"
+.TH orca 1 "12 May 2012" "GNOME"
 .SH NAME
 orca \- is a scriptable screen reader
 .SH SYNOPSIS
@@ -95,7 +95,7 @@ outputs
 .B orca
 version number and exits.
 .TP
-.B \-?, \-h, \--help
+.B \-h, \--help
 displays
 .B orca
 help and exits.
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 27aad28..339b48c 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -84,7 +84,7 @@
       </p>
       <list>
         <item>
-          <p><cmd>-?</cmd>, <cmd>--help</cmd>: Show the help message</p>
+          <p><cmd>-h</cmd>, <cmd>--help</cmd>: Show the help message</p>
         </item>
         <item>
           <p>
diff --git a/src/orca/orca.py b/src/orca/orca.py
index f6ad147..e3e6bb5 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -123,9 +123,6 @@ class Options(argparse.Namespace):
         if self.profiles == None:
             self.profiles = []
 
-        if self.showHelp:
-            self._printMessageAndExit(parser.print_help)
-
         if self.listApps and self.desktopRunning:
             apps = [x for x in pyatspi.Registry.getDesktop(0) if x != None]
             names = [app.name for app in apps]
@@ -236,22 +233,12 @@ def presentInvalidOptions(invalidOptions):
     return False
 
 parser = argparse.ArgumentParser(
+    # Translators: this text is the description displayed when Orca is
+    # launched from the command line and the help text is displayed.
     description = _("orca - scriptable screen reader"),
-    # Translators: this is text being sent to a terminal and we want to keep
-    # the text lines within terminal boundaries.
-    #
-    epilog = _("If Orca has not been previously set up by the user, Orca\n"
-               "will automatically launch the preferences set up unless\n"
-               "the -n or --no-setup option is used.\n\n"
-               "Report bugs to orca-list gnome org "),
-    add_help = False, formatter_class = argparse.RawTextHelpFormatter)
-
-parser.add_argument(
-    "-?", "--help", action = "store_true", dest = "showHelp",
-    # Translators: this is the description of the command line option
-    # '-?, --help' that is used to display usage information.
-    #
-    help = _("Show this help message"))
+    # Translators: this text is the description displayed when Orca is
+    # launched from the command line and the help text is displayed.
+    epilog = _("Report bugs to orca-list gnome org "))
 
 parser.add_argument(
     "-v", "--version", action = "version", version = orca_platform.version,