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 1c8005e7d4c..be3476fdc80 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
@@ -44,10 +44,10 @@ creates copies of the boxes that would not have identical
 
 \cgalModels `BoxIntersectionBox_d`
 
-\sa `CGAL::box_intersection_d` 
-\sa `CGAL::box_self_intersection_d` 
-\sa `CGAL::box_intersection_all_pairs_d` 
-\sa `CGAL::box_self_intersection_all_pairs_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
+\sa \link PkgBoxIntersectionD_box_intersection_all_pairs_d `CGAL::box_intersection_all_pairs_d()` \endlink
+\sa \link PkgBoxIntersectionD_box_self_intersection_all_pairs_d `CGAL::box_self_intersection_all_pairs_d()` \endlink
 \sa `CGAL::Box_intersection_d::Box_with_handle_d<NT, int D, Handle, IdPolicy>` 
 \sa `CGAL::Box_intersection_d::Box_traits_d<BoxHandle>` 
 \sa `BoxIntersectionTraits_d` 
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 e46d8ef3361..cf88a003dad 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
@@ -24,9 +24,10 @@ const-pointer `const B*`, where `B` is a model of the
 
 \cgalModels `BoxIntersectionTraits_d`
 
-\sa `CGAL::box_intersection_d()` 
-\sa `CGAL::box_self_intersection_d()` 
-\sa `CGAL::box_intersection_all_pairs_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
+\sa \link PkgBoxIntersectionD_box_intersection_all_pairs_d `CGAL::box_intersection_all_pairs_d()` \endlink
+\sa \link PkgBoxIntersectionD_box_self_intersection_all_pairs_d `CGAL::box_self_intersection_all_pairs_d()` \endlink
 \sa `BoxIntersectionBox_d` 
 \sa `CGAL::Box_intersection_d::Box_d<NT,int D,IdPolicy>` 
 
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 58bd7e83021..21e3d4fe59c 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
@@ -54,10 +54,10 @@ the safe default implementation.
 
 \cgalModels `BoxIntersectionBox_d`
 
-\sa `CGAL::box_intersection_d` 
-\sa `CGAL::box_self_intersection_d` 
-\sa `CGAL::box_intersection_all_pairs_d` 
-\sa `CGAL::box_self_intersection_all_pairs_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
+\sa \link PkgBoxIntersectionD_box_intersection_all_pairs_d `CGAL::box_intersection_all_pairs_d()` \endlink
+\sa \link PkgBoxIntersectionD_box_self_intersection_all_pairs_d `CGAL::box_self_intersection_all_pairs_d()` \endlink
 \sa `CGAL::Box_intersection_d::Box_traits_d<BoxHandle>` 
 \sa `BoxIntersectionTraits_d` 
 
diff --git a/Box_intersection_d/doc/Box_intersection_d/CGAL/box_intersection_d.h b/Box_intersection_d/doc/Box_intersection_d/CGAL/box_intersection_d.h
index 74bdc7e8d47..f11dfdb58ca 100644
--- a/Box_intersection_d/doc/Box_intersection_d/CGAL/box_intersection_d.h
+++ b/Box_intersection_d/doc/Box_intersection_d/CGAL/box_intersection_d.h
@@ -49,9 +49,9 @@ namespace CGAL {
   offer a specialized implementation 
   `box_self_intersection_all_pairs` for this application. 
 
-  \sa `CGAL::box_intersection_d()` 
-  \sa `CGAL::box_self_intersection_d()` 
-  \sa `CGAL::box_self_intersection_all_pairs_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
+  \sa \link PkgBoxIntersectionD_box_self_intersection_all_pairs_d `CGAL::box_self_intersection_all_pairs_d()` \endlink
   \sa `CGAL::Box_intersection_d::Box_traits_d<BoxHandle>` 
   \sa `BoxIntersectionBox_d` 
   \sa `BoxIntersectionTraits_d` 
