diff --git a/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeVertex_2.h b/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeVertex_2.h
index 31d42af3f27..e9b4fd41b6a 100644
--- a/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeVertex_2.h
+++ b/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/AlphaShapeVertex_2.h
@@ -5,6 +5,7 @@
 
 \refines ::TriangulationVertexBase_2. 
 
+\hasModel `CGAL::Alpha_shape_vertex_base_2`
 */
 class AlphaShapeVertex_2 {
 public:
diff --git a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel.h b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel.h
index 7ea9a45661e..b921fc6d238 100644
--- a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel.h
+++ b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel.h
@@ -7,8 +7,8 @@ namespace CGAL {
 A typedef to a kernel which has the following properties: 
 
 <UL> 
-<LI>It uses Cartesian representation. 
-<LI>It supports constructions of points from <TT>double</TT> Cartesian 
+<LI>It uses %Cartesian representation. 
+<LI>It supports constructions of points from `double` %Cartesian 
 coordinates. 
 <LI>It provides both exact geometric predicates and exact geometric 
 constructions. 
diff --git a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h
index d063b2c69bd..7a8cf7148a8 100644
--- a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h
+++ b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h
@@ -7,8 +7,8 @@ namespace CGAL {
 A typedef to a kernel which has the following properties: 
 
 <UL> 
-<LI>It uses Cartesian representation. 
-<LI>It supports constructions of points from <TT>double</TT> Cartesian 
+<LI>It uses %Cartesian representation. 
+<LI>It supports constructions of points from double` %Cartesian 
 coordinates. 
 <LI>It provides both exact geometric predicates and exact geometric 
 constructions. 
diff --git a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_inexact_constructions_kernel.h b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_inexact_constructions_kernel.h
index ca516abc2d0..01caf9c7d54 100644
--- a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_inexact_constructions_kernel.h
+++ b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_inexact_constructions_kernel.h
@@ -7,8 +7,8 @@ namespace CGAL {
 A typedef to a kernel which has the following properties: 
 
 <UL> 
-<LI>It uses Cartesian representation. 
-<LI>It supports constructions of points from <TT>double</TT> Cartesian 
+<LI>It uses %Cartesian representation. 
+<LI>It supports constructions of points from `double` %Cartesian 
 coordinates. 
 <LI>It provides exact geometric predicates, but inexact geometric 
 constructions. 
diff --git a/Kernel_23/doc/Kernel_23/CGAL/Projection_traits_xy_3.h b/Kernel_23/doc/Kernel_23/CGAL/Projection_traits_xy_3.h
index 7763623f150..2e84a666c43 100644
--- a/Kernel_23/doc/Kernel_23/CGAL/Projection_traits_xy_3.h
+++ b/Kernel_23/doc/Kernel_23/CGAL/Projection_traits_xy_3.h
@@ -29,7 +29,6 @@ and predicates defined in `K`.
 \models ::TriangulationTraits_2 
 \models ::DelaunayTriangulationTraits_2 
 \models ::ConstrainedTriangulationTraits_2 
-\models ::PolygonTraits_2 
 \models ::ConvexHullTraits_2 
 
 */
diff --git a/Kernel_23/doc/Kernel_23/Concepts/Kernel.h b/Kernel_23/doc/Kernel_23/Concepts/Kernel.h
index 2bd728a03e8..7526d1cad7d 100644
--- a/Kernel_23/doc/Kernel_23/Concepts/Kernel.h
+++ b/Kernel_23/doc/Kernel_23/Concepts/Kernel.h
@@ -15,11 +15,11 @@ The former replace constructors of the kernel classes and constructive
 procedures in the kernel. There are also function objects replacing operators, 
 especially for equality testing. 
 
-\hasModel CGAL::Cartesian<FieldNumberType> 
-\hasModel CGAL::Homogeneous<RingNumberType> 
-\hasModel CGAL::Simple_cartesian<FieldNumberType> 
-\hasModel CGAL::Simple_homogeneous<RingNumberType> 
-\hasModel CGAL::Filtered_kernel<CK> 
+\hasModel `CGAL::Cartesian<FieldNumberType>` 
+\hasModel `CGAL::Homogeneous<RingNumberType>`
+\hasModel `CGAL::Simple_cartesian<FieldNumberType>` 
+\hasModel `CGAL::Simple_homogeneous<RingNumberType>` 
+\hasModel `CGAL::Filtered_kernel<CK>`
 \hasModel CGAL::Exact_predicates_exact_constructions_kernel 
 \hasModel CGAL::Exact_predicates_exact_constructions_kernel_with_sqrt 
 \hasModel CGAL::Exact_predicates_inexact_constructions_kernel 
diff --git a/Partition_2/doc/Partition_2/CGAL/Partition_is_valid_traits_2.h b/Partition_2/doc/Partition_2/CGAL/Partition_is_valid_traits_2.h
index 8f16b78281d..6047d1d05be 100644
--- a/Partition_2/doc/Partition_2/CGAL/Partition_is_valid_traits_2.h
+++ b/Partition_2/doc/Partition_2/CGAL/Partition_is_valid_traits_2.h
@@ -3,7 +3,7 @@ namespace CGAL {
 /*!
 \ingroup PkgPolygonPartitioning2
 
-Class that derives a traits class for `partition_is_valid_2` from 
+Class that derives a traits class for `::partition_is_valid_2` from 
 a given traits class by defining the validity testing function object 
 in terms of a supplied template parameter. 
 
diff --git a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphStorageSite_2.h b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphStorageSite_2.h
index ebdfef6ddb9..4035828e5b8 100644
--- a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphStorageSite_2.h
+++ b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/Concepts/SegmentDelaunayGraphStorageSite_2.h
@@ -13,7 +13,7 @@ by storing handles to points instead of points.
 \refines ::CopyConstructible 
 \refines ::Assignable 
 
-\hasModel CGAL::Segment_Delaunay_graph_storage_site_2<Gt> 
+\hasModel `CGAL::Segment_Delaunay_graph_storage_site_2<Gt>` 
 
 \sa `SegmentDelaunayGraphTraits_2` 
 \sa `CGAL::Segment_Delaunay_graph_site_2<K>` 
diff --git a/Snap_rounding_2/doc/Snap_rounding_2/Concepts/SnapRoundingTraits_2.h b/Snap_rounding_2/doc/Snap_rounding_2/Concepts/SnapRoundingTraits_2.h
index f25ff76bf33..981a24d37d7 100644
--- a/Snap_rounding_2/doc/Snap_rounding_2/Concepts/SnapRoundingTraits_2.h
+++ b/Snap_rounding_2/doc/Snap_rounding_2/Concepts/SnapRoundingTraits_2.h
@@ -16,9 +16,9 @@ predicates on those primitives.
 \refines ::SweepLineTraits_2
 \refines An instance of this concept is used as the traits class for the `CGAL::Sweep_line_2::get_intersection_points()` operation. The requirements listed below are induced by components of the `CGAL::snap_rounding_2` function other than the call to `CGAL::Sweep_line_2::get_intersection_points()`. Naturally, some of them may already be listed in `SweepLineTraits_2`. 
 
-\hasModel CGAL::Snap_rounding_traits 
+\hasModel `CGAL::Snap_rounding_traits<Kernel>` 
 
-\sa `CGAL::Snap_rounding_2<Traits>` 
+\sa `CGAL::Snap_rounding_2<Kernel>` 
 
 */