From d1ae63032d95e54f4f1e6fddb79f76a6cc83a72b Mon Sep 17 00:00:00 2001
From: Victor Zverovich <victor.zverovich@gmail.com>
Date: Sun, 25 Oct 2015 08:58:05 -0700
Subject: [PATCH] Update ChangeLog.rst

---
 ChangeLog.rst | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/ChangeLog.rst b/ChangeLog.rst
index 54f854c9..8fdea642 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,11 +1,11 @@
 2.0.0 - TBD
 -----------
 
-* [Breaking] Made ``BasicStringRef`` comparison operators compare string
+* [Breaking] ``BasicStringRef`` comparison operators now compare string
   content, not pointers
   (`#183 <https://github.com/cppformat/cppformat/issues/183>`_).
 
-* Made pthreads dependency introduced by Google Test optional
+* Dependency on pthreads introduced by Google Test is now optional
   (`#185 <https://github.com/cppformat/cppformat/issues/185>`_).
 
 * Further improved performance of ``fmt::Writer`` on integer formatting
@@ -27,9 +27,8 @@
   Thanks to `@rpopescu <https://github.com/rpopescu>`_ and
   `@gabime (Gabi Melman) <https://github.com/gabime>`_.
 
-* [Breaking] Implemented formatting of objects of user-defined types that
-  provide an overloaded ``std::ostream`` insertion operator (``operator<<``)
-  with ``fmt::(s)printf``
+* [Breaking] ``fmt::(s)printf`` now supports formatting of objects of user-defined types
+  that provide an overloaded ``std::ostream`` insertion operator (``operator<<``)
   (`#201 <https://github.com/cppformat/cppformat/issues/201>`_):
 
   .. code:: c++
@@ -45,7 +44,7 @@
   Thanks to `@jackyf (Eugene V. Lyubimkin) <https://github.com/jackyf>`_ and Dave Johansen.
 
 * Added an option to disable use of IOStreams when ``FMT_USE_IOSTREAMS``
-  is set to 0 before including ``format.h``
+  is defined as 0 before including ``format.h``
   (`#205 <https://github.com/cppformat/cppformat/issues/205>`_,
   `#208 <https://github.com/cppformat/cppformat/pull/208>`_).
   Thanks to `@JodiTheTigger <https://github.com/JodiTheTigger>`_.
@@ -54,7 +53,7 @@
   <http://cppformat.github.io/dev/usage.html#building-the-documentation>`_
   section to the documentation.
 
-* Made documentation build script compatible with Python 3
+* Documentation build script is now compatible with Python 3
   (`#209 <https://github.com/cppformat/cppformat/issues/209>`_).
 
 * Fixed documentation layout issues on medium screen sizes
@@ -64,6 +63,10 @@
   ``crtdbg.h`` when ``_CRTDBG_MAP_ALLOC`` is set
   (`#211 <https://github.com/cppformat/cppformat/issues/211>`_).
 
+* Fixed an overload conflict in MSVC when ``/Zc:wchar_t-`` option is specified
+  (`#214 <https://github.com/cppformat/cppformat/pull/214>`_).
+  Thanks to `@slavanap (Vyacheslav Napadovsky) <https://github.com/slavanap>`_.
+
 1.1.0 - 2015-03-06
 ------------------