@@ -148,8 +148,8 @@ namespace CGAL {
   <LI>`BoxTraits` must be of the `BoxIntersectionTraits_d` concept. 
   </UL> 
 
-  \sa `CGAL::box_self_intersection_d()` 
-  \sa `CGAL::box_intersection_all_pairs_d()` 
+  \sa \link PkgBoxIntersectionD_box_self_intersection_d `CGAL::box_self_intersection_d()` \endlink
+  \sa \link PkgBoxIntersectionD_box_intersection_all_pairs_d `CGAL::box_intersection_all_pairs_d()` \endlink
   \sa `CGAL::Box_intersection_d::Box_traits_d<BoxHandle>` 
   \sa `BoxIntersectionBox_d` 
   \sa `BoxIntersectionTraits_d` 
@@ -344,9 +344,9 @@ namespace CGAL {
   <LI>`BoxTraits` must be of the `BoxIntersectionTraits_d` concept. 
   </UL> 
 
-  \sa `CGAL::box_intersection_d()` 
-  \sa `CGAL::box_self_intersection_d()` 
-  \sa `CGAL::box_intersection_all_pairs_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
+  \sa \link PkgBoxIntersectionD_box_intersection_all_pairs_d `CGAL::box_intersection_all_pairs_d()` \endlink
   \sa `CGAL::Box_intersection_d::Box_traits_d<BoxHandle>` 
   \sa `BoxIntersectionBox_d` 
   \sa `BoxIntersectionTraits_d` 
@@ -464,8 +464,8 @@ namespace CGAL {
   <LI>`BoxTraits` must be of the `BoxIntersectionTraits_d` concept. 
   </UL> 
 
-  \sa `CGAL::box_intersection_d()` 
-  \sa `CGAL::box_self_intersection_all_pairs_d()` 
+  \sa \link PkgBoxIntersectionD_box_intersection_d `CGAL::box_intersection_d()` \endlink
+  \sa \link PkgBoxIntersectionD_box_self_intersection_all_pairs_d `CGAL::box_self_intersection_all_pairs_d()` \endlink
   \sa `CGAL::Box_intersection_d::Box_traits_d<BoxHandle>` 
   \sa `BoxIntersectionBox_d` 
   \sa `BoxIntersectionTraits_d` 
diff --git a/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionBox_d.h b/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionBox_d.h
index 8337f74695f..e8788e896e4 100644
--- a/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionBox_d.h
+++ b/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionBox_d.h
@@ -13,10 +13,10 @@ the dimension, the `id`-number, and the boundaries of the box.
 \cgalHasModel CGAL::Box_intersection_d::Box_d
 \cgalHasModel CGAL::Box_intersection_d::Box_with_handle_d
 
-\sa `CGAL::box_intersection_d` 
-\sa `CGAL::box_self_intersection_d` 
-\sa `CGAL::box_intersection_all_pairs_d` 
-\sa `CGAL::box_self_intersection_all_pairs_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
+\sa \link PkgBoxIntersectionD_box_intersection_all_pairs_d `CGAL::box_intersection_all_pairs_d()` \endlink
+\sa \link PkgBoxIntersectionD_box_self_intersection_all_pairs_d `CGAL::box_self_intersection_all_pairs_d()` \endlink
 \sa `CGAL::Box_intersection_d::Box_traits_d<BoxHandle>` 
 \sa `BoxIntersectionTraits_d` 
 
diff --git a/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionTraits_d.h b/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionTraits_d.h
index 7f25cd14401..230fa392810 100644
--- a/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionTraits_d.h
+++ b/Box_intersection_d/doc/Box_intersection_d/Concepts/BoxIntersectionTraits_d.h
@@ -11,10 +11,10 @@ the boxes manipulated in these algorithms.
 
 \cgalHasModel CGAL::Box_intersection_d::Box_traits_d
 
-\sa `CGAL::box_intersection_d` 
-\sa `CGAL::box_self_intersection_d` 
-\sa `CGAL::box_intersection_all_pairs_d` 
-\sa `CGAL::box_self_intersection_all_pairs_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
+\sa \link PkgBoxIntersectionD_box_intersection_all_pairs_d `CGAL::box_intersection_all_pairs_d()` \endlink
+\sa \link PkgBoxIntersectionD_box_self_intersection_all_pairs_d `CGAL::box_self_intersection_all_pairs_d()` \endlink
 
 */
 
diff --git a/Box_intersection_d/doc/Box_intersection_d/PackageDescription.txt b/Box_intersection_d/doc/Box_intersection_d/PackageDescription.txt
index 35f939bf075..28464a2840e 100644
--- a/Box_intersection_d/doc/Box_intersection_d/PackageDescription.txt
+++ b/Box_intersection_d/doc/Box_intersection_d/PackageDescription.txt
@@ -5,17 +5,17 @@
 /// \defgroup PkgBoxIntersectionDClasses Classes
 /// \ingroup PkgBoxIntersectionD
 
-/// \defgroup PkgBoxIntersectionD_box_intersection_d box_intersection_d
+/// \defgroup PkgBoxIntersectionD_box_intersection_d CGAL::box_intersection_d()
 /// \ingroup PkgBoxIntersectionD
 
 
-/// \defgroup PkgBoxIntersectionD_box_intersection_all_pairs_d box_intersection_all_pairs_d
+/// \defgroup PkgBoxIntersectionD_box_intersection_all_pairs_d CGAL::box_intersection_all_pairs_d()
 /// \ingroup PkgBoxIntersectionD
 
-/// \defgroup PkgBoxIntersectionD_box_self_intersection_d box_self_intersection_d
+/// \defgroup PkgBoxIntersectionD_box_self_intersection_d CGAL::box_self_intersection_d()
 /// \ingroup PkgBoxIntersectionD
 
-/// \defgroup PkgBoxIntersectionD_box_self_intersection_all_pairs_d box_self_intersection_all_pairs_d
+/// \defgroup PkgBoxIntersectionD_box_self_intersection_all_pairs_d CGAL::box_self_intersection_all_pairs_d()
 /// \ingroup PkgBoxIntersectionD
 /*!
 \addtogroup PkgBoxIntersectionD