diff --git a/Basic_viewer/doc/Basic_viewer/Basic_viewer.txt b/Basic_viewer/doc/Basic_viewer/Basic_viewer.txt
index 87f101bafea..ff81f476c0b 100644
--- a/Basic_viewer/doc/Basic_viewer/Basic_viewer.txt
+++ b/Basic_viewer/doc/Basic_viewer/Basic_viewer.txt
@@ -29,7 +29,7 @@ Drawing_functor
 
 \subsection Basic_viewerExamples_simple_draw Basic draw
 
-\cgalExample{Linear_cell_complex/draw_linear_cell_complex.cpp}
+\cgalExample{Surface_mesh/draw_surface_mesh.cpp}
 
 
 \subsection Basic_viewerExamples_custom_color Change Face Colors
diff --git a/Basic_viewer/doc/Basic_viewer/CGAL/Qt/Basic_viewer_qt.h b/Basic_viewer/doc/Basic_viewer/CGAL/Qt/Basic_viewer_qt.h
index 51e3f4ecfc8..3bfad55352d 100644
--- a/Basic_viewer/doc/Basic_viewer/CGAL/Qt/Basic_viewer_qt.h
+++ b/Basic_viewer/doc/Basic_viewer/CGAL/Qt/Basic_viewer_qt.h
@@ -246,7 +246,8 @@ public:
 */
 template <typename BufferType=float>
 void draw_graphic_storage(Graphic_storage<BufferType>& graphic_buffer,
-                          const char *title="CGAL Basic Viewer");
+                          const char *title="CGAL Basic Viewer")
+{}
 
 } // End namespace CGAL
 
diff --git a/Basic_viewer/doc/Basic_viewer/Doxyfile.in b/Basic_viewer/doc/Basic_viewer/Doxyfile.in
index 2082ff842dc..8b325940a19 100644
--- a/Basic_viewer/doc/Basic_viewer/Doxyfile.in
+++ b/Basic_viewer/doc/Basic_viewer/Doxyfile.in
@@ -1,3 +1,5 @@
 @INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS}
 
 PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - CGAL Basic Viewer"
+
+EXAMPLE_PATH += ${CGAL_Surface_mesh_EXAMPLE_DIR}
\ No newline at end of file
diff --git a/Basic_viewer/doc/Basic_viewer/PackageDescription.txt b/Basic_viewer/doc/Basic_viewer/PackageDescription.txt
index c250d939dd2..2c77cc1aac4 100644
--- a/Basic_viewer/doc/Basic_viewer/PackageDescription.txt
+++ b/Basic_viewer/doc/Basic_viewer/PackageDescription.txt
@@ -10,7 +10,7 @@
 \cgalPkgSummaryBegin
 \cgalPkgAuthor{Guillaume Damiand}
 \cgalPkgDesc{This package implements basic viewer class.}
-\cgalPkgManuals{Chapter_Basic_Viewer,PkgBasicViewerRef}
+\cgalPkgManuals{Chapter_Basic_viewer,PkgBasicViewerRef}
 \cgalPkgSummaryEnd
 \cgalPkgShortInfoBegin
 \cgalPkgSince{6.0}
@@ -28,12 +28,12 @@
 - `CGAL::Basic_viewer_qt<BufferType>`
 - `CGAL::QApplication_and_basic_viewer<BufferType>`
 
-\cgalCRPSubsection{Draw functions of a graphic storage}
+\cgalCRPSubsection{Draw a Graphic Storage}
 
 - `CGAL::draw_graphic_storage()`
 
 
-\cgalCRPSubsection{Draw functions for different packages}
+\cgalCRPSubsection{Draw for Different Packages}
 
 - \link PkgDrawTriangulation2 Constrained_triangulation_2 CGAL::draw<CT2>() \endlink
 - \link PkgDrawLinearCellComplex Linear_cell_complex CGAL::draw<LCC>() \endlink
