From 130e412b64a239be4982253f291d08e85765a50b Mon Sep 17 00:00:00 2001
From: Victor Zverovich <victor.zverovich@gmail.com>
Date: Mon, 24 Dec 2018 09:37:52 -0800
Subject: [PATCH] Update changelog and docs

---
 ChangeLog.rst | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 doc/api.rst   |  2 ++
 2 files changed, 51 insertions(+)

diff --git a/ChangeLog.rst b/ChangeLog.rst
index e158e458..998ae647 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,3 +1,52 @@
+5.2.2 - TBD
+
+* Parameterized and constrained formatting functions on the type of the format
+  string
+  (`#880 <https://github.com/fmtlib/fmt/issues/880>`_,
+   `#881 <https://github.com/fmtlib/fmt/pull/881>`_,
+   `#883 <https://github.com/fmtlib/fmt/pull/883>`_). An object of a type that
+   has an overloaded `to_string_view` returning `fmt::string_view` can be used
+   as a format string:
+
+  .. code:: c++
+
+     namespace my_ns {
+     inline string_view to_string_view(const my_string &s) {
+       return { s.data(), s.length() };
+     }
+     }
+
+     std::string message = fmt::format(my_string("The answer is {}"), 42);
+
+  Thanks `@DanielaE (Daniela Engert) <https://github.com/DanielaE>`_.
+
+* Made colored print functions work with wide strings
+  (`#867 <https://github.com/fmtlib/fmt/pull/867>`_):
+
+  .. code:: c++
+
+     #include <fmt/color.h>
+
+     int main() {
+       print(fg(fmt::color::red), L"{}\n", 42);
+     }
+
+  Thanks `@DanielaE (Daniela Engert) <https://github.com/DanielaE>`_.
+
+* Reintroduced support for gcc 4.4.
+
+* Fixed compilation on platforms with exotic ``double``
+  (`#878 <https://github.com/fmtlib/fmt/issues/878>`_).
+
+* Clarified that writing to ``memory_buffer`` appends
+  (`#877 <https://github.com/fmtlib/fmt/issues/877>`_).
+
+* Fixed various compiler warnings and errors
+  (`#882 <https://github.com/fmtlib/fmt/pull/882>`_,
+   `#886 <https://github.com/fmtlib/fmt/pull/886>`_).
+  Thanks `@Luthaf (Guillaume Fraux) <https://github.com/Luthaf>`_,
+  `@stevenhoving (Steven Hoving) <https://github.com/stevenhoving>`_.
+
 5.2.1 - 2018-09-21
 ------------------
 
diff --git a/doc/api.rst b/doc/api.rst
index aeea1a77..a8c91b6c 100644
--- a/doc/api.rst
+++ b/doc/api.rst
@@ -209,6 +209,8 @@ Utilities
 
 .. doxygenfunction:: fmt::to_wstring(const T&)
 
+.. doxygenfunction:: fmt::to_string_view(const T&)
+
 .. doxygenclass:: fmt::basic_memory_buffer
    :protected-members:
    :members: