diff --git a/Voronoi_diagram_2/doc/Voronoi_diagram_2/CGAL/Voronoi_diagram_2.h b/Voronoi_diagram_2/doc/Voronoi_diagram_2/CGAL/Voronoi_diagram_2.h
index da0b896477d..0d6f3dfcee2 100644
--- a/Voronoi_diagram_2/doc/Voronoi_diagram_2/CGAL/Voronoi_diagram_2.h
+++ b/Voronoi_diagram_2/doc/Voronoi_diagram_2/CGAL/Voronoi_diagram_2.h
@@ -47,8 +47,8 @@ public:
     \cgalModels `LessThanComparable` 
 
     \sa `CGAL::Voronoi_diagram_2<DG,AT,AP>` 
-    \sa `CGAL::Voronoi_diagram_2<DG,AT,AP>::Vertex` 
-    \sa `CGAL::Voronoi_diagram_2<DG,AT,AP>::Halfedge` 
+    \sa \ref CGAL::Voronoi_diagram_2::Vertex "CGAL::Voronoi_diagram_2<DG,AT,AP>::Vertex" 
+    \sa \ref CGAL::Voronoi_diagram_2::Halfedge "CGAL::Voronoi_diagram_2<DG,AT,AP>::Halfedge"
     \sa `DelaunayGraph_2` 
 
   */
@@ -89,7 +89,7 @@ public:
       A type for a bidirectional 
       circulator over the halfedges on the boundary of the face. The value 
       type of the circulator is 
-      `CGAL::Voronoi_diagram_2<DG,AT,AP>::Halfedge`, and is convertible 
+      \ref CGAL::Voronoi_diagram_2::Halfedge "CGAL::Voronoi_diagram_2<DG,AT,AP>::Halfedge", and is convertible 
       to `Halfedge_handle`. 
     */ 
     typedef Hidden_type Ccb_halfedge_circulator; 
@@ -175,8 +175,8 @@ public:
     \cgalModels `LessThanComparable`
 
     \sa `CGAL::Voronoi_diagram_2<DG,AT,AP>` 
-    \sa `CGAL::Voronoi_diagram_2<DG,AT,AP>::Vertex` 
-    \sa `CGAL::Voronoi_diagram_2<DG,AT,AP>::Face` 
+    \sa \ref CGAL::Voronoi_diagram_2::Vertex "CGAL::Voronoi_diagram_2<DG,AT,AP>::Vertex"
+    \sa \ref CGAL::Voronoi_diagram_2::Face "CGAL::Voronoi_diagram_2<DG,AT,AP>::Face"
     \sa `DelaunayGraph_2` 
 
   */
@@ -217,7 +217,7 @@ public:
       A type for a bidirectional 
       circulator over the halfedges of the boundary of a 
       Voronoi face. The value type of the circulator is 
-      `CGAL::Voronoi_diagram_2<DG,AT,AP>::Halfedge` and is convertible to 
+      \ref CGAL::Voronoi_diagram_2::Halfedge "CGAL::Voronoi_diagram_2<DG,AT,AP>::Halfedge" and is convertible to 
       `Halfedge_handle`. 
     */ 
     typedef Hidden_type Ccb_halfedge_circulator; 
@@ -415,8 +415,8 @@ public:
     \cgalModels `LessThanComparable`
 
     \sa `CGAL::Voronoi_diagram_2<DG,AT,AP>` 
-    \sa `CGAL::Voronoi_diagram_2<DG,AT,AP>::Halfedge` 
-    \sa `CGAL::Voronoi_diagram_2<DG,AT,AP>::Face` 
+    \sa \ref CGAL::Voronoi_diagram_2::Halfedge "CGAL::Voronoi_diagram_2<DG,AT,AP>::Halfedge" 
+    \sa \ref CGAL::Voronoi_diagram_2::Face "CGAL::Voronoi_diagram_2<DG,AT,AP>::Face" 
     \sa `DelaunayGraph_2` 
 
   */
@@ -469,7 +469,7 @@ public:
       circulator that allows to traverse all incident halfedges, i.e., all 
       halfedges that have the vertex as their target. The value 
       type of the circulator is 
-      `CGAL::Voronoi_diagram_2<DG,AT,AP>::Halfedge` and is convertible to 
+      \ref CGAL::Voronoi_diagram_2::Halfedge "CGAL::Voronoi_diagram_2<DG,AT,AP>::Halfedge" and is convertible to 
       `Halfedge_handle`. 
     */ 
     typedef Hidden_type Halfedge_around_vertex_circulator; 
diff --git a/Voronoi_diagram_2/doc/Voronoi_diagram_2/examples.txt b/Voronoi_diagram_2/doc/Voronoi_diagram_2/examples.txt
new file mode 100644
index 00000000000..91b47161ac3
--- /dev/null
+++ b/Voronoi_diagram_2/doc/Voronoi_diagram_2/examples.txt
@@ -0,0 +1,3 @@
+/*!
+\example Voronoi_diagram_2/vd_2_point_location.cpp
+*/
\ No newline at end of file