Merging upstream version 1.3~pre1.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 5 insertions, 4 deletions

diff --git a/zupdate.cc b/zupdate.cc
index 2b6caaf..cf488da 100644
--- a/zupdate.cc
+++ b/zupdate.cc
@@ -3,7 +3,7 @@
 
     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 3 of the License, or
+    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,
@@ -66,7 +66,8 @@ void show_help()
                "compressed files are never overwritten nor deleted.\n"
                "\nUsage: zupdate [options] [files]\n"
                "\nExit status is 0 if all the compressed files were successfully\n"
-               "recompressed (if needed), compared and deleted. Non-zero otherwise.\n"
+               "recompressed (if needed), compared and deleted (if requested). Non-zero\n"
+               "otherwise.\n"
                "\nOptions:\n"
                "  -h, --help                 display this help and exit\n"
                "  -V, --version              output version information and exit\n"
@@ -368,12 +369,12 @@ int main( const int argc, const char * const argv[] )
       case 'q': verbosity = -1; lzip_args2.push_back( "-q" ); break;
       case 'r': recursive = true; break;
       case 'v': if( verbosity < 4 ) ++verbosity; break;
-      case 'V': show_version( "Zupdate" ); return 0;
+      case 'V': show_version(); return 0;
       case bz2_opt: parse_compressor( arg, fmt_bz2, 1 ); break;
       case gz_opt: parse_compressor( arg, fmt_gz, 1 ); break;
       case lz_opt: parse_compressor( arg, fmt_lz, 1 ); break;
       case xz_opt: parse_compressor( arg, fmt_xz, 1 ); break;
-      default : internal_error( "uncaught option" );
+      default : internal_error( "uncaught option." );
       }
     } // end process options