[PATCH 06/13] More slight tweaks to version and help text strings

[Sebastian Spaeth]

Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
---
 offlineimap/__init__.py |   19 +++----------------
 offlineimap/init.py     |   19 +++++++++++--------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/offlineimap/__init__.py b/offlineimap/__init__.py
index 2b98e0f..fd008b0 100644
--- a/offlineimap/__init__.py
+++ b/offlineimap/__init__.py
@@ -7,31 +7,18 @@ __version__     = "6.3.0"
 __copyright__   = "Copyright (C) 2002 - 2010 John Goerzen, Sebastian Spaeth"
 __author__      = "John Goerzen, Sebastian Spaeth"
 __author_email__= "Sebastian at SSpaeth.de"
-__description__ = "Disconnected Universal IMAP Mail Synchronization/Reader Support"
+__description__ = "[IMAP|Maildir]<->[IMAP|Maildir] Synchronization"
 __bigcopyright__ = """%(__productname__)s %(__version__)s
 %(__copyright__)s <%(__author_email__)s>""" % locals()
 
 banner = __bigcopyright__ + """
+
 This software comes with ABSOLUTELY NO WARRANTY; see the file
 COPYING for details.  This is free software, and you are welcome
 to distribute it under the conditions laid out in COPYING."""
 
 __homepage__ = "http://github.com/spaetz/offlineimap"
-__license__  = """Copyright (C) 2002 - 2009 John Goerzen <jgoerzen at complete.org>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA"""
+__license__  = "Licensed under the GNU GPL v2+ (v2 or any later version)."
 
 
 
diff --git a/offlineimap/init.py b/offlineimap/init.py
index 7bb24b8..562bc38 100644
--- a/offlineimap/init.py
+++ b/offlineimap/init.py
@@ -56,7 +56,10 @@ class OfflineImap:
     def parse_commandline(self):
         """Parse the commandline and invoke everything"""
 
-        parser = OptionParser(version=offlineimap.__bigcopyright__)
+        parser = OptionParser(version=offlineimap.banner,
+                              description="%s.\n\n%s" % 
+                              (offlineimap.__copyright__,
+                               offlineimap.__license__))
         parser.add_option("-1",
                   action="store_true", dest="singlethreading",
                   default=False,
@@ -69,16 +72,16 @@ class OfflineImap:
                   help="Sets OfflineIMAP into profile mode. The program "
               "will create DIR (it must not already exist). "
               "As it runs, Python profiling information about each "
-              "thread  is  logged  into  profiledir.  Please note: "
+              "thread is logged into profiledir. Please note: "
               "This option is present for debugging and optimization "
               "only, and should NOT be used unless you have a "
-              "specific reason to do so. It  will  significantly "
-              "slow  program  performance, may reduce reliability, "
+              "specific reason to do so. It will significantly "
+              "slow program performance, may reduce reliability, "
               "and can generate huge amounts of  data. This option "
-              "implies the -1 option.")
+              "implies the singlethreading option (-1).")
 
         parser.add_option("-a", dest="accounts", metavar="ACCOUNTS",
-                  help="Overrides  the accounts section in the config file. "
+                  help="Overrides the accounts section in the config file. "
               "Lets you specify a particular account or set of "
               "accounts to sync without having to edit the config "
               "file. You might use this to exclude certain accounts, "
@@ -123,7 +126,7 @@ class OfflineImap:
         """Override configuration file option.  If"section" is
               omitted, it defaults to "general".  Any underscores
               "_" in the section name are replaced with spaces:
-              for instance,  to override  option "autorefresh" in
+              for instance, to override option "autorefresh" in
               the "[Account Personal]" section in the config file
               one would use "-k Account_Personal:autorefresh=30".""")
 
@@ -136,7 +139,7 @@ class OfflineImap:
         parser.add_option("-q",
                   action="store_true", dest="quick",
                   default=False,
-                  help="Run  only quick synchronizations. Ignore any "
+                  help="Run only quick synchronizations. Ignore any "
                        "flag updates on IMAP servers.")
 
         parser.add_option("-u", dest="interface",
-- 
1.7.1