*Merge.

--HG-- branch : trunk
2009-01-18 17:58:13 -06:00
parent 54ed397413 613217fca7
commit c85c89dc0b
68 changed files with 1508 additions and 1553 deletions
@@ -71,7 +71,7 @@ DatabaseType LoginDatabase;                                 ///< Accessor to the
 void usage(const char *prog)
 {
    sLog.outString("Usage: \n %s [<options>]\n"
-        "    --version                print version and exist\n\r"
+        "    --version                print version and exit\n\r"
        "    -c config_file           use config_file as configuration file\n\r"
        #ifdef WIN32
        "    Running as service functions:\n\r"