From d07cd3353fae594b64135ec739afabc2bc8205df Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Fri, 7 Jun 2013 23:06:54 +0100
Subject: [PATCH] Added new docs for supplying your own main.

---
 docs/own-main.md | 63 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 2 deletions(-)

diff --git a/docs/own-main.md b/docs/own-main.md
index 2508fc4e..08692940 100644
--- a/docs/own-main.md
+++ b/docs/own-main.md
@@ -1,6 +1,65 @@
-placeholder for using your own main
+# Supplying main() yourself
 
-(note that this has changed significantly with recent check-ins on Integration. I hope to have this page updated very soon with more details)
+The easiest way to use Catch is to let it supply ```main()``` for you and handle configuring itself from the command line.
+
+This is achieved by writing ```#define CATCH_CONFIG_MAIN``` before the ```#include "catch.hpp"``` in *exactly one* source file.
+
+Sometimes, though, you need to write your own version of main(). You can do this by writing ```#define CATCH_CONFIG_RUNNER``` instead. Now you are free to write ```main()``` as normal and call into Catch yourself manually.
+
+You now have a lot of flexibility - but here are three recipes to get your started:
+
+## Let Catch take full control of args and config
+
+If you just need to have code that executes before and/ or after Catch this is the simplest option.
+
+```c++
+#define CATCH_CONFIG_RUNNER
+#include "catch.hpp"
+
+int main( int argc, char* const argv[] )
+{
+  // global setup...
+
+  int result = Catch::Session().run( argc, argv );
+
+  // global clean-up...
+
+  return result;
+}
+```
+
+## Amending the config
+
+If you still want Catch to process the command line, but you want to programatically tweak the config, you can do so in one of two ways:
+
+```c++
+#define CATCH_CONFIG_RUNNER
+#include "catch.hpp"
+
+int main( int argc, char* const argv[] )
+{
+  Catch::Session session; // There must be exactly once instance
+
+  // writing to session.configData() here sets defaults
+
+  int returnCode = session.applyCommandLine( argc, argv );
+  if( returnCode != 0 ) // Indicates a command line error
+  	return returnCode;
+
+  // writing to session.configData() or session.Config() here 
+  // overrides command line args
+
+  return session.run();
+}
+```
+
+Take a look at the definitions of Config and ConfigData to see what you can do with them.
+
+To take full control of the config simply omit the call to ```applyCommandLine()```.
+
+## Adding your own command line options
+
+Catch embeds a powerful command line parser which you can also use to parse your own options out. This capability is still in active development but will be documented here when it is ready.
 
 ---