diff --git a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Algebraic_structure_traits.h b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Algebraic_structure_traits.h
index ebc961629571..4b83632b1a45 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Algebraic_structure_traits.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Algebraic_structure_traits.h
@@ -5,7 +5,7 @@ namespace CGAL {
An instance of `Algebraic_structure_traits` is a model of `AlgebraicStructureTraits`, where T is the associated type.
-\cgalModels `AlgebraicStructureTraits`
+\cgalModels{AlgebraicStructureTraits}
*/
template< typename T >
@@ -22,7 +22,7 @@ namespace CGAL {
Tag indicating that a type is a model of the
`EuclideanRing` concept.
-\cgalModels `DefaultConstructible`
+\cgalModels{DefaultConstructible}
\sa `EuclideanRing`
\sa `AlgebraicStructureTraits`
@@ -38,7 +38,7 @@ struct Euclidean_ring_tag : public Unique_factorization_domain_tag {
Tag indicating that a type is a model of the `Field` concept.
-\cgalModels `DefaultConstructible`
+\cgalModels{DefaultConstructible}
\sa `Field`
\sa `AlgebraicStructureTraits`
@@ -54,7 +54,7 @@ struct Field_tag : public Integral_domain_tag {
Tag indicating that a type is a model of the `FieldWithKthRoot` concept.
-\cgalModels `DefaultConstructible`
+\cgalModels{DefaultConstructible}
\sa `FieldWithKthRoot`
\sa `AlgebraicStructureTraits`
@@ -70,7 +70,7 @@ struct Field_with_kth_root_tag : public Field_with_sqrt_tag {
Tag indicating that a type is a model of the `FieldWithRootOf` concept.
-\cgalModels `DefaultConstructible`
+\cgalModels{DefaultConstructible}
\sa `FieldWithRootOf`
\sa `AlgebraicStructureTraits`
@@ -86,7 +86,7 @@ struct Field_with_root_of_tag : public Field_with_kth_root_tag {
Tag indicating that a type is a model of the `FieldWithSqrt` concept.
-\cgalModels `DefaultConstructible`
+\cgalModels{DefaultConstructible}
\sa `FieldWithSqrt`
\sa `AlgebraicStructureTraits`
@@ -102,7 +102,7 @@ struct Field_with_sqrt_tag : public Field_tag {
Tag indicating that a type is a model of the `IntegralDomain` concept.
-\cgalModels `DefaultConstructible`
+\cgalModels{DefaultConstructible}
\sa `IntegralDomain`
\sa `AlgebraicStructureTraits`
@@ -118,7 +118,7 @@ struct Integral_domain_tag : public Integral_domain_without_division_tag {
Tag indicating that a type is a model of the `IntegralDomainWithoutDivision` concept.
-\cgalModels `DefaultConstructible`
+\cgalModels{DefaultConstructible}
\sa `IntegralDomainWithoutDivision`
@@ -133,7 +133,7 @@ struct Integral_domain_without_division_tag {
Tag indicating that a type is a model of the `UniqueFactorizationDomain` concept.
-\cgalModels `DefaultConstructible`
+\cgalModels{DefaultConstructible}
\sa `UniqueFactorizationDomain`
\sa `AlgebraicStructureTraits`
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Fraction_traits.h b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Fraction_traits.h
index d54d382dfd9f..025487d32486 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Fraction_traits.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Fraction_traits.h
@@ -6,7 +6,7 @@ namespace CGAL {
An instance of `Fraction_traits` is a model of `FractionTraits`,
where `T` is the associated type.
-\cgalModels `FractionTraits`
+\cgalModels{FractionTraits}
*/
template< typename T >
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Real_embeddable_traits.h b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Real_embeddable_traits.h
index 90953f33c910..5c4966645e7c 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Real_embeddable_traits.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Real_embeddable_traits.h
@@ -6,7 +6,7 @@ namespace CGAL {
An instance of `Real_embeddable_traits` is a model of `RealEmbeddableTraits`, where T is the associated type.
-\cgalModels `RealEmbeddableTraits`
+\cgalModels{RealEmbeddableTraits}
*/
template< typename T >
diff --git a/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_d_1.h b/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_d_1.h
index a3e31bea51db..05b59d29f72a 100644
--- a/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_d_1.h
+++ b/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_d_1.h
@@ -27,7 +27,7 @@ approximation of an algebraic real root is a slightly modified
(filtered) version of the one presented in \cgalCite{abbott-qir-06}. The
method has quadratic convergence.
-\cgalModels `AlgebraicKernel_d_1`
+\cgalModels{AlgebraicKernel_d_1}
\sa `AlgebraicKernel_d_1`
\sa `Polynomial_d`
diff --git a/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_d_2.h b/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_d_2.h
index c4b643bfab93..35472409ffbf 100644
--- a/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_d_2.h
+++ b/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_d_2.h
@@ -47,7 +47,7 @@ above. `ROOT` should be one of the integer types. See also the
documentation of `Sqrt_extension`.
\cgalAdvancedEnd
-\cgalModels `AlgebraicKernel_d_2`
+\cgalModels{AlgebraicKernel_d_2}
\sa `AlgebraicKernel_d_1`
\sa `AlgebraicKernel_d_2`
diff --git a/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_rs_gmpq_d_1.h b/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_rs_gmpq_d_1.h
index 204f5b233fc7..dc0f525aeeb3 100644
--- a/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_rs_gmpq_d_1.h
+++ b/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_rs_gmpq_d_1.h
@@ -12,7 +12,7 @@ rational univariate polynomial root isolation. It is a model of the
isolate integer polynomials, the operations of this kernel have the
overhead of converting the polynomials to integer.
-\cgalModels `AlgebraicKernel_d_1`
+\cgalModels{AlgebraicKernel_d_1}
\sa `Algebraic_kernel_rs_gmpz_d_1`
diff --git a/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_rs_gmpz_d_1.h b/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_rs_gmpz_d_1.h
index 029066a0119c..7f4e7eb0966f 100644
--- a/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_rs_gmpz_d_1.h
+++ b/Algebraic_kernel_d/doc/Algebraic_kernel_d/CGAL/Algebraic_kernel_rs_gmpz_d_1.h
@@ -10,7 +10,7 @@ This univariate algebraic kernel uses the Rs library to perform
integer univariate polynomial root isolation. It is a model of the
`AlgebraicKernel_d_1` concept.
-\cgalModels `AlgebraicKernel_d_1`
+\cgalModels{AlgebraicKernel_d_1}
\sa `Algebraic_kernel_rs_gmpz_d_1`
diff --git a/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_face_base_2.h b/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_face_base_2.h
index fe8988c8f712..6e2c29329cc3 100644
--- a/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_face_base_2.h
+++ b/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_face_base_2.h
@@ -16,7 +16,7 @@ if `Alpha_shape_face_base_2` is intended to be used with an alpha-shape class ba
\link Tag_true `Tag_true`\endlink, triggers exact comparisons between alpha values. See the description
provided in the documentation of `Alpha_shape_2` for more details. The default value is \link Tag_false `Tag_false`\endlink.
-\cgalModels `AlphaShapeFace_2`
+\cgalModels{AlphaShapeFace_2}
\sa `Triangulation_face_base_2`
\sa `Regular_triangulation_face_base_2`
diff --git a/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_vertex_base_2.h b/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_vertex_base_2.h
index 2c0602ce5126..f440c0b2d4de 100644
--- a/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_vertex_base_2.h
+++ b/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_vertex_base_2.h
@@ -17,7 +17,7 @@ if `Alpha_shape_vertex_base_2` is intended to be used with an alpha-shape class
\link Tag_true `Tag_true`\endlink, triggers exact comparisons between alpha values. See the description
provided in the documentation of `Alpha_shape_2` for more details. The default value is \link Tag_false `Tag_false`\endlink.
-\cgalModels `AlphaShapeVertex_2`
+\cgalModels{AlphaShapeVertex_2}
\sa `Triangulation_vertex_base_2`
\sa `Regular_triangulation_vertex_base_2`
diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_cell_base_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_cell_base_3.h
index 5a92d16b0dc2..a64151eb7649 100644
--- a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_cell_base_3.h
+++ b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_cell_base_3.h
@@ -19,7 +19,7 @@ provided in the documentation of `Alpha_shape_3` for more details. The default v
must be \link Tag_true `Tag_true`\endlink if the underlying triangulation of the alpha shape to be used is a regular triangulation
and \link Tag_false `Tag_false`\endlink otherwise. The default is \link Tag_false `Tag_false`\endlink.
-\cgalModels `AlphaShapeCell_3`
+\cgalModels{AlphaShapeCell_3}
\sa `Delaunay_triangulation_cell_base_3`
\sa `Regular_triangulation_cell_base_3`
diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_vertex_base_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_vertex_base_3.h
index 0ba47d5cb6fe..ad88466cd48b 100644
--- a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_vertex_base_3.h
+++ b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_vertex_base_3.h
@@ -19,7 +19,7 @@ provided in the documentation of `Alpha_shape_3` for more details. The default v
must be \link Tag_true `Tag_true`\endlink if the underlying triangulation of the alpha shape to be used is a regular triangulation
and \link Tag_false `Tag_false`\endlink otherwise. The default is \link Tag_false `Tag_false`\endlink.
-\cgalModels `AlphaShapeVertex_3`
+\cgalModels{AlphaShapeVertex_3}
\sa `Triangulation_vertex_base_3`
\sa `Regular_triangulation_vertex_base_3`
diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_cell_base_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_cell_base_3.h
index fc558a82d759..b7fcb067dee7 100644
--- a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_cell_base_3.h
+++ b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_cell_base_3.h
@@ -13,7 +13,7 @@ to the `Alpha_shape_3` class.
By default, it is instantiated with `Delaunay_triangulation_cell_base_3`,
which is appropriate for basic alpha shapes.
-\cgalModels `FixedAlphaShapeCell_3`
+\cgalModels{FixedAlphaShapeCell_3}
\sa `Alpha_shape_cell_base_3`
\sa `Delaunay_triangulation_cell_base_3`
diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_vertex_base_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_vertex_base_3.h
index 4b237a562f2b..0d4e36a13c40 100644
--- a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_vertex_base_3.h
+++ b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_vertex_base_3.h
@@ -13,7 +13,7 @@ to the `Alpha_shape_3` class.
By default, it is instantiated with `Triangulation_vertex_base_3`,
which is appropriate for basic alpha shapes.
-\cgalModels `FixedAlphaShapeVertex_3`
+\cgalModels{FixedAlphaShapeVertex_3}
\sa `Alpha_shape_vertex_base_3`
\sa `Triangulation_vertex_base_3`
diff --git a/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_2.h b/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_2.h
index bf41824e4a44..92cd1c06b4d7 100644
--- a/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_2.h
+++ b/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_2.h
@@ -46,7 +46,7 @@ ag.incident_edges(ag.infinite_vertex());
ag.incident_edges(ag.infinite_vertex(), f);
\endcode
-\cgalModels `DelaunayGraph_2`
+\cgalModels{DelaunayGraph_2}
\sa `CGAL::Apollonius_graph_traits_2`
\sa `CGAL::Apollonius_graph_filtered_traits_2`
diff --git a/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_filtered_traits_2.h b/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_filtered_traits_2.h
index 155a7b240cb3..a8c3dfc63f0a 100644
--- a/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_filtered_traits_2.h
+++ b/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_filtered_traits_2.h
@@ -37,7 +37,7 @@ The default values for the template parameters are as follows:
`FK = CGAL::Simple_cartesian >`,
`FM = CM`.
-\cgalModels `ApolloniusGraphTraits_2`
+\cgalModels{ApolloniusGraphTraits_2}
\sa `Kernel`
\sa `ApolloniusGraphTraits_2`
diff --git a/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_hierarchy_vertex_base_2.h b/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_hierarchy_vertex_base_2.h
index c09d6255ab53..7e05e28f2a31 100644
--- a/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_hierarchy_vertex_base_2.h
+++ b/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_hierarchy_vertex_base_2.h
@@ -11,7 +11,7 @@ vertex base required by the
`Apollonius_graph_hierarchy_vertex_base_2` is templated by a class `Agvb` which must be a model
of the `ApolloniusGraphVertexBase_2` concept.
-\cgalModels `ApolloniusGraphHierarchyVertexBase_2`
+\cgalModels{ApolloniusGraphHierarchyVertexBase_2}
\sa `CGAL::Apollonius_graph_vertex_base_2`
\sa `CGAL::Triangulation_data_structure_2`
diff --git a/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_traits_2.h b/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_traits_2.h
index 3fe29ef740bc..dd8543868818 100644
--- a/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_traits_2.h
+++ b/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_traits_2.h
@@ -20,7 +20,7 @@ default value for `Method_tag` is `CGAL::Integral_domain_without_division_tag`.
The way the predicates are evaluated is discussed in
\cgalCite{cgal:ke-ppawv-02}, \cgalCite{cgal:ke-rctac-03}.
-\cgalModels `ApolloniusGraphTraits_2`
+\cgalModels{ApolloniusGraphTraits_2}
\sa `CGAL::Apollonius_graph_2`
\sa `CGAL::Apollonius_graph_filtered_traits_2`
diff --git a/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_vertex_base_2.h b/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_vertex_base_2.h
index ae9eca3dc6ec..042408867403 100644
--- a/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_vertex_base_2.h
+++ b/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_graph_vertex_base_2.h
@@ -17,7 +17,7 @@ site can become visible. If `StoreHidden` is set to
`true`, hidden sites are stored, otherwise they are
discarded. By default `StoreHidden` is set to `true`.
-\cgalModels `ApolloniusGraphVertexBase_2`
+\cgalModels{ApolloniusGraphVertexBase_2}
\sa `CGAL::Triangulation_data_structure_2`
\sa `CGAL::Apollonius_graph_hierarchy_vertex_base_2`
diff --git a/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_site_2.h b/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_site_2.h
index 162a6e462597..8d55878c7e8d 100644
--- a/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_site_2.h
+++ b/Apollonius_graph_2/doc/Apollonius_graph_2/CGAL/Apollonius_site_2.h
@@ -8,7 +8,7 @@ The class `Apollonius_site_2` is a model for the concept
`ApolloniusSite_2`. It is parametrized by a template parameter
`K` which must be a model of the `Kernel` concept.
-\cgalModels `ApolloniusSite_2`
+\cgalModels{ApolloniusSite_2}
\cgalHeading{Types}
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_Bezier_curve_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_Bezier_curve_traits_2.h
index b013c2be1ad4..7976f939c74c 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_Bezier_curve_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_Bezier_curve_traits_2.h
@@ -52,8 +52,7 @@ the `Are_mergeable_2` operation does not enforce the input curves
to have the same direction as a precondition. Moreover, `Arr_Bezier_curve_traits_2`
supports the merging of curves of opposite directions.
-\cgalModels `ArrangementTraits_2`
-\cgalModels `ArrangementDirectionalXMonotoneTraits_2`
+\cgalModels{ArrangementTraits_2,ArrangementDirectionalXMonotoneTraits_2}
*/
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_algebraic_segment_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_algebraic_segment_traits_2.h
index 165e9cbd5872..069d91859ee7 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_algebraic_segment_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_algebraic_segment_traits_2.h
@@ -22,7 +22,7 @@ the types `leda::integer` and `CORE::BigInt` are supported as well
as any instance of `CGAL::Sqrt_extension` that is instantiated with
one of the integral types above.
-\cgalModels `ArrangementTraits_2`
+\cgalModels{ArrangementTraits_2}
*/
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_bounded_planar_topology_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_bounded_planar_topology_traits_2.h
index 06cafbd5e13c..f839b4967ef8 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_bounded_planar_topology_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_bounded_planar_topology_traits_2.h
@@ -21,7 +21,7 @@ namespace CGAL {
* `Arr_default_dcel`.
*
*
- * \cgalModels `ArrangementBasicTopologyTraits`
+ * \cgalModels{ArrangementBasicTopologyTraits}
*
* \sa `Arr_default_dcel`
* \sa `CGAL::Arr_geodesic_arc_on_sphere_traits_2`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circle_segment_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circle_segment_traits_2.h
index 43b7d56bcf8c..4a82982e7519 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circle_segment_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circle_segment_traits_2.h
@@ -32,8 +32,7 @@ namespace CGAL {
* same direction as a precondition. Moreover, `Arr_circle_segment_traits_2`
* supports the merging of curves of opposite directions.
*
- * \cgalModels `ArrangementTraits_2`
- * \cgalModels `ArrangementDirectionalXMonotoneTraits_2`
+ * \cgalModels{ArrangementTraits_2,ArrangementDirectionalXMonotoneTraits_2}
*
*/
template< typename Kernel >
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_arc_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_arc_traits_2.h
index f8307dbca1b0..014e1f5ec21e 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_arc_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_arc_traits_2.h
@@ -8,7 +8,7 @@ This class is a traits class for \cgal arrangements, built on top of a model of
concept `CircularKernel`.
It provides curves of type `CGAL::Circular_arc_2`.
-\cgalModels `ArrangementTraits_2`
+\cgalModels{ArrangementTraits_2}
*/
template< typename CircularKernel >
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_line_arc_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_line_arc_traits_2.h
index b12a51541cf4..9bd3569f1145 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_line_arc_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_line_arc_traits_2.h
@@ -12,7 +12,7 @@ of both types
It uses the boost::variant.
-\cgalModels `ArrangementTraits_2`
+\cgalModels{ArrangementTraits_2}
*/
template< typename CircularKernel >
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_conic_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_conic_traits_2.h
index fe6e70de9c59..fe052cd26e5b 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_conic_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_conic_traits_2.h
@@ -80,9 +80,7 @@ namespace CGAL {
* to have the same direction as a precondition. Moreover, `Arr_conic_traits_2`
* supports the merging of curves of opposite directions.
*
- * \cgalModels `ArrangementTraits_2`
- * \cgalModels `ArrangementLandmarkTraits_2`
- * \cgalModels `ArrangementDirectionalXMonotoneTraits_2`
+ * \cgalModels{ArrangementTraits_2,ArrangementLandmarkTraits_2,ArrangementDirectionalXMonotoneTraits_2}
*
* \cgalHeading{Types}
*/
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_consolidated_curve_data_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_consolidated_curve_data_traits_2.h
index bbf6205037d8..2ed18e6be6bc 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_consolidated_curve_data_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_consolidated_curve_data_traits_2.h
@@ -21,7 +21,7 @@ both resulting subcurves. In case two (or more) \f$ x\f$-monotone curves
overlap, their data sets are consolidated, and are inserted into the set
of the \f$ x\f$-monotone curve that represents the overlap.
-\cgalModels `ArrangementTraits_2`
+\cgalModels{ArrangementTraits_2}
*/
template< typename Traits, typename Data >
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_curve_data_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_curve_data_traits_2.h
index a0d7d72ce422..e75623e8cd72 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_curve_data_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_curve_data_traits_2.h
@@ -49,7 +49,7 @@ namespace CGAL {
* `d1` and `d2`. The \f$ x\f$-monotone curve that represents the overlap is
* associated with the output of this functor.
*
- * \cgalModels `ArrangementTraits_2`
+ * \cgalModels{ArrangementTraits_2}
*/
template
class Arr_curve_data_traits_2 : public Tr {
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_dcel_base.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_dcel_base.h
index 8f9202a3a137..9fa8f5f4d96e 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_dcel_base.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_dcel_base.h
@@ -16,7 +16,7 @@ must be instantiated with models of the concepts
`ArrangementDcelVertex`, `ArrangementDcelHalfedge`,
and `ArrangementDcelFace` respectively.
-\cgalModels `ArrangementDcel`
+\cgalModels{ArrangementDcel}
*/
template< typename V, typename H, typename F >
@@ -29,7 +29,7 @@ class Arr_dcel_base {
The basic \dcel face type. Serves as a basis class for an extended
face record with auxiliary data fields.
-\cgalModels `ArrangementDcelFace`
+\cgalModels{ArrangementDcelFace}
*/
class Arr_face_base {
@@ -43,7 +43,7 @@ The basic \dcel halfedge type. Serves as a basis class for an
extended halfedge record with auxiliary data fields. The `Curve`
parameter is the type of \f$ x\f$-monotone curves associated with the vertices.
-\cgalModels `ArrangementDcelHalfedge`
+\cgalModels{ArrangementDcelHalfedge}
*/
template< typename Curve >
@@ -58,7 +58,7 @@ The basic \dcel vertex type. Serves as a basis class for an extended
vertex record with auxiliary data fields. The `Point` parameter is
the type of points associated with the vertices.
-\cgalModels `ArrangementDcelVertex`
+\cgalModels{ArrangementDcelVertex}
*/
template< typename Point >
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_default_dcel.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_default_dcel.h
index 8da592fa207f..453a7f050925 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_default_dcel.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_default_dcel.h
@@ -12,7 +12,7 @@ the base vertex and halfedge types, respectively. Thus, the default
\dcel records store no other information, except for the topological
incidence relations and the geometric data attached to vertices and edges.
-\cgalModels `ArrangementDcelWithRebind`
+\cgalModels{ArrangementDcelWithRebind}
\sa `Arr_dcel_base`
*/
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_default_overlay_traits.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_default_overlay_traits.h
index 6419b1af7ae3..5b5677b74588 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_default_overlay_traits.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_default_overlay_traits.h
@@ -10,7 +10,7 @@ of type `Arrangement` that store no auxiliary data with their \dcel records, whe
\dcel data as well. This class simply gives empty implementation for all
traits-class functions.
-\cgalModels `OverlayTraits`
+\cgalModels{OverlayTraits}
\sa `overlay`
@@ -43,7 +43,7 @@ it uses the functor `OvlFaceData`, which accepts a `FaceData_A` object
and a `FaceData_B` object and computes a corresponding `FaceData_R`
object, in order to set the auxiliary data of the overlay face.
-\cgalModels `OverlayTraits`
+\cgalModels{OverlayTraits}
\sa `overlay`
\sa `CGAL::Arr_face_extended_dcel`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_extended_dcel.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_extended_dcel.h
index b06910d1e140..b36aa2a7eb7c 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_extended_dcel.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_extended_dcel.h
@@ -33,7 +33,7 @@ The default values follow:
-\cgalModels `ArrangementDcelWithRebind`
+\cgalModels{ArrangementDcelWithRebind}
\sa `Arr_dcel_base`
@@ -57,7 +57,7 @@ The `Arr_extended_face` class-template extends the face topological-features of
\dcel. It is parameterized by a face base-type `FaceBase` and a data type
`FData` used to extend the face base-type.
-\cgalModels `ArrangementDcelFace`
+\cgalModels{ArrangementDcelFace}
\sa `Arr_dcel_base`
@@ -109,7 +109,7 @@ The `Arr_extended_halfedge` class-template extends the halfedge topological-feat
the \dcel. It is parameterized by a halfedge base-type `HalfedgeBase`
and a data type `HData` used to extend the halfedge base-type.
-\cgalModels `ArrangementDcelHalfedge`
+\cgalModels{ArrangementDcelHalfedge}
\sa `Arr_dcel_base`
@@ -162,7 +162,7 @@ topological-features of the \dcel. It is parameterized by a
vertex base-type `VertexBase` and a data type `VData` used to extend
the vertex base-type.
-\cgalModels `ArrangementDcelVertex`
+\cgalModels{ArrangementDcelVertex}
\sa `Arr_dcel_base`
@@ -235,7 +235,7 @@ as follows:
-\cgalModels `ArrangementDcelWithRebind`
+\cgalModels{ArrangementDcelWithRebind}
\sa `Arr_dcel_base`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_face_index_map.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_face_index_map.h
index ae70704f3b56..bcb0d5c378f2 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_face_index_map.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_face_index_map.h
@@ -19,10 +19,7 @@ existing faces might be removed, the notification mechanism is used
to dynamically maintain the mapping of face handles to indices.
-\cgalModels DefaultConstructible
-\cgalModels CopyConstructible
-\cgalModels Assignable
-\cgalModels `ReadablePropertyMap`
+\cgalModels{DefaultConstructible,CopyConstructible,Assignable,ReadablePropertyMap}
\sa `Arr_observer`
\sa `Arr_vertex_index_map`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_geodesic_arc_on_sphere_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_geodesic_arc_on_sphere_traits_2.h
index c6c4c608690b..d34b40072a93 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_geodesic_arc_on_sphere_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_geodesic_arc_on_sphere_traits_2.h
@@ -39,9 +39,7 @@ namespace CGAL {
* normalized vector \f$(x,y)\f$ in the \f$xy\f$-plane that bisects the
* identification curve.
- * \cgalModels `ArrangementTraits_2`
- * \cgalModels `ArrangementLandmarkTraits_2`
- * \cgalModels `ArrangementSphericalBoundaryTraits_2`
+ * \cgalModels{ArrangementTraits_2,ArrangementLandmarkTraits_2,ArrangementSphericalBoundaryTraits_2}
*/
template
@@ -52,9 +50,7 @@ namespace CGAL {
* not-necessarily normalized 3D direction extended with information that
* specifies the location of the point pre-image in the parameter space.
*
- * \cgalModels `Assignable`
- * \cgalModels `DefaultConstructible`
- * \cgalModels `CopyConstructible`
+ * \cgalModels{Assignable,DefaultConstructible,CopyConstructible}
*/
class Point_2 {
public:
@@ -118,9 +114,7 @@ namespace CGAL {
* intersect the identified left and right sides of the boundary of the
* parameter space.
*
- * \cgalModels `Assignable`
- * \cgalModels `DefaultConstructible`
- * \cgalModels `CopyConstructible`
+ * \cgalModels{Assignable,DefaultConstructible,CopyConstructible}
*/
class X_monotone_curve_2 {
public:
@@ -287,10 +281,7 @@ namespace CGAL {
/*! Construction functor of a point.
*
- * \cgalModels `Assignable`
- * \cgalModels `CopyConstructible`
- * \cgalModels `AdaptableUnaryFunction`
- * \cgalModels `AdaptableTernaryFunction`
+ * \cgalModels{Assignable,CopyConstructible,AdaptableUnaryFunction,AdaptableTernaryFunction}
*/
/*!
*/
@@ -325,11 +316,7 @@ namespace CGAL {
/*! Construction functor of \f$x\f$-monotone geodesic arcs.
*
- * \cgalModels `Assignable`
- * \cgalModels `CopyConstructible`
- * \cgalModels `AdaptableUnaryFunction`
- * \cgalModels `AdaptableBinaryFunction`
- * \cgalModels `AdaptableTernaryFunction`
+ * \cgalModels{Assignable,CopyConstructible,AdaptableUnaryFunction,AdaptableBinaryFunction,AdaptableTernaryFunction}
*/
class Construct_x_monotone_curve_2 {
public:
@@ -393,11 +380,7 @@ namespace CGAL {
/*! Construction functor of geodesic arcs.
*
- * \cgalModels `Assignable`
- * \cgalModels `CopyConstructible`
- * \cgalModels `AdaptableUnaryFunction`
- * \cgalModels `AdaptableBinaryFunction`
- * \cgalModels `AdaptableTernaryFunction`
+ * \cgalModels{Assignable,CopyConstructible,AdaptableUnaryFunction,AdaptableBinaryFunction,AdaptableTernaryFunction}
*/
class Construct_curve_2 {
public:
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_landmarks_point_location.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_landmarks_point_location.h
index 92490f47f2a1..761f83a10448 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_landmarks_point_location.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_landmarks_point_location.h
@@ -47,8 +47,7 @@ when the application frequently issues point-location queries on a
rather static arrangement that the changes applied to it are mainly
insertions of curves and not deletions of them.
-\cgalModels `ArrangementPointLocation_2`
-\cgalModels `ArrangementVerticalRayShoot_2`
+\cgalModels{ArrangementPointLocation_2,ArrangementVerticalRayShoot_2}
\sa `ArrangementPointLocation_2`
\sa `ArrangementVerticalRayShoot_2`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_line_arc_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_line_arc_traits_2.h
index b1b230c0393b..909792816a7b 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_line_arc_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_line_arc_traits_2.h
@@ -8,7 +8,7 @@ This class is a traits class for \cgal arrangements, built on top of a
model of concept `CircularKernel`. It provides curves of type
`CGAL::Line_arc_2`.
-\cgalModels `ArrangementTraits_2`
+\cgalModels{ArrangementTraits_2}
*/
template< typename CircularKernel >
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h
index c46342987f83..7f1d5825c01b 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h
@@ -21,9 +21,7 @@ namespace CGAL {
* we can find out its actual type and convert it to the respective kernel
* object (say, to a `Kernel::Ray_2`).
*
- * \cgalModels `ArrangementTraits_2`
- * \cgalModels `ArrangementLandmarkTraits_2`
- * \cgalModels `ArrangementOpenBoundaryTraits_2`
+ * \cgalModels{ArrangementTraits_2,ArrangementLandmarkTraits_2,ArrangementOpenBoundaryTraits_2}
*/
template< typename Kernel >
class Arr_linear_traits_2 {
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_naive_point_location.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_naive_point_location.h
index 1ef49902c8cf..d354aba10568 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_naive_point_location.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_naive_point_location.h
@@ -13,8 +13,7 @@ The query time is therefore linear in the complexity of the arrangement.
Naturally, this point-location strategy could turn into a heavy
time-consuming process when applied to dense arrangements.
-\cgalModels `ArrangementPointLocation_2`
-\cgalModels `ArrangementVerticalRayShoot_2`
+\cgalModels{ArrangementPointLocation_2,ArrangementVerticalRayShoot_2}
\sa `ArrangementPointLocation_2`
\sa `ArrangementVerticalRayShoot_2`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_basic_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_basic_traits_2.h
index 2a97525dc225..e85664bdb761 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_basic_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_basic_traits_2.h
@@ -21,7 +21,7 @@ instantiations for the kernel. Using other (inexact) number types
`Simple_cartesian`) is also possible, at the user's own
risk.
-\cgalModels `ArrangementLandmarkTraits_2`
+\cgalModels{ArrangementLandmarkTraits_2}
*/
template< typename Kernel >
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_traits_2.h
index c5b1ad7bf9b0..32a67f5162df 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_traits_2.h
@@ -32,9 +32,7 @@ the `Are_mergeable_2` operation does not enforce the input curves
to have the same direction as a precondition. Moreover, `Arr_non_caching_segment_traits_2`
supports the merging of curves of opposite directions.
-\cgalModels `ArrangementTraits_2`
-\cgalModels `ArrangementLandmarkTraits_2`
-\cgalModels `ArrangementDirectionalXMonotoneTraits_2`
+\cgalModels{ArrangementTraits_2,ArrangementLandmarkTraits_2,ArrangementDirectionalXMonotoneTraits_2}
\sa `Arr_segment_traits_2`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polycurve_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polycurve_traits_2.h
index 787873149135..a1bb1b331d12 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polycurve_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polycurve_traits_2.h
@@ -72,10 +72,9 @@ namespace CGAL {
* set the macro `CGAL_ALWAYS_LEFT_TO_RIGHT` to 1 before any \cgal header is
* included.
*
- * \cgalModels `ArrangementTraits_2`
- * \cgalModels `ArrangementDirectionalXMonotoneTraits_2`
- * \cgalModels `ArrangementApproximateTraits_2` (if the type that substitutes
- * the template parameter `SubcurveTraits_2` models the concept as well)
+ * \cgalModels{ArrangementTraits_2,ArrangementDirectionalXMonotoneTraits_2,
+ * ArrangementApproximateTraits_2 (if the type that substitutes
+ * the template parameter `SubcurveTraits_2` models the concept as well)}
*
* \sa `Arr_algebraic_segment_traits_2`
* \sa `Arr_Bezier_curve_traits_2`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polyline_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polyline_traits_2.h
index 9c86561f925c..8f63945a3afa 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polyline_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polyline_traits_2.h
@@ -77,12 +77,9 @@ namespace CGAL {
* the macro `CGAL_ALWAYS_LEFT_TO_RIGHT` to 1 before any \cgal header is
* included.
*
- * \cgalModels `ArrangementTraits_2`
- * \cgalModels `ArrangementDirectionalXMonotoneTraits_2`
- * \cgalModels `ArrangementConstructXMonotoneCurveTraits_2`
- * \cgalModels `ArrangementConstructCurveTraits_2`
- * \cgalModels `ArrangementApproximateTraits_2` (if the type that substitutes
- * the template parameter `SegmentTraits_2` models the concept as well)
+ * \cgalModels{ArrangementTraits_2,ArrangementDirectionalXMonotoneTraits_2,`ArrangementConstructXMonotoneCurveTraits_2`
+ * ArrangementConstructCurveTraits_2,ArrangementApproximateTraits_2 (if the type that substitutes
+ * the template parameter `SegmentTraits_2` models the concept as well)}
*
* \sa `Arr_polycurve_traits_2`
* \sa `Arr_Bezier_curve_traits_2`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_rational_function_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_rational_function_traits_2.h
index b773cddf170b..7c121ebf8976 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_rational_function_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_rational_function_traits_2.h
@@ -52,9 +52,7 @@ namespace CGAL {
to have the same direction as a precondition. Moreover, `Arr_rational_function_traits_2`
supports the merging of curves of opposite directions.
- \cgalModels `ArrangementTraits_2`
- \cgalModels `ArrangementDirectionalXMonotoneTraits_2`
- \cgalModels `ArrangementOpenBoundaryTraits_2`
+ \cgalModels{ArrangementTraits_2,ArrangementDirectionalXMonotoneTraits_2,ArrangementOpenBoundaryTraits_2}
*/
template< typename AlgebraicKernel_d_1 >
class Arr_rational_function_traits_2 {
@@ -134,10 +132,7 @@ Functor to construct a `Curve_2`. To enable caching the class is not
default constructible and must be obtained via the function
`construct_curve_2_object()`, which is a member of the traits.
-\cgalModels `Assignable`
-\cgalModels `CopyConstructible`
-\cgalModels `AdaptableBinaryFunction`
-\cgalModels `AdaptableUnaryFunction`
+\cgalModels{Assignable,CopyConstructible,AdaptableBinaryFunction,AdaptableUnaryFunction}
*/
class Construct_curve_2 {
@@ -289,10 +284,7 @@ Functor to construct a `X_monotone_curve_2`. To enable caching the class
is not default constructible and must be obtained via the function
`construct_x_monotone_curve_2_object()`, which is a member of the traits.
-\cgalModels `Assignable`
-\cgalModels `CopyConstructible`
-\cgalModels `AdaptableBinaryFunction`
-\cgalModels `AdaptableUnaryFunction`
+\cgalModels{Assignable,CopyConstructible,AdaptableBinaryFunction,AdaptableUnaryFunction}
*/
class Construct_x_monotone_curve_2 {
@@ -460,7 +452,7 @@ const Algebraic_real_1& lower, const Algebraic_real_1& upper); const
The `Curve_2` class nested within the traits is used
to represent rational functions which may be restricted to a certain x-range.
-\cgalModels `ArrTraits::Curve_2`
+\cgalModels{ArrTraits::Curve_2}
*/
class Curve_2 {
@@ -531,7 +523,7 @@ Algebraic_real_1 right_x() const;
/*!
-\cgalModels `ArrTraits::Point_2`
+\cgalModels{ArrTraits::Point_2}
*/
class Point_2 {
@@ -633,7 +625,7 @@ The `X_monotone_curve_2` class nested within the traits is used
to represent \f$ x\f$-monotone parts of rational functions. In particular, such an \f$ x\f$-monotone curve
may not contain a vertical asymptote in its interior \f$ x\f$-range.
-\cgalModels `ArrTraits::XMonotoneCurve_2`
+\cgalModels{ArrTraits::XMonotoneCurve_2}
*/
class X_monotone_curve_2 {
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_segment_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_segment_traits_2.h
index 3d7d3ab58267..9036308edaa9 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_segment_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_segment_traits_2.h
@@ -52,9 +52,7 @@ namespace CGAL {
* same direction as a precondition. Moreover, `Arr_segment_traits_2` supports
* the merging of curves of opposite directions.
*
- * \cgalModels `ArrangementTraits_2`
- * \cgalModels `ArrangementLandmarkTraits_2`
- * \cgalModels `ArrangementDirectionalXMonotoneTraits_2`
+ * \cgalModels{ArrangementTraits_2,ArrangementLandmarkTraits_2,ArrangementDirectionalXMonotoneTraits_2}
*/
template
class Arr_segment_traits_2 : public Kernel {
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_spherical_topology_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_spherical_topology_traits_2.h
index 3969c0a92cc7..5c1775e331f3 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_spherical_topology_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_spherical_topology_traits_2.h
@@ -21,7 +21,7 @@ namespace CGAL {
* `Arr_default_dcel`.
*
*
- * \cgalModels `ArrangementBasicTopologyTraits`
+ * \cgalModels{ArrangementBasicTopologyTraits}
*
* \sa `Arr_default_dcel`
* \sa `CGAL::Arr_geodesic_arc_on_sphere_traits_2`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_trapezoid_ric_point_location.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_trapezoid_ric_point_location.h
index 0027ec53409c..75994a31f173 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_trapezoid_ric_point_location.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_trapezoid_ric_point_location.h
@@ -26,8 +26,7 @@ is relatively large.
This strategy supports arbitrary subdivisions, including unbounded ones.
-\cgalModels `ArrangementPointLocation_2`
-\cgalModels `ArrangementVerticalRayShoot_2`
+\cgalModels{ArrangementPointLocation_2,ArrangementVerticalRayShoot_2}
\sa `ArrangementPointLocation_2`
\sa `ArrangementVerticalRayShoot_2`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_triangulation_point_location.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_triangulation_point_location.h
index ed9c1e12e3d1..5e1f74d0326e 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_triangulation_point_location.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_triangulation_point_location.h
@@ -15,8 +15,7 @@ namespace CGAL {
* (especially when the number of modifications applied to the arrangement is
* high) and provided only for educational purposes.
*
- * \cgalModels `ArrangementPointLocation_2`
- * \cgalModels `ArrangementVerticalRayShoot_2`
+ * \cgalModels{ArrangementPointLocation_2,ArrangementVerticalRayShoot_2}
*
* \sa `ArrangementPointLocation_2`
* \sa `ArrangementVerticalRayShoot_2`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_unb_planar_topology_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_unb_planar_topology_traits_2.h
index 4c7c69fa5aed..06efe81c731a 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_unb_planar_topology_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_unb_planar_topology_traits_2.h
@@ -21,7 +21,7 @@ namespace CGAL {
* `Arr_default_dcel`.
*
*
- * \cgalModels `ArrangementBasicTopologyTraits`
+ * \cgalModels{ArrangementBasicTopologyTraits}
*
* \sa `Arr_default_dcel`
* \sa `CGAL::Arr_geodesic_arc_on_sphere_traits_2`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_vertex_index_map.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_vertex_index_map.h
index 992a9862b9bb..1c915a6b23cf 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_vertex_index_map.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_vertex_index_map.h
@@ -19,10 +19,7 @@ existing vertices might be removed, the notification mechanism is used
to dynamically maintain the mapping of vertex handles to indices.
-\cgalModels DefaultConstructible
-\cgalModels CopyConstructible
-\cgalModels Assignable
-\cgalModels `ReadablePropertyMap`
+\cgalModels{DefaultConstructible,CopyConstructible,Assignable,ReadablePropertyMap}
\sa `Arr_observer`
\sa `Arr_face_index_map`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_walk_along_line_point_location.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_walk_along_line_point_location.h
index ed5df33be960..508d85801ba3 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_walk_along_line_point_location.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_walk_along_line_point_location.h
@@ -23,8 +23,7 @@ It is therefore recommended to use the "walk" point-location strategy
for arrangements that are constantly changing, especially if the number
of issued queries is not large.
-\cgalModels `ArrangementPointLocation_2`
-\cgalModels `ArrangementVerticalRayShoot_2`
+\cgalModels{ArrangementPointLocation_2,ArrangementVerticalRayShoot_2}
\sa `ArrangementPointLocation_2`
\sa `ArrangementVerticalRayShoot_2`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_text_formatter.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_text_formatter.h
index fa5d3ff96987..4695aa5cfb58 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_text_formatter.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_text_formatter.h
@@ -18,8 +18,7 @@ defined by the `Arrangement` template-parameter, as well as the `VertexData`,
`HalfedgeData` and `FaceData` types, can all be written to an input stream using
the `<<` operator and read from an input stream using the `>>` operator.
-\cgalModels `ArrangementInputFormatter`
-\cgalModels `ArrangementOutputFormatter`
+\cgalModels{ArrangementInputFormatter,ArrangementOutputFormatter}
\sa `PkgArrangementOnSurface2Read`
\sa `PkgArrangementOnSurface2Write`
@@ -50,8 +49,7 @@ The `Arr_face_extended_text_formatter` class assumes that the nested `Point_2` a
defined by the `Arrangement` template-parameter and that the `FaceData` type
can all be written to an input stream using the `<<` operator and read from an input stream using the `>>` operator.
-\cgalModels `ArrangementInputFormatter`
-\cgalModels `ArrangementOutputFormatter`
+\cgalModels{ArrangementInputFormatter,ArrangementOutputFormatter}
\sa `PkgArrangementOnSurface2Read`
\sa `PkgArrangementOnSurface2Write`
@@ -81,8 +79,7 @@ defined by the `Arrangement` template-parameter can both be written to an input
stream using the `<<` operator and read from an input stream using the `>>`
operator.
-\cgalModels `ArrangementInputFormatter`
-\cgalModels `ArrangementOutputFormatter`
+\cgalModels{ArrangementInputFormatter,ArrangementOutputFormatter}
\sa `PkgArrangementOnSurface2Read`
\sa `PkgArrangementOnSurface2Write`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_with_history_text_formatter.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_with_history_text_formatter.h
index 9c02ec33400c..564b6534b349 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_with_history_text_formatter.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_with_history_text_formatter.h
@@ -15,8 +15,7 @@ the base arrangement, while the derived class is responsible for reading and
writing the set of curves inducing the arrangement and maintaining the
relations between these curves and the edges they induce.
-\cgalModels `ArrangementWithHistoryInputFormatter`
-\cgalModels `ArrangementWithHistoryOutputFormatter`
+\cgalModels{ArrangementWithHistoryInputFormatter,ArrangementWithHistoryOutputFormatter}
\sa `PkgArrangementOnSurface2Read`
\sa `PkgArrangementOnSurface2Write`
diff --git a/BGL/doc/BGL/CGAL/HalfedgeDS_face_max_base_with_id.h b/BGL/doc/BGL/CGAL/HalfedgeDS_face_max_base_with_id.h
index 5518ffb5c0c2..37c3f74bbd4b 100644
--- a/BGL/doc/BGL/CGAL/HalfedgeDS_face_max_base_with_id.h
+++ b/BGL/doc/BGL/CGAL/HalfedgeDS_face_max_base_with_id.h
@@ -19,7 +19,7 @@ running a graph algorithm.
\tparam Refs must be an instantiation of a `HalfedgeDS`.
-\cgalModels `HalfedgeDSFace`
+\cgalModels{HalfedgeDSFace}
\sa `HalfedgeDS`
\sa `HalfedgeDSItems`
diff --git a/BGL/doc/BGL/CGAL/HalfedgeDS_halfedge_max_base_with_id.h b/BGL/doc/BGL/CGAL/HalfedgeDS_halfedge_max_base_with_id.h
index f57951dc82ec..e94aebb22e32 100644
--- a/BGL/doc/BGL/CGAL/HalfedgeDS_halfedge_max_base_with_id.h
+++ b/BGL/doc/BGL/CGAL/HalfedgeDS_halfedge_max_base_with_id.h
@@ -17,7 +17,7 @@ running a graph algorithm.
\tparam Refs must be an instantiation of a `HalfedgeDS`.
-\cgalModels `HalfedgeDSHalfedge`
+\cgalModels{HalfedgeDSHalfedge}
\sa `HalfedgeDS`
\sa `HalfedgeDSItems`
diff --git a/BGL/doc/BGL/CGAL/HalfedgeDS_vertex_max_base_with_id.h b/BGL/doc/BGL/CGAL/HalfedgeDS_vertex_max_base_with_id.h
index 15fad92af976..ccc9f962a238 100644
--- a/BGL/doc/BGL/CGAL/HalfedgeDS_vertex_max_base_with_id.h
+++ b/BGL/doc/BGL/CGAL/HalfedgeDS_vertex_max_base_with_id.h
@@ -17,7 +17,7 @@ running a graph algorithm.
\tparam Refs must be an instantiation of a `HalfedgeDS`.
-\cgalModels `HalfedgeDSVertex`
+\cgalModels{HalfedgeDSVertex}
\sa `HalfedgeDS`
\sa `HalfedgeDSItems`
diff --git a/BGL/doc/BGL/CGAL/Linear_cell_complex_bgl_min_items.h b/BGL/doc/BGL/CGAL/Linear_cell_complex_bgl_min_items.h
index 611ff3cd88b5..72ef25afe5e9 100644
--- a/BGL/doc/BGL/CGAL/Linear_cell_complex_bgl_min_items.h
+++ b/BGL/doc/BGL/CGAL/Linear_cell_complex_bgl_min_items.h
@@ -6,7 +6,7 @@ namespace CGAL {
The class `Linear_cell_complex_bgl_min_items` defines `void` as the information associated with darts, darts have ids and 0- and 2-attributes are enabled and have ids.
-\cgalModels `LinearCellComplexItems`
+\cgalModels{LinearCellComplexItems}
\cgalHeading{Example}
diff --git a/BGL/doc/BGL/CGAL/Polyhedron_items_with_id_3.h b/BGL/doc/BGL/CGAL/Polyhedron_items_with_id_3.h
index 7db19153e876..7c4f69185dd6 100644
--- a/BGL/doc/BGL/CGAL/Polyhedron_items_with_id_3.h
+++ b/BGL/doc/BGL/CGAL/Polyhedron_items_with_id_3.h
@@ -13,7 +13,7 @@ the point and the plane equation.
Vertices and facets both contain a halfedge handle to an incident
halfedge.
-\cgalModels `PolyhedronItems_3`
+\cgalModels{PolyhedronItems_3}
\cgalHeading{Operations}
diff --git a/BGL/doc/BGL/CGAL/Triangulation_face_base_with_id_2.h b/BGL/doc/BGL/CGAL/Triangulation_face_base_with_id_2.h
index e6bdbbc65773..3ebf243d5f13 100644
--- a/BGL/doc/BGL/CGAL/Triangulation_face_base_with_id_2.h
+++ b/BGL/doc/BGL/CGAL/Triangulation_face_base_with_id_2.h
@@ -19,7 +19,7 @@ and must be a model of `TriangulationTraits_2`.
`Triangulation_face_base_with_id_2` derives. It has the default
value `Triangulation_face_base_2`.
-\cgalModels `TriangulationFaceBase_2`
+\cgalModels{TriangulationFaceBase_2}
\sa `CGAL::Triangulation_face_base_2`
*/
diff --git a/BGL/doc/BGL/CGAL/Triangulation_vertex_base_with_id_2.h b/BGL/doc/BGL/CGAL/Triangulation_vertex_base_with_id_2.h
index d9a587610623..1f267eb5b213 100644
--- a/BGL/doc/BGL/CGAL/Triangulation_vertex_base_with_id_2.h
+++ b/BGL/doc/BGL/CGAL/Triangulation_vertex_base_with_id_2.h
@@ -19,7 +19,7 @@ and must be a model of `TriangulationTraits_2`.
`Triangulation_vertex_base_with_id_2` derives. It has the default
value `Triangulation_vertex_base_2`.
-\cgalModels `TriangulationVertexBase_2`
+\cgalModels{TriangulationVertexBase_2}
\sa `CGAL::Triangulation_vertex_base_2`
*/
diff --git a/BGL/doc/BGL/CGAL/boost/graph/properties.h b/BGL/doc/BGL/CGAL/boost/graph/properties.h
index 01f6df7b62f9..57b9f10c1cbe 100644
--- a/BGL/doc/BGL/CGAL/boost/graph/properties.h
+++ b/BGL/doc/BGL/CGAL/boost/graph/properties.h
@@ -6,31 +6,31 @@ namespace CGAL {
/// The constant `vertex_index` is a property tag which identifies the index property of a vertex of a \bgl
/// Graph
.
-/// \cgalModels PropertyTag
+/// \cgalModelsBare{PropertyTag
}
enum vertex_index_t { vertex_index };
/// The constant `halfedge_index` is a property tag which identifies the index property of a halfedge of a `HalfedgeGraph`.
///
/// This is a property tag introduced by \cgal.
-/// \cgalModels PropertyTag
+/// \cgalModelsBare{PropertyTag
}
enum halfedge_index_t { halfedge_index };
/// The constant `edge_index` is a property tag which identifies the index property of an edge of a \bgl
/// Graph
.
-/// \cgalModels PropertyTag
+/// \cgalModelsBare{PropertyTag
}
enum edge_index_t { edge_index };
/// The constant `face_index` is a property tag which identifies the index property of a face of a `FaceGraph`.
///
/// This is a property tag introduced by \cgal.
-/// \cgalModels PropertyTag
+/// \cgalModelsBare{PropertyTag
}
enum face_index_t { face_index };
/// The constant `vertex_point` is a property tag which refers to the geometric embedding property of
/// a vertex of a `HalfedgeGraph`.
///
/// This is a property tag introduced by \cgal.
-/// \cgalModels PropertyTag
+/// \cgalModelsBare{PropertyTag
}
enum vertex_point_t { vertex_point };
/// @}
diff --git a/BGL/include/CGAL/boost/graph/Dual.h b/BGL/include/CGAL/boost/graph/Dual.h
index 7d7481b1625d..4ca45b9bcec7 100644
--- a/BGL/include/CGAL/boost/graph/Dual.h
+++ b/BGL/include/CGAL/boost/graph/Dual.h
@@ -44,7 +44,7 @@ error.
\tparam Primal_ must be a model of `FaceGraph`
-\cgalModels `FaceGraph`
+\cgalModels{FaceGraph}
*/
template
diff --git a/BGL/include/CGAL/boost/graph/Face_filtered_graph.h b/BGL/include/CGAL/boost/graph/Face_filtered_graph.h
index e6f4136481d9..326a839cee61 100644
--- a/BGL/include/CGAL/boost/graph/Face_filtered_graph.h
+++ b/BGL/include/CGAL/boost/graph/Face_filtered_graph.h
@@ -66,9 +66,7 @@ namespace CGAL {
* \tparam VIMap a model of `ReadablePropertyMap` with `graph_traits::%vertex_descriptor` as key and `graph_traits::%vertices_size_type` as value
* \tparam HIMap a model of `ReadablePropertyMap` with `graph_traits::%halfedge_descriptor` as key and `graph_traits::%halfedges_size_type` as value
*
- * \cgalModels `FaceListGraph`
- * \cgalModels `HalfedgeListGraph`
- * \cgalModels \bgllink{VertexListGraph}
+ * \cgalModels{FaceListGraph,HalfedgeListGraph,\bgllink{VertexListGraph}}
*/
template
@@ -689,7 +687,7 @@ is_valid(const Graph_with_descriptor_with_graph & w, bool verbose = false
\ingroup PkgBGLAdaptors
`Graph_with_descriptor_with_graph_property_map` enables to forward properties from a
`Graph` to a `Graph_with_descriptor_with_graph`.
- \cgalModels `Graph_with_descriptor_with_graph_property_map` the same property map concept as `PM`
+ \cgalModels{Graph_with_descriptor_with_graph_property_map the same property map concept as `PM`}
@tparam Graph a model of the `FaceListGraph` and `HalfedgeListGraph` concepts.
@tparam PM a property_map of a `Graph`.
diff --git a/BGL/include/CGAL/boost/graph/Seam_mesh.h b/BGL/include/CGAL/boost/graph/Seam_mesh.h
index 34c6e61e0a6f..2db6b170e5bd 100644
--- a/BGL/include/CGAL/boost/graph/Seam_mesh.h
+++ b/BGL/include/CGAL/boost/graph/Seam_mesh.h
@@ -185,7 +185,7 @@ class Seam_mesh_edge_descriptor
/// a border edge (that is, such that either halfedge or the edge have null_face()
/// as incident face). Marking a border edge as seam will not do anything.
///
-/// \cgalModels `FaceGraph` or `FaceListGraph`, depending on the underlying mesh `TM`.
+/// \cgalModels{FaceGraph or `FaceListGraph` depending on the underlying mesh `TM`.}
///
/// \tparam TM a model of `FaceGraph` or `FaceListGraph`
/// \tparam SEM a model of `ReadablePropertyMap` with `boost::graph_traits::%edge_descriptor` as key type and `bool` as value type.
@@ -271,9 +271,7 @@ class Seam_mesh
/// Implementation note: a halfedge of the seam mesh is represented as a halfedge
/// of the mesh and a boolean to indicate whether the halfedge is on a seam or not.
///
- /// \cgalModels `Descriptor`
- /// \cgalModels `LessThanComparable`
- /// \cgalModels `Hashable`
+ /// \cgalModels{Descriptor,LessThanComparable,Hashable}
///
class halfedge_descriptor
{
@@ -356,9 +354,7 @@ class Seam_mesh
/// Implementation note: to properly duplicate vertices that are on seams,
/// a vertex_descriptor is in fact represented as a halfedge of the seam mesh.
///
- /// \cgalModels `Descriptor`
- /// \cgalModels `LessThanComparable`
- /// \cgalModels `Hashable`
+ /// \cgalModels{Descriptor,LessThanComparable,Hashable}
///
class vertex_descriptor
{
@@ -461,8 +457,7 @@ class Seam_mesh
#ifdef DOXYGEN_RUNNING
/// This class represents an edge of the seam mesh.
///
- /// \cgalModels `Descriptor`
- /// \cgalModels `Hashable`
+ /// \cgalModels{Descriptor,Hashable}
///
class edge_descriptor
{
@@ -562,7 +557,7 @@ class Seam_mesh
/// This class represents a face of the seam mesh.
///
- /// \cgalModels `Descriptor`
+ /// \cgalModels{Descriptor}
///
typedef typename boost::graph_traits::face_descriptor face_descriptor;
diff --git a/BGL/include/CGAL/boost/graph/iterator.h b/BGL/include/CGAL/boost/graph/iterator.h
index 87ff3383f21b..54b54c08ecbc 100644
--- a/BGL/include/CGAL/boost/graph/iterator.h
+++ b/BGL/include/CGAL/boost/graph/iterator.h
@@ -182,7 +182,7 @@ struct Opposite_face {
* Let `h` be a halfedge of graph `g`. For a `Halfedge_around_source_iterator` `havi` with `h = *havi;`
* the following holds: Either `++havi` is the past the end iterator, or `next(opposite(h,g),g) == *++havi`.
* \tparam Graph must be a model of the concept `HalfedgeGraph`
- * \cgalModels `BidirectionalIterator`
+ * \cgalModels{BidirectionalIterator}
*/
template
class Halfedge_around_source_iterator {
@@ -274,7 +274,7 @@ class Halfedge_around_source_iterator {
* Let `h` be a halfedge of graph `g`. For a `Halfedge_around_target_iterator` `havi` with `h = *havi;`
* the following holds: Either `++havi` is the past the end iterator, or `opposite(next(h,g),g) == *++havi`.
* \tparam Graph must be a model of the concept `HalfedgeGraph`
- * \cgalModels `BidirectionalIterator`
+ * \cgalModels{BidirectionalIterator}
*/
template
@@ -369,7 +369,7 @@ class Halfedge_around_target_iterator {
* Let `h` be a halfedge of graph `g`. For a `Halfedge_around_face_iterator` `hafi` with `h = *hafi`
* the following holds: Either `++hafi` is the past the end iterator, or `next(h,g) == *++hafi`.
* \tparam Graph must be a model of the concept `HalfedgeGraph`
- * \cgalModels `BidirectionalIterator`
+ * \cgalModels{BidirectionalIterator}
*/
template
@@ -465,7 +465,7 @@ class Halfedge_around_target_circulator;
* Let `h` be a halfedge of graph `g`. For a `Halfedge_around_source_circulator` `havc` with `h = *havc;`
* the following holds: `next(opposite(h,g),g) == *++havc`.
* \tparam Graph must be a model of the concept `HalfedgeGraph`
- * \cgalModels `BidirectionalCirculator`
+ * \cgalModels{BidirectionalCirculator}
*/
template
class Halfedge_around_source_circulator
@@ -531,7 +531,7 @@ class Halfedge_around_source_circulator
* It circulates over the same halfedges as the `Halfedge_around_target_circulator`.
*
* \tparam Graph must be a model of the concept `HalfedgeGraph`
- * \cgalModels `BidirectionalCirculator`
+ * \cgalModels{BidirectionalCirculator}
*/
template
@@ -590,7 +590,7 @@ class Face_around_target_circulator
* Let `h` be a halfedge of graph `g`. For a `Halfedge_around_target_circulator` `havc` with `h = *havc;`
* the following holds: `opposite(next(h,g),g) == *++havc`.
* \tparam Graph must be a model of the concept `HalfedgeGraph`
- * \cgalModels `BidirectionalCirculator`
+ * \cgalModels{BidirectionalCirculator}
*/
@@ -692,7 +692,7 @@ class Halfedge_around_target_circulator {
* Let `h` be a halfedge of graph `g`. For a `Halfedge_around_face_circulator` `hafc` with `h = *hafc`
* the following holds: `next(h,g) == *++hafc`.
* \tparam Graph must be a model of the concept `HalfedgeGraph`
- * \cgalModels `BidirectionalCirculator`
+ * \cgalModels{BidirectionalCirculator}
*/
template
@@ -844,7 +844,7 @@ halfedges_around_face(typename boost::graph_traits::halfedge_descriptor h
* may be the null face, and it may be several times the same face descriptor.
*
* \tparam Graph must be a model of the concept `HalfedgeGraph`
- * \cgalModels `BidirectionalCirculator`
+ * \cgalModels{BidirectionalCirculator}
*/
template
class Face_around_face_iterator
@@ -882,7 +882,7 @@ class Face_around_face_iterator
* may be the null face, and it may be several times the same face descriptor.
*
* \tparam Graph must be a model of the concept `HalfedgeGraph`
- * \cgalModels `BidirectionalCirculator`
+ * \cgalModels{BidirectionalCirculator}
*/
template
class Face_around_face_circulator
@@ -896,7 +896,7 @@ class Face_around_face_circulator
* may be the null face, and it may be several times the same face descriptor.
*
* \tparam Graph must be a model of the concept `HalfedgeGraph`
- * \cgalModels `BidirectionalIterator`
+ * \cgalModels{BidirectionalIterator}
*/
template
class Face_around_target_iterator
@@ -956,7 +956,7 @@ faces_around_face(typename boost::graph_traits::halfedge_descriptor h, co
* \ingroup PkgBGLIterators
* A bidirectional circulator with value type `boost::graph_traits::%vertex_descriptor` over all vertices incident to the same face or border.
* \tparam Graph must be a model of the concept `HalfedgeGraph`
- * \cgalModels `BidirectionalIterator`
+ * \cgalModels{BidirectionalIterator}
*/
template
class Vertex_around_face_circulator
@@ -1013,7 +1013,7 @@ class Vertex_around_face_circulator
* A bidirectional iterator with value type `boost::graph_traits::%vertex_descriptor`
* over all vertices incident to the same face or border.
* \tparam Graph must be a model of the concept `HalfedgeGraph`
- * \cgalModels `BidirectionalIterator`
+ * \cgalModels{BidirectionalIterator}
*/
template
class Vertex_around_face_iterator
@@ -1135,7 +1135,7 @@ edges_around_face(typename boost::graph_traits::halfedge_descriptor h, co
* It circulates over the same halfedges as the `Halfedge_around_target_circulator`.
*
* \tparam Graph must be a model of the concept `HalfedgeGraph`
- * \cgalModels `BidirectionalCirculator`
+ * \cgalModels{BidirectionalCirculator}
*/
template
class Vertex_around_target_circulator
@@ -1194,7 +1194,7 @@ class Vertex_around_target_circulator
* It iterates over the same halfedges as the `Halfedge_around_target_iterator`.
*
* \tparam Graph must be a model of the concept `HalfedgeGraph`
- * \cgalModels `BidirectionalIterator`
+ * \cgalModels{BidirectionalIterator}
*/
template
class Vertex_around_target_iterator
diff --git a/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Delaunay_domain_2.h b/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Delaunay_domain_2.h
index bb66bd3d577c..fe24383aa534 100644
--- a/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Delaunay_domain_2.h
+++ b/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Delaunay_domain_2.h
@@ -51,7 +51,7 @@ namespace Barycentric_coordinates {
a model of `ReadablePropertyMap` whose key type is `VertexRange::value_type` and
value type is `Point_2`. The default is `CGAL::Identity_property_map`.
- \cgalModels `DiscretizedDomain_2`
+ \cgalModels{DiscretizedDomain_2}
*/
template<
typename VertexRange,
diff --git a/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Discrete_harmonic_2.h b/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Discrete_harmonic_2.h
index 91d96c2f1c40..392a7d38b909 100644
--- a/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Discrete_harmonic_2.h
+++ b/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Discrete_harmonic_2.h
@@ -48,7 +48,7 @@ namespace Barycentric_coordinates {
\tparam Traits must be a model of the concepts `BarycentricTraits_2` and `PolygonTraits_2`.
-\cgalModels `BarycentricCoordinates_2`
+\cgalModels{BarycentricCoordinates_2}
\pre The provided polygon is strictly convex.
diff --git a/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Mean_value_2.h b/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Mean_value_2.h
index ef895698b0ae..f61c6be8bdd9 100644
--- a/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Mean_value_2.h
+++ b/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Mean_value_2.h
@@ -100,7 +100,7 @@ template
\tparam Traits must be a model of the concept `BarycentricTraits_2`.
-\cgalModels `BarycentricCoordinates_2`
+\cgalModels{BarycentricCoordinates_2}
*/
template
diff --git a/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Wachspress_2.h b/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Wachspress_2.h
index 469b84a09a30..221ed7ad21be 100644
--- a/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Wachspress_2.h
+++ b/Barycentric_coordinates_2/include/CGAL/Barycentric_coordinates_2/Wachspress_2.h
@@ -48,7 +48,7 @@ namespace Barycentric_coordinates {
\tparam Traits must be a model of the concepts `BarycentricTraits_2` and `PolygonTraits_2`.
-\cgalModels `BarycentricCoordinates_2`
+\cgalModels{BarycentricCoordinates_2}
\pre The provided polygon is strictly convex.
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Boolean_set_operations_2/Gps_default_dcel.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Boolean_set_operations_2/Gps_default_dcel.h
index 64158347a425..9aed558f9247 100644
--- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Boolean_set_operations_2/Gps_default_dcel.h
+++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Boolean_set_operations_2/Gps_default_dcel.h
@@ -15,7 +15,7 @@ You need to extend this template with auxiliary data only if you intend to
obtain the underlying arrangement of the general polygon set and process it
further.
-\cgalModels `GeneralPolygonSetDcelFace`
+\cgalModels{GeneralPolygonSetDcelFace}
\sa `Arr_face_base`
*/
@@ -35,7 +35,7 @@ You need to extend this template with auxiliary data only if you intend to
obtain the underlying arrangement of the general polygon set and process it
further.
-\cgalModels `GeneralPolygonSetDcelHalfedge`
+\cgalModels{GeneralPolygonSetDcelHalfedge}
\sa `Arr_halfedge_base`
*/
@@ -62,7 +62,7 @@ You need to override this default and use a different
\dcel only if you intend to obtain the underlying
arrangement of the general polygon set and process it further.
-\cgalModels `GeneralPolygonSetDcel`
+\cgalModels{GeneralPolygonSetDcel}
\sa `Arr_dcel_base`
\sa `Gps_halfedge_base`
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/General_polygon_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/General_polygon_2.h
index 636853b0ed91..c5c628cc757b 100644
--- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/General_polygon_2.h
+++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/General_polygon_2.h
@@ -20,7 +20,7 @@ support the following functions:
This class supports a few convenient operations in addition to the
requirements that the concept `GeneralPolygon_2` lists.
-\cgalModels `GeneralPolygon_2`
+\cgalModels{GeneralPolygon_2}
*/
template< typename ArrTraits >
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_circle_segment_traits_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_circle_segment_traits_2.h
index c93ff9e02752..c2b0b4b0e6d8 100644
--- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_circle_segment_traits_2.h
+++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_circle_segment_traits_2.h
@@ -9,7 +9,7 @@ concept. It enables Boolean set-operations on general polygons bounded by
linear segments or circular arcs.
It should be parameterized with a kernel.
-\cgalModels `GeneralPolygonSetTraits_2`
+\cgalModels{GeneralPolygonSetTraits_2}
\sa `CGAL::Arr_circle_segment_traits_2`
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_segment_traits_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_segment_traits_2.h
index dbe5f325b011..7dd12f6f1075 100644
--- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_segment_traits_2.h
+++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_segment_traits_2.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgBooleanSetOperations2Ref
-\cgalModels `GeneralPolygonSetTraits_2`
+\cgalModels{GeneralPolygonSetTraits_2}
\sa `CGAL::Arr_segment_traits_2`
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_traits_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_traits_2.h
index 050bada2dece..6d65a9e5e430 100644
--- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_traits_2.h
+++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_traits_2.h
@@ -13,7 +13,7 @@ the concept `ArrangementXMonotoneTraits_2`). The template parameter
of `GpsTraitsGeneralPolygon_2`. By default, the latter is instantiated by
`CGAL::General_polygon_2`.
-\cgalModels `GeneralPolygonSetTraits_2`
+\cgalModels{GeneralPolygonSetTraits_2}
*/
template< typename ArrTraits, typename GeneralPolygon_t >
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d_traits_2.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d_traits_2.h
index a83c5184807b..afecb15c8dc9 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d_traits_2.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d_traits_2.h
@@ -18,7 +18,7 @@ exact computations.
`CGAL::Tag_true`. (Examples of such a
number-type are `MP_Float`, `CORE::Expr`, and `Gmpq`.)
-\cgalModels `ApproximateMinEllipsoid_d_Traits_d`
+\cgalModels{ApproximateMinEllipsoid_d_Traits_d}
\sa `CGAL::Approximate_min_ellipsoid_d_traits_3`
\sa `CGAL::Approximate_min_ellipsoid_d_traits_d`
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d_traits_3.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d_traits_3.h
index ce851ee9f458..b980e60bf1e9 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d_traits_3.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d_traits_3.h
@@ -19,7 +19,7 @@ exact computations.
`Tag_true` (Examples of such a
number-type are `MP_Float`, `CORE::Expr`, and `Gmpq`.)
-\cgalModels `ApproximateMinEllipsoid_d_Traits_d`
+\cgalModels{ApproximateMinEllipsoid_d_Traits_d}
\sa `CGAL::Approximate_min_ellipsoid_d_traits_2`
\sa `CGAL::Approximate_min_ellipsoid_d_traits_d`
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d_traits_d.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d_traits_d.h
index 44caa851a38d..1c655e7f242f 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d_traits_d.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d_traits_d.h
@@ -18,7 +18,7 @@ exact computations.
`CGAL::Tag_true` (Examples of such a
number-type are `MP_Float`, `CORE::Expr`, and `Gmpq`.)
-\cgalModels `ApproximateMinEllipsoid_d_Traits_d`
+\cgalModels{ApproximateMinEllipsoid_d_Traits_d}
\sa `CGAL::Approximate_min_ellipsoid_d_traits_2`
\sa `CGAL::Approximate_min_ellipsoid_d_traits_3`
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_circle_2_traits_2.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_circle_2_traits_2.h
index 466674a71de2..66560c136546 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_circle_2_traits_2.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_circle_2_traits_2.h
@@ -9,7 +9,7 @@ using the two-dimensional \cgal kernel.
\tparam K must be a model for `Kernel`.
-\cgalModels `MinCircle2Traits`
+\cgalModels{MinCircle2Traits}
\sa `CGAL::Min_circle_2`
\sa `MinCircle2Traits`
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_ellipse_2_traits_2.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_ellipse_2_traits_2.h
index 25b54759c1a2..ab207e354fb9 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_ellipse_2_traits_2.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_ellipse_2_traits_2.h
@@ -9,7 +9,7 @@ using the two-dimensional \cgal kernel.
The template parameter `K` must be a model for `Kernel`.
-\cgalModels `MinEllipse2Traits`
+\cgalModels{MinEllipse2Traits}
\sa `CGAL::Min_ellipse_2`
\sa `MinEllipse2Traits`
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_quadrilateral_traits_2.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_quadrilateral_traits_2.h
index f44fcbe475ed..7357ae30f294 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_quadrilateral_traits_2.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_quadrilateral_traits_2.h
@@ -10,7 +10,7 @@ functions `min_rectangle_2()`, `min_parallelogram_2()` and
\tparam K must be a model for `Kernel`.
-\cgalModels `MinQuadrilateralTraits_2`
+\cgalModels{MinQuadrilateralTraits_2}
\sa `CGAL::min_rectangle_2()`
\sa `CGAL::min_parallelogram_2()`
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_annulus_d_traits_2.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_annulus_d_traits_2.h
index 3273105434a2..d3c56d3b0956 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_annulus_d_traits_2.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_annulus_d_traits_2.h
@@ -10,7 +10,7 @@ optimisation algorithms using the two-dimensional \cgal kernel.
\tparam K must bea model for `Kernel`.
\tparam ET NT are models for `RingNumberType`. Their default type is `K::RT`.
-\cgalModels `MinSphereAnnulusDTraits`
+\cgalModels{MinSphereAnnulusDTraits}
\sa `CGAL::Min_sphere_d`
\sa `CGAL::Min_annulus_d`
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_annulus_d_traits_3.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_annulus_d_traits_3.h
index 32f770b0703b..84284beefc55 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_annulus_d_traits_3.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_annulus_d_traits_3.h
@@ -10,7 +10,7 @@ optimisation algorithms using the three-dimensional \cgal kernel.
\tparam K must be a model for `Kernel`.
\tparam ET NT are models for `RingNumberType`. Their default type is `K::RT`.
-\cgalModels `MinSphereAnnulusDTraits`
+\cgalModels{MinSphereAnnulusDTraits}
\sa `CGAL::Min_sphere_d`
\sa `CGAL::Min_annulus_d`
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_annulus_d_traits_d.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_annulus_d_traits_d.h
index 198967340a53..f2bc035794b9 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_annulus_d_traits_d.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_annulus_d_traits_d.h
@@ -10,7 +10,7 @@ optimisation algorithms using the \f$ d\f$-dimensional \cgal kernel.
\tparam K must be a model for `Kernel`.
\tparam ET NT are models for `RingNumberType`. Their default type is `K::RT`.
-\cgalModels `MinSphereAnnulusDTraits`
+\cgalModels{MinSphereAnnulusDTraits}
\sa `CGAL::Min_sphere_d`
\sa `CGAL::Min_annulus_d`
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_points_d_traits_2.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_points_d_traits_2.h
index 58a514025cfd..c50875cb3c10 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_points_d_traits_2.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_points_d_traits_2.h
@@ -8,7 +8,7 @@ The class
model for concept `MinSphereOfSpheresTraits`. It uses the \cgal
type `Point_2` to represent circles.
-\cgalModels `MinSphereOfSpheresTraits`
+\cgalModels{MinSphereOfSpheresTraits}
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_points_d_traits_3.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_points_d_traits_3.h
index f54cfe542045..d6fc8ff305d3 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_points_d_traits_3.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_points_d_traits_3.h
@@ -8,7 +8,7 @@ The class
model for concept `MinSphereOfSpheresTraits`. It uses the \cgal
type `Point_3` to represent spheres.
-\cgalModels `MinSphereOfSpheresTraits`
+\cgalModels{MinSphereOfSpheresTraits}
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_points_d_traits_d.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_points_d_traits_d.h
index 1e0838c0e6a7..a4843602cbb2 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_points_d_traits_d.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_points_d_traits_d.h
@@ -8,7 +8,7 @@ The class
a model for concept `MinSphereOfSpheresTraits`. It uses the
\cgal type `Point_d` to represent circles.
-\cgalModels `MinSphereOfSpheresTraits`
+\cgalModels{MinSphereOfSpheresTraits}
\tparam K is a model for `Kernel`.
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_spheres_d_traits_2.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_spheres_d_traits_2.h
index 36f9721ad0d2..fa1761c75313 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_spheres_d_traits_2.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_spheres_d_traits_2.h
@@ -8,7 +8,7 @@ The class
model for concept `MinSphereOfSpheresTraits`. It uses a pair of \cgal
`Point_2` and `FT` to represent circles.
-\cgalModels `MinSphereOfSpheresTraits`
+\cgalModels{MinSphereOfSpheresTraits}
The last two template parameters, `UseSqrt` and `Algorithm`, have
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_spheres_d_traits_3.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_spheres_d_traits_3.h
index 71786791402e..cf98855e846d 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_spheres_d_traits_3.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_spheres_d_traits_3.h
@@ -8,7 +8,7 @@ The class
model for concept `MinSphereOfSpheresTraits`. It uses a pair of \cgal
`Point_3` and `FT` to represent spheres.
-\cgalModels `MinSphereOfSpheresTraits`
+\cgalModels{MinSphereOfSpheresTraits}
\tparam K must be a model for `Kernel`.
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_spheres_d_traits_d.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_spheres_d_traits_d.h
index 96e0b6f7ecb6..ad8fdf4f1fbf 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_spheres_d_traits_d.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/Min_sphere_of_spheres_d_traits_d.h
@@ -8,7 +8,7 @@ The class
a model for concept `MinSphereOfSpheresTraits`. It uses the
\cgal type `Point_d` to represent circles.
-\cgalModels `MinSphereOfSpheresTraits`
+\cgalModels{MinSphereOfSpheresTraits}
\tparam K is a model for `Kernel`.
diff --git a/Bounding_volumes/doc/Bounding_volumes/CGAL/rectangular_p_center_2.h b/Bounding_volumes/doc/Bounding_volumes/CGAL/rectangular_p_center_2.h
index f3baaa625f13..1f6b388ee710 100644
--- a/Bounding_volumes/doc/Bounding_volumes/CGAL/rectangular_p_center_2.h
+++ b/Bounding_volumes/doc/Bounding_volumes/CGAL/rectangular_p_center_2.h
@@ -10,7 +10,7 @@ using the function `rectangular_p_center_2()`.
\tparam K must be a model for `Kernel`.
-\cgalModels `RectangularPCenterTraits_2`
+\cgalModels{RectangularPCenterTraits_2}
\sa `CGAL::rectangular_p_center_2()`
diff --git a/Box_intersection_d/doc/Box_intersection_d/CGAL/Box_intersection_d/Box_d.h b/Box_intersection_d/doc/Box_intersection_d/CGAL/Box_intersection_d/Box_d.h
index 6c4b4dd6819c..ea73e62242e0 100644
--- a/Box_intersection_d/doc/Box_intersection_d/CGAL/Box_intersection_d/Box_d.h
+++ b/Box_intersection_d/doc/Box_intersection_d/CGAL/Box_intersection_d/Box_d.h
@@ -40,7 +40,7 @@ creates copies of the boxes that would not have identical
`id`-numbers.
-\cgalModels `BoxIntersectionBox_d`
+\cgalModels{BoxIntersectionBox_d}
\sa \link PkgBoxIntersectionD_box_intersection_d `CGAL::box_intersection_d()` \endlink
\sa \link PkgBoxIntersectionD_box_self_intersection_d `CGAL::box_self_intersection_d()` \endlink
diff --git a/Box_intersection_d/doc/Box_intersection_d/CGAL/Box_intersection_d/Box_traits_d.h b/Box_intersection_d/doc/Box_intersection_d/CGAL/Box_intersection_d/Box_traits_d.h
index 49823cfe609d..a3731b377d46 100644
--- a/Box_intersection_d/doc/Box_intersection_d/CGAL/Box_intersection_d/Box_traits_d.h
+++ b/Box_intersection_d/doc/Box_intersection_d/CGAL/Box_intersection_d/Box_traits_d.h
@@ -20,7 +20,7 @@ cases it just uses the pointer type.
const-pointer `const B*`, where `B` is a model of the
`BoxIntersectionBox_d` concept.
-\cgalModels `BoxIntersectionTraits_d`
+\cgalModels{BoxIntersectionTraits_d}
\sa \link PkgBoxIntersectionD_box_intersection_d `CGAL::box_intersection_d()` \endlink
\sa \link PkgBoxIntersectionD_box_self_intersection_d `CGAL::box_self_intersection_d()` \endlink
diff --git a/Box_intersection_d/doc/Box_intersection_d/CGAL/Box_intersection_d/Box_with_handle_d.h b/Box_intersection_d/doc/Box_intersection_d/CGAL/Box_intersection_d/Box_with_handle_d.h
index 32f04c82c383..7ceb1b14348e 100644
--- a/Box_intersection_d/doc/Box_intersection_d/CGAL/Box_intersection_d/Box_with_handle_d.h
+++ b/Box_intersection_d/doc/Box_intersection_d/CGAL/Box_intersection_d/Box_with_handle_d.h
@@ -52,7 +52,7 @@ the safe default implementation.
available for the `CGAL::Box_intersection_d::Box_d` type
that does not store a handle.
-\cgalModels `BoxIntersectionBox_d`
+\cgalModels{BoxIntersectionBox_d}
\sa \link PkgBoxIntersectionD_box_intersection_d `CGAL::box_intersection_d()` \endlink
\sa \link PkgBoxIntersectionD_box_self_intersection_d `CGAL::box_self_intersection_d()` \endlink
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Algebraic_kernel_for_circles_2_2.h b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Algebraic_kernel_for_circles_2_2.h
index 86598adf69d9..d9e36e19f518 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Algebraic_kernel_for_circles_2_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Algebraic_kernel_for_circles_2_2.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel2AlgebraicClasses
-\cgalModels `AlgebraicKernelForCircles`
+\cgalModels{AlgebraicKernelForCircles}
*/
template< typename RT >
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Circular_arc_2.h b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Circular_arc_2.h
index 546ac0080557..684ac669ce5e 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Circular_arc_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Circular_arc_2.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel2GeometricClasses
-\cgalModels `CircularKernel::CircularArc_2`
+\cgalModels{CircularKernel::CircularArc_2}
\sa `CGAL::Circular_arc_point_2`
\sa `CGAL::Line_arc_2`
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Circular_arc_point_2.h b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Circular_arc_point_2.h
index cb8325f4e928..052216f2a8c9 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Circular_arc_point_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Circular_arc_point_2.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel2GeometricClasses
-\cgalModels `CircularKernel::CircularArcPoint_2`
+\cgalModels{CircularKernel::CircularArcPoint_2}
\sa `CGAL::Circular_arc_2`
\sa `CGAL::Line_arc_2`
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Circular_kernel_2.h b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Circular_kernel_2.h
index 65401ed2778a..b0ddfe1ca784 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Circular_kernel_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Circular_kernel_2.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel2GeometricClasses
-\cgalModels `CircularKernel`
+\cgalModels{CircularKernel}
\cgalHeading{Parameters}
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Exact_circular_kernel_2.h b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Exact_circular_kernel_2.h
index 46ff1b15b481..6347918a36d0 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Exact_circular_kernel_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Exact_circular_kernel_2.h
@@ -8,7 +8,7 @@ A typedef to a circular kernel that provides both exact geometric
predicates and exact geometric constructions. This kernel uses some
geometric filtering (based on bounding boxes) to gain efficiency.
-\cgalModels `CircularKernel`
+\cgalModels{CircularKernel}
\sa `CGAL::Circular_kernel_2`
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Line_arc_2.h b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Line_arc_2.h
index c8e2fca1e771..53b3a7b34e5a 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Line_arc_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Line_arc_2.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel2GeometricClasses
-\cgalModels `CircularKernel::LineArc_2`
+\cgalModels{CircularKernel::LineArc_2}
\cgalHeading{I/O}
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_1_2.h b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_1_2.h
index c7a3fb71072d..3c0865a74289 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_1_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_1_2.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel2AlgebraicClasses
-\cgalModels `AlgebraicKernelForCircles::Polynomial_1_2`
+\cgalModels{AlgebraicKernelForCircles::Polynomial_1_2}
*/
template< typename RT >
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_2_2.h b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_2_2.h
index 80ff654207e8..c287ffd4ed30 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_2_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_2_2.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel2AlgebraicClasses
-\cgalModels `AlgebraicKernelForCircles::PolynomialForCircles_2_2`
+\cgalModels{AlgebraicKernelForCircles::PolynomialForCircles_2_2}
\sa `CGAL::Sqrt_extension`
\sa `AlgebraicKernelForCircles`
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Root_for_circles_2_2.h b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Root_for_circles_2_2.h
index db7c4ed3a6ad..f0a49daf7771 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Root_for_circles_2_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Root_for_circles_2_2.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel2AlgebraicClasses
-\cgalModels `AlgebraicKernelForCircles::RootForCircles_2_2`
+\cgalModels{AlgebraicKernelForCircles::RootForCircles_2_2}
*/
template< typename FT >
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Algebraic_kernel_for_spheres_2_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Algebraic_kernel_for_spheres_2_3.h
index db2aec890a4b..b54b34522ea5 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Algebraic_kernel_for_spheres_2_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Algebraic_kernel_for_spheres_2_3.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel3AlgebraicClasses
-\cgalModels `AlgebraicKernelForSpheres`
+\cgalModels{AlgebraicKernelForSpheres}
*/
template< typename RT >
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Circular_arc_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Circular_arc_3.h
index 6accd5fdda72..018a713b6c4e 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Circular_arc_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Circular_arc_3.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel3GeometricClasses
-\cgalModels `SphericalKernel::CircularArc_3`
+\cgalModels{SphericalKernel::CircularArc_3}
\cgalHeading{I/O}
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Circular_arc_point_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Circular_arc_point_3.h
index 637452fe2017..bfc56e02fe71 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Circular_arc_point_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Circular_arc_point_3.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel3GeometricClasses
-\cgalModels `SphericalKernel::CircularArcPoint_3`
+\cgalModels{SphericalKernel::CircularArcPoint_3}
\sa `CGAL::Circular_arc_3`
\sa `CGAL::Line_arc_3`
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Exact_spherical_kernel_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Exact_spherical_kernel_3.h
index c92182af28b1..a33f4c72cfc5 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Exact_spherical_kernel_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Exact_spherical_kernel_3.h
@@ -9,7 +9,7 @@ both exact geometric predicates and exact geometric constructions.
It defines the same types as `CGAL::Spherical_kernel_3`.
-\cgalModels `SphericalKernel`
+\cgalModels{SphericalKernel}
*/
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Line_arc_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Line_arc_3.h
index 7cc639959de9..744b2e5a0247 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Line_arc_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Line_arc_3.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel3GeometricClasses
-\cgalModels `SphericalKernel::LineArc_3`
+\cgalModels{SphericalKernel::LineArc_3}
\sa `CGAL::Circular_arc_point_3`
\sa `CGAL::Circular_arc_3`
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_1_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_1_3.h
index df3532cedfc5..715108154ad1 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_1_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_1_3.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel3AlgebraicClasses
-\cgalModels `AlgebraicKernelForSpheres::Polynomial_1_3`
+\cgalModels{AlgebraicKernelForSpheres::Polynomial_1_3}
*/
template< typename RT >
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_2_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_2_3.h
index 6084f63779df..ee510c4d1ebb 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_2_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_2_3.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel3AlgebraicClasses
-\cgalModels `AlgebraicKernelForSpheres::PolynomialForSpheres_2_3`
+\cgalModels{AlgebraicKernelForSpheres::PolynomialForSpheres_2_3}
\sa `AlgebraicKernelForSpheres`
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_for_line_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_for_line_3.h
index 9c51a9e834a9..2081dee35d2d 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_for_line_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_for_line_3.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel3AlgebraicClasses
-\cgalModels `AlgebraicKernelForSpheres::PolynomialsForLines_3`
+\cgalModels{AlgebraicKernelForSpheres::PolynomialsForLines_3}
\sa `AlgebraicKernelForSpheres`
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Root_for_spheres_2_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Root_for_spheres_2_3.h
index 0590e3e0c3dc..0c46aab5c9a8 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Root_for_spheres_2_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Root_for_spheres_2_3.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel3AlgebraicClasses
-\cgalModels `AlgebraicKernelForSpheres::RootForSpheres_2_3`
+\cgalModels{AlgebraicKernelForSpheres::RootForSpheres_2_3}
*/
template< typename RT >
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Spherical_kernel_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Spherical_kernel_3.h
index 5c4212c32d5a..cf225ac32606 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Spherical_kernel_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Spherical_kernel_3.h
@@ -4,7 +4,7 @@ namespace CGAL {
/*!
\ingroup PkgCircularKernel3GeometricClasses
-\cgalModels `SphericalKernel`
+\cgalModels{SphericalKernel}
\cgalHeading{Parameters}
diff --git a/Classification/include/CGAL/Classification/ETHZ/Random_forest_classifier.h b/Classification/include/CGAL/Classification/ETHZ/Random_forest_classifier.h
index fbf3b43a4bcf..29c46fef711d 100644
--- a/Classification/include/CGAL/Classification/ETHZ/Random_forest_classifier.h
+++ b/Classification/include/CGAL/Classification/ETHZ/Random_forest_classifier.h
@@ -63,7 +63,7 @@ namespace ETHZ {
\note This classifier is distributed under the MIT license.
- \cgalModels `CGAL::Classification::Classifier`
+ \cgalModels{CGAL::Classification::Classifier}
*/
class Random_forest_classifier
{
diff --git a/Classification/include/CGAL/Classification/Feature_base.h b/Classification/include/CGAL/Classification/Feature_base.h
index 89ba6e603841..b73dd7154f72 100644
--- a/Classification/include/CGAL/Classification/Feature_base.h
+++ b/Classification/include/CGAL/Classification/Feature_base.h
@@ -68,7 +68,7 @@ class Feature_base
\brief %Handle to a `Feature_base`.
- \cgalModels Handle
+ \cgalModels{Handle}
*/
class Feature_handle { };
#else
diff --git a/Classification/include/CGAL/Classification/Label.h b/Classification/include/CGAL/Classification/Label.h
index 7801942afcb3..ba0b4c38f632 100644
--- a/Classification/include/CGAL/Classification/Label.h
+++ b/Classification/include/CGAL/Classification/Label.h
@@ -105,7 +105,7 @@ class Label
\brief %Handle to a classification `Label`.
- \cgalModels Handle
+ \cgalModels{Handle}
*/
class Label_handle { };
#else
diff --git a/Classification/include/CGAL/Classification/Mesh_neighborhood.h b/Classification/include/CGAL/Classification/Mesh_neighborhood.h
index 6a00a4138207..bad561d6c0fd 100644
--- a/Classification/include/CGAL/Classification/Mesh_neighborhood.h
+++ b/Classification/include/CGAL/Classification/Mesh_neighborhood.h
@@ -77,7 +77,7 @@ class Mesh_neighborhood
/*!
Functor that computes the 1-ring neighborhood of the face of an input mesh.
- \cgalModels CGAL::Classification::NeighborQuery
+ \cgalModels{CGAL::Classification::NeighborQuery}
\sa Mesh_neighborhood
*/
@@ -110,7 +110,7 @@ class Mesh_neighborhood
/*!
Functor that computes the N-ring neighborhood of the face of an input mesh.
- \cgalModels CGAL::Classification::NeighborQuery
+ \cgalModels{CGAL::Classification::NeighborQuery}
\sa Mesh_neighborhood
*/
diff --git a/Classification/include/CGAL/Classification/OpenCV/Random_forest_classifier.h b/Classification/include/CGAL/Classification/OpenCV/Random_forest_classifier.h
index 6e7d5e1f1d0f..b7105279a921 100644
--- a/Classification/include/CGAL/Classification/OpenCV/Random_forest_classifier.h
+++ b/Classification/include/CGAL/Classification/OpenCV/Random_forest_classifier.h
@@ -47,7 +47,7 @@ namespace OpenCV {
\note This class requires the \ref thirdpartyOpenCV library.
- \cgalModels `CGAL::Classification::Classifier`
+ \cgalModels{CGAL::Classification::Classifier}
*/
class Random_forest_classifier
{
diff --git a/Classification/include/CGAL/Classification/Point_set_neighborhood.h b/Classification/include/CGAL/Classification/Point_set_neighborhood.h
index 156bd68d1cbb..c27c874f0c23 100644
--- a/Classification/include/CGAL/Classification/Point_set_neighborhood.h
+++ b/Classification/include/CGAL/Classification/Point_set_neighborhood.h
@@ -96,7 +96,7 @@ class Point_set_neighborhood
Functor that computes the neighborhood of an input point with a
fixed number of neighbors.
- \cgalModels CGAL::Classification::NeighborQuery
+ \cgalModels{CGAL::Classification::NeighborQuery}
\sa Point_set_neighborhood
*/
@@ -131,7 +131,7 @@ class Point_set_neighborhood
as the points lying in a sphere of fixed radius centered at the
input point.
- \cgalModels CGAL::Classification::NeighborQuery
+ \cgalModels{CGAL::Classification::NeighborQuery}
\sa Point_set_neighborhood
*/
diff --git a/Classification/include/CGAL/Classification/Sum_of_weighted_features_classifier.h b/Classification/include/CGAL/Classification/Sum_of_weighted_features_classifier.h
index 7f16459723ad..fac51686e142 100644
--- a/Classification/include/CGAL/Classification/Sum_of_weighted_features_classifier.h
+++ b/Classification/include/CGAL/Classification/Sum_of_weighted_features_classifier.h
@@ -48,7 +48,7 @@ namespace Classification {
\brief %Classifier based on the sum of weighted features with
user-defined effects on labels.
- \cgalModels `CGAL::Classification::Classifier`
+ \cgalModels{CGAL::Classification::Classifier}
*/
class Sum_of_weighted_features_classifier
{
diff --git a/Classification/include/CGAL/Classification/property_maps.h b/Classification/include/CGAL/Classification/property_maps.h
index 44a0a75f0c01..f03e837d8067 100644
--- a/Classification/include/CGAL/Classification/property_maps.h
+++ b/Classification/include/CGAL/Classification/property_maps.h
@@ -32,7 +32,7 @@ namespace Classification
\brief Property map that constructs the center of mass of the face
of a mesh on-the-fly.
- \cgalModels `ReadablePropertyMap`
+ \cgalModels{ReadablePropertyMap}
\tparam FaceGraph model of `FaceGraph`.
@@ -85,7 +85,7 @@ class Face_descriptor_to_center_of_mass_map
\brief Property map that constructs a face descriptor with a
`bbox()` method from a face descriptor.
- \cgalModels `ReadablePropertyMap`
+ \cgalModels{ReadablePropertyMap}
\tparam FaceGraph model of `FaceGraph`.
diff --git a/Combinatorial_map/doc/Combinatorial_map/CGAL/Cell_attribute.h b/Combinatorial_map/doc/Combinatorial_map/CGAL/Cell_attribute.h
index 3256326a53c2..60846dd21975 100644
--- a/Combinatorial_map/doc/Combinatorial_map/CGAL/Cell_attribute.h
+++ b/Combinatorial_map/doc/Combinatorial_map/CGAL/Cell_attribute.h
@@ -6,7 +6,7 @@ namespace CGAL {
The class `Cell_attribute` represents an attribute containing (or not) an information.
-\cgalModels `CellAttribute`
+\cgalModels{CellAttribute}
\tparam Map a model of the `GenericMap` concept.
diff --git a/Combinatorial_map/doc/Combinatorial_map/CGAL/Cell_attribute_with_id.h b/Combinatorial_map/doc/Combinatorial_map/CGAL/Cell_attribute_with_id.h
index a99045fbeedf..3733c29241c0 100644
--- a/Combinatorial_map/doc/Combinatorial_map/CGAL/Cell_attribute_with_id.h
+++ b/Combinatorial_map/doc/Combinatorial_map/CGAL/Cell_attribute_with_id.h
@@ -6,7 +6,7 @@ namespace CGAL {
The class `Cell_attribute_with_id` represents an attribute containing (or not) an information, and having an id.
-\cgalModels `CellAttribute`
+\cgalModels{CellAttribute}
\tparam Map a model of the `GenericMap` concept.
diff --git a/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map.h b/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map.h
index 9dba99d6718a..0038999e7e2a 100644
--- a/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map.h
+++ b/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map.h
@@ -8,7 +8,7 @@ The class `Combinatorial_map` represents a dD combinatorial map.
Two versions exist: one where Darts and non void attributes are stored in memory using `Compact_container`, using `Alloc` as allocator, and use handles as descriptors; a second one where Darts and non void attributes are stored in an internal std::vector like data-structure, and use indices as descriptors. The choice between the two versions is done through the item class.
-\cgalModels `CombinatorialMap`
+\cgalModels{CombinatorialMap}
\tparam d the dimension of the map.
diff --git a/Combinatorial_map/doc/Combinatorial_map/CGAL/Generic_map_min_items.h b/Combinatorial_map/doc/Combinatorial_map/CGAL/Generic_map_min_items.h
index 8cbfbf1be14b..434193a8e3cc 100644
--- a/Combinatorial_map/doc/Combinatorial_map/CGAL/Generic_map_min_items.h
+++ b/Combinatorial_map/doc/Combinatorial_map/CGAL/Generic_map_min_items.h
@@ -6,7 +6,7 @@ namespace CGAL {
The class `Generic_map_min_items` defines `void` as the information associated with darts, and no attribute is enabled.
-\cgalModels `GenericMapItems`
+\cgalModels{GenericMapItems}
\cgalHeading{Example}
diff --git a/Convex_hull_2/doc/Convex_hull_2/CGAL/Convex_hull_traits_adapter_2.h b/Convex_hull_2/doc/Convex_hull_2/CGAL/Convex_hull_traits_adapter_2.h
index 051d148e06cd..97bac6496bae 100644
--- a/Convex_hull_2/doc/Convex_hull_2/CGAL/Convex_hull_traits_adapter_2.h
+++ b/Convex_hull_2/doc/Convex_hull_2/CGAL/Convex_hull_traits_adapter_2.h
@@ -10,7 +10,7 @@ Given a property map associating a key to a point, the class `Convex_hull_traits
to compute the sequence of keys for which the associated points form a convex hull,
performing the predicates of the base traits class on the points associated to the keys.
-\cgalModels `ConvexHullTraits_2`
+\cgalModels{ConvexHullTraits_2}
\sa `CGAL::Convex_hull_constructive_traits_2`
\sa `CGAL::Projection_traits_xy_3`
diff --git a/Convex_hull_2/doc/Convex_hull_2/CGAL/convex_hull_constructive_traits_2.h b/Convex_hull_2/doc/Convex_hull_2/CGAL/convex_hull_constructive_traits_2.h
index 74534126ab7e..6090cd6785c1 100644
--- a/Convex_hull_2/doc/Convex_hull_2/CGAL/convex_hull_constructive_traits_2.h
+++ b/Convex_hull_2/doc/Convex_hull_2/CGAL/convex_hull_constructive_traits_2.h
@@ -11,7 +11,7 @@ in the sidedness tests, lines (of type `R::Line_2`) are constructed,
which is equivalent to the precomputation of subdeterminants of
the orientation-determinant for three points.
-\cgalModels `ConvexHullTraits_2`
+\cgalModels{ConvexHullTraits_2}
\sa `CGAL::Projection_traits_xy_3`
\sa `CGAL::Projection_traits_yz_3`
diff --git a/Convex_hull_2/doc/Convex_hull_2/CGAL/convex_hull_traits_2.h b/Convex_hull_2/doc/Convex_hull_2/CGAL/convex_hull_traits_2.h
index 5d3fb688ae01..431f04e1b46d 100644
--- a/Convex_hull_2/doc/Convex_hull_2/CGAL/convex_hull_traits_2.h
+++ b/Convex_hull_2/doc/Convex_hull_2/CGAL/convex_hull_traits_2.h
@@ -7,7 +7,7 @@ The class `Convex_hull_traits_2` serves as a traits class for all the two-dimens
convex hull and extreme point calculation function. This class corresponds
to the default traits class for these functions.
-\cgalModels `ConvexHullTraits_2`
+\cgalModels{ConvexHullTraits_2}
\sa `CGAL::Convex_hull_constructive_traits_2`
\sa `CGAL::Convex_hull_traits_adapter_2`
diff --git a/Convex_hull_3/doc/Convex_hull_3/CGAL/Convex_hull_traits_3.h b/Convex_hull_3/doc/Convex_hull_3/CGAL/Convex_hull_traits_3.h
index b02b0542e186..0258193c16f2 100644
--- a/Convex_hull_3/doc/Convex_hull_3/CGAL/Convex_hull_traits_3.h
+++ b/Convex_hull_3/doc/Convex_hull_3/CGAL/Convex_hull_traits_3.h
@@ -9,8 +9,7 @@ function when `R` is a kernel with exact predicates but inexact constructions
(note that the type `Plane_3` is a triple of `Point_3` and not `R::Plane_3`).
\tparam PolygonMesh must be a model of the concept `MutableFaceGraph`.
-\cgalModels `ConvexHullTraits_3`
-\cgalModels `IsStronglyConvexTraits_3`
+\cgalModels{ConvexHullTraits_3,IsStronglyConvexTraits_3}
\attention The user must include the header file of the polygon mesh type, even for the default type.
diff --git a/Convex_hull_3/doc/Convex_hull_3/CGAL/Extreme_points_traits_adapter_3.h b/Convex_hull_3/doc/Convex_hull_3/CGAL/Extreme_points_traits_adapter_3.h
index 5154ffa29686..9f63632758c2 100644
--- a/Convex_hull_3/doc/Convex_hull_3/CGAL/Extreme_points_traits_adapter_3.h
+++ b/Convex_hull_3/doc/Convex_hull_3/CGAL/Extreme_points_traits_adapter_3.h
@@ -15,8 +15,7 @@ namespace CGAL {
* (in practice we check `R::Has_filtered_predicates_tag` is `Tag_true` and `R::FT` is a floating point type),
* then the default traits class used is `Convex_hull_traits_3`, and `R` otherwise.
*
- * \cgalModels `ConvexHullTraits_3`
- * \cgalModels `IsStronglyConvexTraits_3`
+ * \cgalModels{ConvexHullTraits_3,IsStronglyConvexTraits_3}
*/
template
class Extreme_points_traits_adapter_3
diff --git a/Convex_hull_d/doc/Convex_hull_d/CGAL/Convex_hull_d_traits_3.h b/Convex_hull_d/doc/Convex_hull_d/CGAL/Convex_hull_d_traits_3.h
index 190d83f58fa8..dbba9f5c475f 100644
--- a/Convex_hull_d/doc/Convex_hull_d/CGAL/Convex_hull_d_traits_3.h
+++ b/Convex_hull_d/doc/Convex_hull_d/CGAL/Convex_hull_d_traits_3.h
@@ -13,7 +13,7 @@ low-dimensional standard kernel model, e.g. `Homogeneous