Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

[Paul J. Lucas]

Fixed help message.

Fixed help message.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208935

Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'bin/zorbacmd_args.cpp'
--- bin/zorbacmd_args.cpp	2014-02-28 00:31:04 +0000
+++ bin/zorbacmd_args.cpp	2014-03-01 15:35:13 +0000
@@ -808,7 +808,7 @@
   if ( !error )
     error = check_args();
   if ( error ) {
-    cout << "Error: " << error << "\nUse -h for help." << endl;
+    cout << "Error: " << error << "\nUse --help for help." << endl;
     exit( 1 );
   }
   return argv - argv_orig;

=== modified file 'test/iterplans/apitest_args.cpp'
--- test/iterplans/apitest_args.cpp	2014-02-21 14:58:32 +0000
+++ test/iterplans/apitest_args.cpp	2014-03-01 15:35:13 +0000
@@ -548,7 +548,7 @@
   if ( !error )
     error = check_args();
   if ( error ) {
-    cout << "Error: " << error << "\nUse -h for help." << endl;
+    cout << "Error: " << error << "\nUse --help for help." << endl;
     exit( 1 );
   }
   return argv - argv_orig;