@@ -50,8 +50,22 @@
 - \link PkgDrawTriangulation3 Triangulation_3 CGAL::draw<T3>() \endlink
 - \link PkgDrawVoronoiDiagram2 Voronoi_diagram_2 CGAL::draw<V2>() \endlink
 
-\cgalCRPSubsection{Fill graphic storage functions}
-- \link PkgDrawLinearCellComplex CGAL::CGAL::add_in_graphic_storage<LCC, BufferType, DrawingFunctor>() \endlink
+\cgalCRPSubsection{Fill Graphic Storage for Different Packages}
+
+- \link PkgDrawTriangulation2 Constrained_triangulation_2 CGAL::add_in_graphic_storage<CT2>() \endlink
+- \link PkgDrawLinearCellComplex Linear_cell_complex CGAL::add_in_graphic_storage<LCC>() \endlink
+- \link PkgDrawNef3 Nef_polyhedron_3 CGAL::add_in_graphic_storage<Nef3>() \endlink
+- \link PkgDrawPeriodic2Triangulation2 Periodic_2_Triangulation_2 CGAL::add_in_graphic_storage<P2T2>() \endlink
+- \link PkgDrawPointSet3D Point_set_3 CGAL::add_in_graphic_storage<PS>() \endlink
+- \link PkgDrawPolygon2 Polygon_2 CGAL::add_in_graphic_storage<P2>() \endlink
+- \link PkgDrawPolygonSet2 Polygon_set_2 CGAL::add_in_graphic_storage<PS>() \endlink
+- \link PkgDrawPolygonWithHoles2 Polygon_with_holes_2 CGAL::add_in_graphic_storage<PH2>() \endlink
+- \link PkgDrawPolyhedron Polyhedron_3 CGAL::add_in_graphic_storage<POLY>() \endlink
+- \link PkgDrawSurfaceMesh Surface_mesh CGAL::add_in_graphic_storage<SM>() \endlink
+- \link PkgDrawFaceGraphWithPaths Surface_mesh_topology CGAL::add_in_graphic_storage<SMT>() \endlink
+- \link PkgDrawTriangulation2 Triangulation_2 CGAL::add_in_graphic_storage<T2>() \endlink
+- \link PkgDrawTriangulation3 Triangulation_3 CGAL::add_in_graphic_storage<T3>() \endlink
+- \link PkgDrawVoronoiDiagram2 Voronoi_diagram_2 CGAL::add_in_graphic_storage<V2>() \endlink
 
 */
 
diff --git a/Basic_viewer/doc/Basic_viewer/dependencies b/Basic_viewer/doc/Basic_viewer/dependencies
index 5e5f8885e7b..67a91f218f5 100644
--- a/Basic_viewer/doc/Basic_viewer/dependencies
+++ b/Basic_viewer/doc/Basic_viewer/dependencies
@@ -1,12 +1,11 @@
 Manual
 Boolean_set_operations_2
-Constrained_triangulation_2
 Linear_cell_complex
-Nef_polyhedron_3
-Periodic_2_Triangulation_2
+Nef_3
+Periodic_2_triangulation_2
 Point_set_3
-Polygon_2
-Polyhedron_3
+Polygon
+Polyhedron
 Surface_mesh
 Surface_mesh_topology
 Triangulation_2
diff --git a/Basic_viewer/doc/Basic_viewer/examples.txt b/Basic_viewer/doc/Basic_viewer/examples.txt
index 1deef74b4f8..0a13e1c0f6f 100644
--- a/Basic_viewer/doc/Basic_viewer/examples.txt
+++ b/Basic_viewer/doc/Basic_viewer/examples.txt
@@ -1,5 +1,5 @@
 /*!
-\example Linear_cell_complex/draw_linear_cell_complex.cpp
+\example Surface_mesh/draw_surface_mesh.cpp
 \example Basic_viewer/draw_mesh_and_points.cpp
 \example Basic_viewer/draw_several_windows.cpp
 \example Basic_viewer/draw_surface_mesh_height.cpp