From 3516da36b0e8de22c08aaa2caf69bb52ae9209a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Sat, 8 Apr 2017 00:17:23 +0200
Subject: [PATCH] Doxygen documentation fixes

---
 include/boost/container/allocator_traits.hpp | 2 +-
 include/boost/container/flat_map.hpp         | 2 +-
 include/boost/container/flat_set.hpp         | 4 ++--
 include/boost/container/string.hpp           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/boost/container/allocator_traits.hpp b/include/boost/container/allocator_traits.hpp
index d6621f6..b08f601 100644
--- a/include/boost/container/allocator_traits.hpp
+++ b/include/boost/container/allocator_traits.hpp
@@ -347,7 +347,7 @@ struct allocator_traits
 
    #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
       //! <b>Effects</b>: calls <code>a.construct(p, std::forward<Args>(args)...)</code> if that call is well-formed;
-      //! otherwise, invokes <code>::new (static_cast<void*>(p)) T(std::forward<Args>(args)...)</code>
+      //! otherwise, invokes <code>`placement new` (static_cast<void*>(p)) T(std::forward<Args>(args)...)</code>
       template <class T, class ...Args>
       BOOST_CONTAINER_FORCEINLINE static void construct(Allocator & a, T* p, BOOST_FWD_REF(Args)... args)
       {
diff --git a/include/boost/container/flat_map.hpp b/include/boost/container/flat_map.hpp
index c5d6e03..50e25d8 100644
--- a/include/boost/container/flat_map.hpp
+++ b/include/boost/container/flat_map.hpp
@@ -2108,7 +2108,7 @@ class flat_multimap
    void merge(flat_map<Key, T, C2, Allocator>& source)
    {  m_flat_tree.merge_equal(source.tree());   }
 
-   //! @copydoc ::boost::container::flat_multimap::merge(flat_multimap<Key, T, C2, Allocator>&)
+   //! @copydoc ::boost::container::flat_multimap::merge(flat_map<Key, T, C2, Allocator>&)
    template<class C2>
    void merge(BOOST_RV_REF_BEG flat_map<Key, T, C2, Allocator> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<flat_map<Key, T, C2, Allocator>&>(source)); }
diff --git a/include/boost/container/flat_set.hpp b/include/boost/container/flat_set.hpp
index 5dc6be5..e58ea4f 100644
--- a/include/boost/container/flat_set.hpp
+++ b/include/boost/container/flat_set.hpp
@@ -624,7 +624,7 @@ class flat_set
    BOOST_CONTAINER_FORCEINLINE void merge(flat_set<Key, C2, Allocator>& source)
    {  this->base_t::merge_unique(source.tree());   }
 
-   //! @copydoc ::boost::container::flat_map::merge(flat_set<Key, C2, Allocator>&)
+   //! @copydoc ::boost::container::flat_set::merge(flat_set<Key, C2, Allocator>&)
    template<class C2>
    BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG flat_set<Key, C2, Allocator> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<flat_set<Key, C2, Allocator>&>(source));   }
@@ -634,7 +634,7 @@ class flat_set
    BOOST_CONTAINER_FORCEINLINE void merge(flat_multiset<Key, C2, Allocator>& source)
    {  this->base_t::merge_unique(source.tree());   }
 
-   //! @copydoc ::boost::container::flat_map::merge(flat_multiset<Key, C2, Allocator>&)
+   //! @copydoc ::boost::container::flat_set::merge(flat_multiset<Key, C2, Allocator>&)
    template<class C2>
    BOOST_CONTAINER_FORCEINLINE void merge(BOOST_RV_REF_BEG flat_multiset<Key, C2, Allocator> BOOST_RV_REF_END source)
    {  return this->merge(static_cast<flat_multiset<Key, C2, Allocator>&>(source));   }
diff --git a/include/boost/container/string.hpp b/include/boost/container/string.hpp
index b49811f..915fb58 100644
--- a/include/boost/container/string.hpp
+++ b/include/boost/container/string.hpp
@@ -2128,7 +2128,7 @@ class basic_string
    //!
    //! <b>Effects</b>: Calls `replace(i1 - begin(), i2 - i1, sv).`.
    //!
-   //! <bReturns</b>: *this.
+   //! <b>Returns</b>: *this.
    template<template <class, class> class BasicStringView>
    basic_string& replace(const_iterator i1, const_iterator i2, BasicStringView<CharT, Traits> sv)
    {
@@ -2141,7 +2141,7 @@ class basic_string
    //!
    //! <b>Effects</b>: Calls replace(i1 - begin(), i2 - i1, il.begin(), il.size()).
    //!
-   //! <bReturns</b>: *this.
+   //! <b>Returns</b>: *this.
    basic_string& replace(const_iterator i1, const_iterator i2, std::initializer_list<CharT> il)
    {
       return this->replace( static_cast<size_type>(i1 - this->cbegin())