From b69b63ac2bf4a967b35e853026abb68b3f8442ad Mon Sep 17 00:00:00 2001
From: Patrick Johnmeyer <pjohnmeyer@gmail.com>
Date: Mon, 29 Feb 2016 22:32:58 -0600
Subject: [PATCH] Update docs, versions for 1.6.0.

---
 .gitmodules  |  1 +
 README.md    | 14 +++++++++-----
 configure.ac |  4 ++--
 docs         |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index d3c2970..58e923a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "docs"]
 	path = docs
 	url = https://github.com/unittest-cpp/unittest-cpp.wiki.git
+	ignore = dirty
\ No newline at end of file
diff --git a/README.md b/README.md
index be3573f..cf88fea 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 UnitTest++
 ===========
 
-UnitTest++ is a lightweight unit testing framework for C++. It was designed to do test-driven development on a wide variety of platforms. Simplicity, portability, speed, and small footprint are all very important aspects of UnitTest++. UnitTest++ is ANSI portable C++ and makes minimal use of advanced library and languages features, which means it should be easily portable to just about any platform. Out of the box, the following platforms are supported:
+UnitTest++ is a lightweight unit testing framework for C++. It was designed to do test-driven development on a wide variety of platforms. Simplicity, portability, speed, and small footprint are all very important aspects of UnitTest++. UnitTest++ is mostly standard C++ and makes minimal use of advanced library and language features, which means it should be easily portable to just about any platform. Out of the box, the following platforms are supported:
 
 * Windows
 * Linux
@@ -16,7 +16,7 @@ The full documentation for building and using UnitTest++ can be found on the [Gi
 
 Pre-requisites
 ---------------
-While there are currently some bundled makefiles and projects, UnitTest++ is primarily built and supported using [CMake](http://cmake.org).
+While there are currently some bundled automake files, UnitTest++ is primarily built and supported using [CMake](http://cmake.org).
 
 Downloading
 ------------
@@ -30,17 +30,17 @@ Via svn:
 
     svn checkout https://github.com/unittest-cpp/unittest-cpp/trunk unittest-cpp
 
-### Latest release (v1.5.1) ###
+### Latest release (v1.6.0) ###
 
 Via git:
 
     git clone https://github.com/unittest-cpp/unittest-cpp
     cd unittest-cpp
-    git checkout v1.5.1
+    git checkout v1.6.0
 
 Via svn:
 
-    svn checkout https://github.com/unittest-cpp/unittest-cpp/tags/v1.5.1 unittest-cpp
+    svn checkout https://github.com/unittest-cpp/unittest-cpp/tags/v1.6.0 unittest-cpp
 
 License
 ---------
@@ -77,6 +77,10 @@ Contributors
 Historic release notes
 ----------------------
 
+### Version 1.6.0 (2016-02-29) ###
+- Add REQUIRE macro to end tests early when selected checks fail
+- [Full List](https://github.com/unittest-cpp/unittest-cpp/issues?q=milestone%3A1.6.0+)
+
 ### Version 1.5.1 (2016-01-30) ###
 - pkg-config support
 - Fix for Visual Studio 2010 compilation issue in 1.5.0
diff --git a/configure.ac b/configure.ac
index 46e3be6..001ced8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([UnitTest++], [1.5.1], [pjohnmeyer@gmail.com])
+AC_INIT([UnitTest++], [1.6.0], [pjohnmeyer@gmail.com])
 AC_CONFIG_SRCDIR([UnitTest++/TestDetails.cpp])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -13,7 +13,7 @@ AM_CONDITIONAL([WINDOWS],
 	  [test "${host#*mingw}" != "${host}" -o "${host#*msvc}" != "${host}"])
 LT_INIT()
 
-AC_SUBST([LIBUNITTEST_SO_VERSION], [1:5:1])
+AC_SUBST([LIBUNITTEST_SO_VERSION], [1:6:0])
 
 # Checks for programs.
 AC_PROG_CXX
diff --git a/docs b/docs
index 8d4ad23..14495a3 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 8d4ad2348f13d35ed7af7c11d6dad2f5ed67f6b4
+Subproject commit 14495a3a81568e9ce187231b629e4eb7bc7e0350