From e035e2835dd24c5bc679aa05b63fdf870c91ef15 Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Thu, 6 Jun 2013 18:56:43 +0100
Subject: [PATCH] tweaks

---
 include/catch_runner.hpp               | 26 ++++++++++++--------------
 include/internal/catch_commandline.hpp | 10 +++++-----
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/include/catch_runner.hpp b/include/catch_runner.hpp
index e856774e..37a8ed2e 100644
--- a/include/catch_runner.hpp
+++ b/include/catch_runner.hpp
@@ -108,20 +108,6 @@ namespace Catch {
         std::set<TestCase> m_testsAlreadyRun;
     };
 
-    inline void showHelp( std::string const& processName ) {
-        Clara::CommandLine<ConfigData> cli = makeCommandLineParser();
-
-        std::cout << "\nCatch v"    << libraryVersion.majorVersion << "."
-                                    << libraryVersion.minorVersion << " build "
-                                    << libraryVersion.buildNumber;
-        if( libraryVersion.branchName != "master" )
-            std::cout << " (" << libraryVersion.branchName << " branch)";
-        std::cout << "\n";
-
-        cli.usage( std::cout, processName );
-        std::cout << "\nFor more detail usage please see: https://github.com/philsquared/Catch/wiki/Command-line\n" << std::endl;
-    }
-
     class Session {
         static bool alreadyInstantiated;
         
@@ -141,7 +127,19 @@ namespace Catch {
         ~Session() {
             Catch::cleanUp();
         }
+        
+        void showHelp( std::string const& processName ) {
+            std::cout << "\nCatch v"    << libraryVersion.majorVersion << "."
+                                        << libraryVersion.minorVersion << " build "
+                                        << libraryVersion.buildNumber;
+            if( libraryVersion.branchName != "master" )
+                std::cout << " (" << libraryVersion.branchName << " branch)";
+            std::cout << "\n";
 
+            cli.usage( std::cout, processName );
+            std::cout << "For more detail usage please see the project docs\n" << std::endl;
+        }
+        
         int applyCommandLine( int argc, char* const argv[], OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) {
             try {
                 unusedTokens = cli.parseInto( argc, argv, configData );
diff --git a/include/internal/catch_commandline.hpp b/include/internal/catch_commandline.hpp
index dbf45c07..4b0e655b 100644
--- a/include/internal/catch_commandline.hpp
+++ b/include/internal/catch_commandline.hpp
@@ -110,11 +110,11 @@ namespace Catch {
             .longOpt( "warn" )
             .argName( "warning name" );
 
-        cli.bind( &setVerbosity )
-            .describe( "level of verbosity (0=no output)" )
-            .shortOpt( "v")
-            .longOpt( "verbosity" )
-            .argName( "level" );
+//        cli.bind( &setVerbosity )
+//            .describe( "level of verbosity (0=no output)" )
+//            .shortOpt( "v")
+//            .longOpt( "verbosity" )
+//            .argName( "level" );
 
         cli.bind( &addTestOrTags )
             .describe( "which test or tests to use" )