From 0d4894e4bf46d3549062294ac20f14881194eba6 Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Thu, 7 Nov 2013 10:35:40 +0000
Subject: [PATCH 1/3] Updated command line docs with -w and -d

---
 docs/command-line.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/command-line.md b/docs/command-line.md
index d0e6152f..8a13d3f9 100644
--- a/docs/command-line.md
+++ b/docs/command-line.md
@@ -10,6 +10,8 @@ Note that options are described according to the following pattern:
 <a href="#output">   `    -o, --out`</a><br />
 <a href="#name">     `    -n, --name`</a><br />
 <a href="#nothrow">  `    -e, --nothrow`</a><br />
+<a href="#warn">     `    -w, --warn`</a><br />
+<a href="#durations">`    -d, --durations`</a><br />
 <a href="#usage">    `    -h, -?, --help`</a><br />
 
 <a id="test"></a>
@@ -126,6 +128,20 @@ These can be a nuisance in certain debugging environments that may break when ex
 
 When running with this option any throw checking assertions are skipped so as not to contribute additional noise. Be careful if this affects the behaviour of subsequent tests.
 
+<a id="warn"></a>
+## Warnings
+<pre>-w, --warn &lt;warning name></pre>
+
+Enables reporting of warnings (only one, at time of this writing). If a warning is issued it fails the test.
+
+The ony available warning, presently, is ```NoAssertions```. This warning fails a test case, or (leaf) section if no assertions (```REQUIRE```/ ```CHECK``` etc) are encountered.
+
+<a id="durations"></a>
+## Reporting timings
+<pre>-d, --durations &lt;yes/no></pre>
+
+When set to ```yes``` Catch will report the duration of each test case, in milliseconds. Note that it does this regardless of whether a test case passes or fails. Note, also, the certain reporters (e.g. Junit) always report test case durations regardless of this option being set or not.
+
 <a id="usage"></a>
 ## Usage
 <pre>-h, -?, --help</pre>

From c2b0c6fb08e6e382b03783f018bb3ee99bfc91e0 Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Thu, 7 Nov 2013 10:35:59 +0000
Subject: [PATCH 2/3] Added missing #include for <vector>

---
 include/internal/catch_tostring.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/internal/catch_tostring.hpp b/include/internal/catch_tostring.hpp
index d5714e8d..cec4cfed 100644
--- a/include/internal/catch_tostring.hpp
+++ b/include/internal/catch_tostring.hpp
@@ -14,6 +14,7 @@
 #include <sstream>
 #include <iomanip>
 #include <limits>
+#include <vector>
 
 #ifdef __OBJC__
 #include "catch_objc_arc.hpp"

From 6916298c2252992ca88e69a44d752b1c4ca9af76 Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Thu, 7 Nov 2013 13:30:39 +0000
Subject: [PATCH 3/3] Attempt to match html anchors (which github strips out)
 with the ones github generates.

---
 docs/command-line.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/command-line.md b/docs/command-line.md
index 8a13d3f9..f5acd266 100644
--- a/docs/command-line.md
+++ b/docs/command-line.md
@@ -11,7 +11,7 @@ Note that options are described according to the following pattern:
 <a href="#name">     `    -n, --name`</a><br />
 <a href="#nothrow">  `    -e, --nothrow`</a><br />
 <a href="#warn">     `    -w, --warn`</a><br />
-<a href="#durations">`    -d, --durations`</a><br />
+<a href="#reporting-timings">`    -d, --durations`</a><br />
 <a href="#usage">    `    -h, -?, --help`</a><br />
 
 <a id="test"></a>
@@ -136,7 +136,7 @@ Enables reporting of warnings (only one, at time of this writing). If a warning
 
 The ony available warning, presently, is ```NoAssertions```. This warning fails a test case, or (leaf) section if no assertions (```REQUIRE```/ ```CHECK``` etc) are encountered.
 
-<a id="durations"></a>
+<a id="reporting-timings"></a>
 ## Reporting timings
 <pre>-d, --durations &lt;yes/no></pre>