diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt
index f178276edab..bbdfeb0b3f9 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt
@@ -5665,18 +5665,17 @@ the latter is used to trace these invocations. Note that the
 constructors of each of these class templates applies perfect
 forwarding. The counting traits also exports the count of traits-class
 objects of specific types constructed during the execution of the
-program. The tracing traits supports filtering of traced
-functors. The calls `traits.enable_trace(id)` and
-`traits.disable_trace(id)` enables and disables the tracing of a
-functor identified by `id`, respectively. A functor is identified by
-an enumeration. For example, the functor \link
-ArrangementTraits_2::Make_x_monotone_2 `Make_x_monotone_2`\endlink is
-identified by the enumeration
+program. The tracing traits supports filtering of traced functors. The
+calls `traits.enable_trace(id)` and `traits.disable_trace(id)` enables
+and disables the tracing of a functor identified by `id`,
+respectively. A functor is identified by an enumeration. For example,
+the functor \link ArrangementTraits_2::Make_x_monotone_2
+`Make_x_monotone_2`\endlink is identified by the enumeration
 `Arr_tracing_traits_2::MAKE_X_MONOTONE_OP`. The calls
 `traits.enable_all_traces()` and `traits.disable_all_traces()` enables
 and disables the traces of all functors, respectively. The example
-program listed below and coded in the file `count_and_trace.cpp`
-demonstrates the use of both of these metadata decorators.
+program listed below demonstrates the use of both of these metadata
+decorators.
 
 \cgalExample{Arrangement_on_surface_2/count_and_trace.cpp}
 
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_counting_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_counting_traits_2.h
index ba643bb62de..75c65cd2834 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_counting_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_counting_traits_2.h
@@ -82,7 +82,7 @@ public:
   template <typename OutStream>
   OutStream& print(OutStream& os, Operation_id id) const;
 
-  /// \name Types and functors inherited from the base
+  /// \name Types and functors inherited from `BaseTraits`
   /// @{
 
   using Has_left_category = typename Base::Has_left_category;
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_tracing_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_tracing_traits_2.h
index 196003aa510..92acac4f5f3 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_tracing_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_tracing_traits_2.h
@@ -84,7 +84,7 @@ public:
    */
   void disable_all_traces();
 
-  /// \name Types and functors inherited from the base
+  /// \name Types and functors inherited from `BaseTraits`
   /// @{
 
   using Has_left_category = typename Base::Has_left_category;
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
index 3edcd6dadff..7630e8b43c3 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
@@ -107,7 +107,7 @@ public:
     return os;
   }
 
-  /// \name Types and functors inherited from the base
+  /// \name Types and functors inherited from `BaseTraits`
   //@{
 
   // Traits types:
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h
index d9b8d2e790c..daf9b1892aa 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h
@@ -191,7 +191,7 @@ public:
    */
   void disable_all_traces() { m_flags = 0x0; }
 
-  /// \name Types and functors inherited from the base.
+  /// \name Types and functors inherited from `BaseTraits`
   //@{
 
   // Traits types: