diff --git a/doc/api.rst b/doc/api.rst
index c6665daa..cf4fe88a 100644
--- a/doc/api.rst
+++ b/doc/api.rst
@@ -111,11 +111,13 @@ template and implement ``parse`` and ``format`` methods::
   template <>
   struct formatter<point> {
     template <typename ParseContext>
-    constexpr auto parse(ParseContext &ctx) { return ctx.begin(); }
+    constexpr auto parse(ParseContext &ctx) -> decltype(ctx.begin()) {
+      return ctx.begin();
+    }
 
     template <typename FormatContext>
-    auto format(const point &p, FormatContext &ctx) {
-      return format_to(ctx.begin(), "({:.1f}, {:.1f})", p.x, p.y);
+    auto format(const point &p, FormatContext &ctx) -> decltype(ctx.out()) {
+      return format_to(ctx.out(), "({:.1f}, {:.1f})", p.x, p.y);
     }
   };
   }
@@ -129,7 +131,7 @@ Then you can pass objects of type ``point`` to any formatting function::
 In the example above the ``formatter<point>::parse`` function ignores the
 contents of the format string referred to by ``ctx.begin()`` so the object will
 always be formatted in the same way. See ``formatter<tm>::parse`` in
-:file:`fmt/time.h` for an advanced example of how to parse the format string and
+:file:`fmt/chrono.h` for an advanced example of how to parse the format string and
 customize the formatted output.
 
 You can also reuse existing formatters, for example::