diff --git a/Optimisation_doc/doc_tex/Optimisation_ref/intro.tex b/Optimisation_doc/doc_tex/Optimisation_ref/intro.tex
index 4e28ec5578c..590291f496c 100644
--- a/Optimisation_doc/doc_tex/Optimisation_ref/intro.tex
+++ b/Optimisation_doc/doc_tex/Optimisation_ref/intro.tex
@@ -1,19 +1,5 @@
-%% =============================================================================
-%% The CGAL Reference Manual
-%% Chapter: Geometric Optimisation
-%% -----------------------------------------------------------------------------
-%% file   : doc_tex/basic/Optimisation/Optimisation_ref/intro.tex
-%% package: Optimisation_doc
-%% author : Sven Schönherr <sven@inf.ethz.ch>
-%% -----------------------------------------------------------------------------
-%% $Id$
-%% $Date$
-%% =============================================================================
 
-\newcommand{\inputOpt}[1]{\input{Optimisation_ref/#1.tex}}
 
-\newcommand{\linebreakByHand}{\ccTexHtml{\linebreak[4]}{}}
-\newcommand{  \newlineByHand}{\ccTexHtml{\\}{}}
 
 %% cross references
 \ccIndexSubitemSeeAlso{minimum enclosing}{smallest enclosing}
@@ -21,31 +7,19 @@
 \ccIndexSubitemSeeAlso{concentric spheres}{annulus}
 
 %% -----------------------------------------------------------------------------
-\ccRefChapter{Geometric Optimization}
+\ccRefChapter{Bounded Volumes}
 \ccChapterAuthor{Kaspar Fischer \and Bernd G{\"a}rtner \and Thomas Herrmann \and Michael Hoffmann
-  \and Eli Packer \and Sven Sch{\"o}nherr}
+   \and Sven Sch{\"o}nherr}
 
 
-This chapter describes concepts, classes, and functions for solving
-geometric optimization problems. They are divided into four categories.
+This chapter describes concepts, classes, and functions for bounding areas and volumes.
 
-\paragraph{Bounding Areas and Volumes.}
-Smallest enclosing circle and ellipse (2D), smallest enclosing rectangle,
+These are Smallest enclosing circle and ellipse (2D), smallest enclosing rectangle,
 parallelogram, and strip (2D), rectangular $p$-center (2D), smallest
 enclosing sphere and annulus (dD), approximate
 minimum-volume enclosing ellipsoid with user-specified
 approximation ratio (dD).
 
-\paragraph{Inscribed Areas.}
-Maximum area and perimeter inscribed $k$-gon (2D), extremal inscribed
-$k$-gon (2D), largest empty isorectangle (2D).
-
-\paragraph{Optimal Distances.}
-All furthest neigbors (2D), width of point set (3D), polytope distance (dD).
-
-\paragraph{Advanced Techniques.}
-Monotone and sorted matrix search.
-
 \section*{Assertions}
 The optimization code uses infix \ccc{OPTIMISATION} in the assertions,
 e.g.\ defining the compiler flag
@@ -100,96 +74,18 @@ checking off, cf.~Section~\ref{sec:checks}.
 \ccRefIdfierPage{CGAL::Min_sphere_of_spheres_d<Traits>}\\
 \ccRefConceptPage{MinSphereOfSpheresTraits}
 
-%% -----------------------------------------------------------------------------
-\subsection*{Inscribed Areas}
-
-\ccRefIdfierPage{CGAL::maximum_area_inscribed_k_gon_2}\\
-\ccRefIdfierPage{CGAL::maximum_perimeter_inscribed_k_gon_2}\\
-\ccRefIdfierPage{CGAL::extremal_polygon_2}\\
-\ccRefIdfierPage{CGAL::Largest_empty_iso_rectangle_2<T>}\\[1ex]
-\ccRefIdfierPage{CGAL::Extremal_polygon_area_traits_2<K>}\\
-\ccRefIdfierPage{CGAL::Extremal_polygon_perimeter_traits_2<K>}\\[1ex]
-\ccRefConceptPage{ExtremalPolygonTraits_2}\\
-\ccRefConceptPage{LargestEmptyIsoRectangleTraits_2}
-
-%% -----------------------------------------------------------------------------
-\subsection*{Optimal Distances}
-
-%%\ccRefIdfierPage{CGAL::width_2}%\\[1ex]
-%%\ccRefIdfierPage{CGAL::Min_quadrilateral_default_traits_2<K>}\\[1ex]
-%%\ccRefConceptPage{MinQuadrilateralTraits_2}
-
-%%\smallskip
-
-\ccRefIdfierPage{CGAL::all_furthest_neighbors_2}\\[1ex]
-%%\ccRefIdfierPage{CGAL::All_furthest_neighbors_default_traits_2<K>}\\[1ex]
-\ccRefConceptPage{AllFurthestNeighborsTraits_2}
-
-\smallskip
-
-\ccRefIdfierPage{CGAL::Width_3<Traits>}\\[1ex]
-\ccRefIdfierPage{CGAL::Width_default_traits_3<K>}\\[1ex]
-\ccRefConceptPage{WidthTraits_3}
-
-\smallskip
-
-\ccRefIdfierPage{CGAL::Polytope_distance_d<Traits>}\\[1ex]
-\ccRefIdfierPage{CGAL::Optimisation_d_traits_2<K,ET,NT>}\\
-\ccRefIdfierPage{CGAL::Optimisation_d_traits_3<K,ET,NT>}\\
-\ccRefIdfierPage{CGAL::Optimisation_d_traits_d<K,ET,NT>}\\[1ex]
-\ccRefConceptPage{OptimisationDTraits}
-
-%% -----------------------------------------------------------------------------
-\subsection*{Advanced Techniques}
-
-\ccRefIdfierPage{CGAL::monotone_matrix_search}\\[1ex]
-\ccRefIdfierPage{CGAL::Dynamic_matrix<M>}\\[1ex]
-\ccRefConceptPage{MonotoneMatrixSearchTraits}\\
-\ccRefConceptPage{BasicMatrix}
-
-\smallskip
-
-\ccRefIdfierPage{CGAL::sorted_matrix_search}\\[1ex]
-\ccRefIdfierPage{CGAL::Sorted_matrix_search_traits_adaptor<F,M>}\\[1ex]
-\ccRefConceptPage{SortedMatrixSearchTraits}
-
-\smallskip
-
-%% =============================================================================
-
-%% Bounding Areas and Volumes
-
-\inputOpt{main_Min_circle_2}
-\inputOpt{main_Min_ellipse_2}
-\inputOpt{main_Min_quadrilateral_2}
-\inputOpt{main_Rectangular_p_centers}
-
-\inputOpt{main_Min_sphere_d}
-\inputOpt{main_Min_annulus_d}
-
-\inputOpt{main_Min_sphere_of_spheres_d}
-\inputOpt{main_Approximate_min_ellipsoid_d}
-
-\inputOpt{main_Optimisation_d_traits}
-
-%% Inscribed Areas
-
-\inputOpt{main_Extremal_polygons}
-
-\inputOpt{main_Largest_empty_iso_rectangle_2}
-
-%% Optimal Distances
-
-\inputOpt{main_All_furthest_neighbors}
-
-\inputOpt{main_Width_3}
-
-\inputOpt{main_Polytope_distance_d}
 
 
-%% Advanced Techniques
+\input{Optimisation_ref/main_Min_circle_2.tex}
+\input{Optimisation_ref/main_Min_ellipse_2.tex}
+\input{Optimisation_ref/main_Min_quadrilateral_2.tex}
+\input{Optimisation_ref/main_Rectangular_p_centers.tex}
 
-\inputOpt{main_Matrix_search}
+\input{Optimisation_ref/main_Min_sphere_d.tex}
+\input{Optimisation_ref/main_Min_annulus_d.tex}
 
+\input{Optimisation_ref/main_Min_sphere_of_spheres_d.tex}
+\input{Optimisation_ref/main_Approximate_min_ellipsoid_d.tex}
+
+\input{Optimisation_ref/main_Optimisation_d_traits.tex}
 
-%% ===== EOF ===================================================================
diff --git a/Optimisation_doc/doc_tex/Optimisation_ref/main.tex b/Optimisation_doc/doc_tex/Optimisation_ref/main.tex
index 6a0cfc4219b..f89bc465890 100644
--- a/Optimisation_doc/doc_tex/Optimisation_ref/main.tex
+++ b/Optimisation_doc/doc_tex/Optimisation_ref/main.tex
@@ -1,18 +1,3 @@
-% =============================================================================
-% The CGAL Reference Manual
-% Chapter: Geometric Optimisation
-% -----------------------------------------------------------------------------
-% file   : doc_tex/basic/Optimisation/Optimisation_ref/main.tex
-% package: Optimisation_doc
-% author : Sven Schönherr <sven@inf.ethz.ch>
-% -----------------------------------------------------------------------------
-% $Id$
-% $Date$
-% =============================================================================
-
-%\section{Reference Pages}
 
 
 \input{Optimisation_ref/intro.tex}
-
-% ===== EOF ===================================================================