diff --git a/AABB_tree/doc/AABB_tree/PackageDescription.txt b/AABB_tree/doc/AABB_tree/PackageDescription.txt
index d59794e62d5..c032420bb76 100644
--- a/AABB_tree/doc/AABB_tree/PackageDescription.txt
+++ b/AABB_tree/doc/AABB_tree/PackageDescription.txt
@@ -8,7 +8,7 @@
\cgalPkgDescriptionBegin{3D Fast Intersection and Distance Computation,PkgAABBTree}
\cgalPkgPicture{aabb-teaser-thumb.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Pierre Alliez, Stéphane Tayeb, Camille Wormser}
+\cgalPkgAuthors{Pierre Alliez, Stéphane Tayeb, and Camille Wormser}
\cgalPkgDesc{The AABB (axis-aligned bounding box) tree component offers a static data structure and algorithms to perform efficient intersection and distance queries on sets of finite 3D geometric objects.}
\cgalPkgManuals{Chapter_3D_Fast_Intersection_and_Distance_Computation,PkgAABBTreeRef}
\cgalPkgSummaryEnd
diff --git a/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/PackageDescription.txt b/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/PackageDescription.txt
index 5d50c10442c..2c89df6007e 100644
--- a/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/PackageDescription.txt
+++ b/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/PackageDescription.txt
@@ -9,7 +9,7 @@
\cgalPkgDescriptionBegin{Advancing Front Surface Reconstruction,PkgAdvancingFrontSurfaceReconstruction}
\cgalPkgPicture{afsr-detail.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Tran Kai Frank Da, David Cohen-Steiner}
+\cgalPkgAuthors{Tran Kai Frank Da, and David Cohen-Steiner}
\cgalPkgDesc{This package provides a greedy algorithm for surface reconstruction from an
unorganized point set. Starting from a seed facet, a piecewise linear
surface is grown by adding Delaunay triangles one by one. The most
diff --git a/Alpha_shapes_2/doc/Alpha_shapes_2/PackageDescription.txt b/Alpha_shapes_2/doc/Alpha_shapes_2/PackageDescription.txt
index 4d777772e4b..78941b31d7d 100644
--- a/Alpha_shapes_2/doc/Alpha_shapes_2/PackageDescription.txt
+++ b/Alpha_shapes_2/doc/Alpha_shapes_2/PackageDescription.txt
@@ -8,7 +8,7 @@
\cgalPkgDescriptionBegin{2D Alpha Shapes,PkgAlphaShapes2}
\cgalPkgPicture{alpha-detail.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Tran Kai Frank Da}
+\cgalPkgAuthor{Tran Kai Frank Da}
\cgalPkgDesc{This package offers a data structure encoding the whole family of alpha-complexes related to a given 2D Delaunay or regular triangulation. In particular, the data structure allows to retrieve the alpha-complex for any alpha value, the whole spectrum of critical alpha values and a filtration on the triangulation faces (this filtration is based on the first alpha value for which each face is included on the alpha-complex).}
\cgalPkgManuals{Chapter_2D_Alpha_Shapes,PkgAlphaShapes2Ref}
\cgalPkgSummaryEnd
diff --git a/Alpha_wrap_3/doc/Alpha_wrap_3/PackageDescription.txt b/Alpha_wrap_3/doc/Alpha_wrap_3/PackageDescription.txt
index a3345d28971..883ea17c9f3 100644
--- a/Alpha_wrap_3/doc/Alpha_wrap_3/PackageDescription.txt
+++ b/Alpha_wrap_3/doc/Alpha_wrap_3/PackageDescription.txt
@@ -9,7 +9,7 @@
\cgalPkgDescriptionBegin{3D Alpha Wrapping,PkgAlphaWrap3}
\cgalPkgPicture{alpha_wrap_3.jpg}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Pierre Alliez, David Cohen-Steiner, Michael Hemmer, Cédric Portaneri, Mael Rouxel-Labbé}
+\cgalPkgAuthors{Pierre Alliez, David Cohen-Steiner, Michael Hemmer, Cédric Portaneri, and Mael Rouxel-Labbé}
\cgalPkgDesc{This component takes a 3D triangle mesh, a triangle soup, or a point set as input, and generates
a valid triangulated surface mesh that strictly contains the input (watertight, intersection-free
and 2-manifold). The algorithm proceeds by shrink-wrapping
diff --git a/Apollonius_graph_2/doc/Apollonius_graph_2/PackageDescription.txt b/Apollonius_graph_2/doc/Apollonius_graph_2/PackageDescription.txt
index f82d98db1ed..cf2a0d05cae 100644
--- a/Apollonius_graph_2/doc/Apollonius_graph_2/PackageDescription.txt
+++ b/Apollonius_graph_2/doc/Apollonius_graph_2/PackageDescription.txt
@@ -7,7 +7,7 @@
\cgalPkgDescriptionBegin{2D Apollonius Graphs (Delaunay Graphs of Disks),PkgApolloniusGraph2}
\cgalPkgPicture{CircleVoronoi.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Menelaos Karavelas and Mariette Yvinec}
+\cgalPkgAuthors{Menelaos Karavelas, and Mariette Yvinec}
\cgalPkgDesc{Algorithms for computing the Apollonius graph in two dimensions. The Apollonius graph is the dual of the Apollonius diagram, also known as the additively weighted Voronoi diagram. The latter can be thought of as the Voronoi diagram of a set of disks under the Euclidean metric, and it is a generalization of the standard Voronoi diagram for points. The algorithms provided are dynamic.}
\cgalPkgManuals{Chapter_2D_Apollonius_Graphs,PkgApolloniusGraph2Ref}
\cgalPkgSummaryEnd
diff --git a/Classification/doc/Classification/PackageDescription.txt b/Classification/doc/Classification/PackageDescription.txt
index 32736fae273..030daefb299 100644
--- a/Classification/doc/Classification/PackageDescription.txt
+++ b/Classification/doc/Classification/PackageDescription.txt
@@ -65,7 +65,7 @@ Data structures specialized to classify clusters.
\cgalPkgPicture{data_classif.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Simon Giraudot, Florent Lafarge}
+\cgalPkgAuthors{Simon Giraudot, and Florent Lafarge}
\cgalPkgDesc{This component implements an algorithm that classifies a data set into a user-defined set of labels (such as ground, vegetation, buildings, etc.). A flexible API is provided so that users can classify any type of data, compute their own local features on the input data set, and define their own labels.}
\cgalPkgManuals{Chapter_Classification, PkgClassificationRef}
\cgalPkgSummaryEnd
diff --git a/Cone_spanners_2/doc/Cone_spanners_2/PackageDescription.txt b/Cone_spanners_2/doc/Cone_spanners_2/PackageDescription.txt
index 9dfe45083f8..6b59b805a38 100644
--- a/Cone_spanners_2/doc/Cone_spanners_2/PackageDescription.txt
+++ b/Cone_spanners_2/doc/Cone_spanners_2/PackageDescription.txt
@@ -7,7 +7,7 @@
\cgalPkgPicture{Logo-ConeSpanners.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Weisheng Si, Quincy Tse and Frédérik Paradis}
+\cgalPkgAuthors{Weisheng Si, Quincy Tse, and Frédérik Paradis}
\cgalPkgDesc{This package provides functors for constructing two kinds of cone-based spanners:
Yao graph and Theta graph, given a set of vertices on the plane and the directions of cone boundaries.
Both exact and inexact constructions are supported.
diff --git a/Convex_hull_2/doc/Convex_hull_2/PackageDescription.txt b/Convex_hull_2/doc/Convex_hull_2/PackageDescription.txt
index 7fa7625b04f..7d1cbcd4b37 100644
--- a/Convex_hull_2/doc/Convex_hull_2/PackageDescription.txt
+++ b/Convex_hull_2/doc/Convex_hull_2/PackageDescription.txt
@@ -24,7 +24,7 @@
\cgalPkgDescriptionBegin{2D Convex Hulls and Extreme Points,PkgConvexHull2}
\cgalPkgPicture{Convex_hull_2/fig/convex_hull.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Susan Hert and Stefan Schirra}
+\cgalPkgAuthors{Susan Hert, and Stefan Schirra}
\cgalPkgDesc{This package provides functions for computing convex hulls in two dimensions as well as functions for checking if sets of points are strongly convex are not. There are also a number of functions described for computing particular extreme points and subsequences of hull points, such as the lower and upper hull of a set of points.}
\cgalPkgManuals{Chapter_2D_Convex_Hulls_and_Extreme_Points,PkgConvexHull2Ref}
\cgalPkgSummaryEnd
diff --git a/Convex_hull_3/doc/Convex_hull_3/PackageDescription.txt b/Convex_hull_3/doc/Convex_hull_3/PackageDescription.txt
index acadb02ed7e..77354561900 100644
--- a/Convex_hull_3/doc/Convex_hull_3/PackageDescription.txt
+++ b/Convex_hull_3/doc/Convex_hull_3/PackageDescription.txt
@@ -26,7 +26,7 @@ degenerate hull may also be possible.
\cgalPkgDescriptionBegin{3D Convex Hulls,PkgConvexHull3}
\cgalPkgPicture{Convex_hull_3/fig/bunny.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Susan Hert and Stefan Schirra}
+\cgalPkgAuthors{Susan Hert, and Stefan Schirra}
\cgalPkgDesc{This package provides functions for computing convex hulls in three dimensions as well as functions for checking if sets of points are strongly convex or not. One can compute the convex hull of a set of points in three dimensions in two ways: using a static algorithm or using a triangulation to get a fully dynamic computation.}
\cgalPkgManuals{Chapter_3D_Convex_Hulls,PkgConvexHull3Ref}
\cgalPkgSummaryEnd
diff --git a/Convex_hull_d/doc/Convex_hull_d/PackageDescription.txt b/Convex_hull_d/doc/Convex_hull_d/PackageDescription.txt
index a1a4b8a3de1..9bc7d01aecd 100644
--- a/Convex_hull_d/doc/Convex_hull_d/PackageDescription.txt
+++ b/Convex_hull_d/doc/Convex_hull_d/PackageDescription.txt
@@ -7,7 +7,7 @@
\cgalPkgDescriptionBegin{dD Convex Hulls and Delaunay Triangulations,PkgConvexHullD}
\cgalPkgPicture{convex_hull_d-teaser.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Susan Hert and Michael Seel}
+\cgalPkgAuthors{Susan Hert, and Michael Seel}
\cgalPkgDesc{This package provides functions for computing convex hulls and Delaunay triangulations in \f$ d\f$-dimensional Euclidean space.}
\cgalPkgManuals{Chapter_dD_Convex_Hulls_and_Delaunay_Triangulations,PkgConvexHullDRef}
\cgalPkgSummaryEnd
diff --git a/Documentation/doc/resources/1.9.3/BaseDoxyfile.in b/Documentation/doc/resources/1.9.3/BaseDoxyfile.in
index 775ba2ce757..a2cf7003fb4 100644
--- a/Documentation/doc/resources/1.9.3/BaseDoxyfile.in
+++ b/Documentation/doc/resources/1.9.3/BaseDoxyfile.in
@@ -341,7 +341,7 @@ ALIASES = "cgal=%CGAL" \
"cgalPkgShortInfoBegin=
" \
"cgalPkgShortInfoEnd=
" \
"cgalPkgAuthor{1}=\1
" \
- "cgalPkgAuthors{1}=\1
" \
+ "cgalPkgAuthors{1}=\cgalPkgAuthor{\1}" \
"cgalPkgDesc{1}=\1
" \
"cgalPkgSince{1}=Introduced in: \cgal \1
" \
"cgalPkgDependsOn{1}=Depends on: \1
" \
diff --git a/GraphicsView/doc/GraphicsView/PackageDescription.txt b/GraphicsView/doc/GraphicsView/PackageDescription.txt
index 3c32ad7863c..cc2c9c0b6e9 100644
--- a/GraphicsView/doc/GraphicsView/PackageDescription.txt
+++ b/GraphicsView/doc/GraphicsView/PackageDescription.txt
@@ -12,7 +12,7 @@
\cgalPkgDescriptionBegin{CGAL and the Qt Graphics View Framework,PkgGraphicsView}
\cgalPkgPicture{detail.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Andreas Fabri and Laurent Rineau}
+\cgalPkgAuthors{Andreas Fabri, and Laurent Rineau}
\cgalPkgDesc{This package provides classes for displaying \cgal objects and data structures in the Qt 5 Graphics View Framework.}
\cgalPkgManuals{Chapter_CGAL_and_the_Qt_Graphics_View_Framework,PkgGraphicsViewRef}
\cgalPkgSummaryEnd
diff --git a/Heat_method_3/doc/Heat_method_3/PackageDescription.txt b/Heat_method_3/doc/Heat_method_3/PackageDescription.txt
index c13822436f1..682deab736b 100644
--- a/Heat_method_3/doc/Heat_method_3/PackageDescription.txt
+++ b/Heat_method_3/doc/Heat_method_3/PackageDescription.txt
@@ -12,7 +12,7 @@
\cgalPkgPicture{heat-method-small.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Keenan Crane, Christina Vaz, Andreas Fabri}
+\cgalPkgAuthors{Keenan Crane, Christina Vaz, and Andreas Fabri}
\cgalPkgDesc{The package provides an algorithm that solves the single- or
multiple-source shortest path problem by returning an approximation of the geodesic distance
for all vertices of a triangle mesh to the closest vertex in a given set of
diff --git a/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/PackageDescription.txt b/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/PackageDescription.txt
index 0481775afa0..eb96082b7c3 100644
--- a/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/PackageDescription.txt
+++ b/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/PackageDescription.txt
@@ -21,7 +21,7 @@
\cgalPkgPicture{Hyperbolic_triangulation_2/fig/ht-120px.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthor{Mikhail Bogdanov, Iordan Iordanov, and Monique Teillaud}
+\cgalPkgAuthors{Mikhail Bogdanov, Iordan Iordanov, and Monique Teillaud}
\cgalPkgDesc{This package enables building and handling Delaunay triangulations of point sets
in the Poincaré disk model of the hyperbolic plane. Triangulations are built incrementally and can be modified by insertion
and removal of vertices; point location facilities are also offered, as well as primitives to
diff --git a/Inscribed_areas/doc/Inscribed_areas/PackageDescription.txt b/Inscribed_areas/doc/Inscribed_areas/PackageDescription.txt
index a15bb4b041c..5173e625152 100644
--- a/Inscribed_areas/doc/Inscribed_areas/PackageDescription.txt
+++ b/Inscribed_areas/doc/Inscribed_areas/PackageDescription.txt
@@ -9,7 +9,7 @@
\cgalPkgDescriptionBegin{Inscribed Areas,PkgInscribedAreas}
\cgalPkgPicture{ler-detail.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Michael Hoffmann and Eli Packer}
+\cgalPkgAuthors{Michael Hoffmann, and Eli Packer}
\cgalPkgDesc{This package provides algorithms for computing inscribed areas. The algorithms for computing inscribed areas are: the largest inscribed k-gon (area or perimeter) of a convex point set and the largest inscribed iso-rectangle.}
\cgalPkgManuals{Chapter_Inscribed_Areas,PkgInscribedAreasRef}
\cgalPkgSummaryEnd
diff --git a/Jet_fitting_3/doc/Jet_fitting_3/PackageDescription.txt b/Jet_fitting_3/doc/Jet_fitting_3/PackageDescription.txt
index 15927fd0590..268146369c7 100644
--- a/Jet_fitting_3/doc/Jet_fitting_3/PackageDescription.txt
+++ b/Jet_fitting_3/doc/Jet_fitting_3/PackageDescription.txt
@@ -7,7 +7,7 @@
\cgalPkgDescriptionBegin{Estimation of Local Differential Properties of Point-Sampled Surfaces,PkgJetFitting3}
\cgalPkgPicture{DavidDetail.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Marc Pouget and Frédéric Cazals}
+\cgalPkgAuthors{Marc Pouget, and Frédéric Cazals}
\cgalPkgDesc{For a surface discretized as a point cloud or a mesh, it is desirable to estimate pointwise differential quantities. More precisely, first order properties correspond to the normal or the tangent plane; second order properties provide the principal curvatures and directions, third order properties provide the directional derivatives of the principal curvatures along the curvature lines, etc. This package allows the estimation of local differential quantities of a surface from a point sample.}
\cgalPkgManuals{Chapter_Estimation_of_Local_Differential_Properties_of_Point-Sampled_Surfaces,PkgJetFitting3Ref}
\cgalPkgSummaryEnd
diff --git a/Mesh_3/doc/Mesh_3/PackageDescription.txt b/Mesh_3/doc/Mesh_3/PackageDescription.txt
index 08462c8341c..8cf21dda78d 100644
--- a/Mesh_3/doc/Mesh_3/PackageDescription.txt
+++ b/Mesh_3/doc/Mesh_3/PackageDescription.txt
@@ -37,7 +37,7 @@
\cgalPkgDescriptionBegin{3D Mesh Generation,PkgMesh3}
\cgalPkgPicture{Mesh_3/fig/multilabel_mesher_small.jpg}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Pierre Alliez, Clément Jamin, Laurent Rineau, Stéphane Tayeb, Jane Tournois, Mariette Yvinec}
+\cgalPkgAuthors{Pierre Alliez, Clément Jamin, Laurent Rineau, Stéphane Tayeb, Jane Tournois, and Mariette Yvinec}
\cgalPkgDesc{This package is devoted to the generation of isotropic simplicial meshes discretizing 3D domains. The domain to be meshed is a region of 3D space that has to be bounded. The region may be connected or composed of multiple components and/or subdivided in several subdomains. The domain is input as an oracle able to answer queries, of a few different types, on the domain. Boundary and subdivision surfaces are either smooth or piecewise smooth surfaces, formed with planar or curved surface patches. Surfaces may exhibit 1-dimensional features (e.g. crease edges) and 0-dimensional features (e.g. singular points as corners tips, cusps or darts), that have to be fairly approximated in the mesh. Optionally, the algorithms support multi-core shared-memory architectures to take advantage of available parallelism.}
\cgalPkgManuals{Chapter_3D_Mesh_Generation,PkgMesh3Ref}
\cgalPkgSummaryEnd
diff --git a/Minkowski_sum_2/doc/Minkowski_sum_2/PackageDescription.txt b/Minkowski_sum_2/doc/Minkowski_sum_2/PackageDescription.txt
index 23009c9f2ba..bb770a24620 100644
--- a/Minkowski_sum_2/doc/Minkowski_sum_2/PackageDescription.txt
+++ b/Minkowski_sum_2/doc/Minkowski_sum_2/PackageDescription.txt
@@ -8,7 +8,7 @@
\cgalPkgDescriptionBegin{2D Minkowski Sums,PkgMinkowskiSum2}
\cgalPkgPicture{Minkowski_sum_2/fig/Minkowski_sum_2.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthor{Ron Wein, Alon Baram, Eyal Flato, Efi Fogel, Michael Hemmer, Sebastian Morr}
+\cgalPkgAuthors{Ron Wein, Alon Baram, Eyal Flato, Efi Fogel, Michael Hemmer, and Sebastian Morr}
\cgalPkgDesc{This package consists of functions that compute the Minkowski sum of two simple straight-edge polygons in the plane. It also contains functions for computing the Minkowski sum of a polygon and a disc, an operation known as offsetting or dilating a polygon. The package can compute the exact representation of the offset polygon, or provide a guaranteed approximation of the offset.}
\cgalPkgManuals{Chapter_2D_Minkowski_Sums,PkgMinkowskiSum2Ref}
\cgalPkgSummaryEnd
diff --git a/Modular_arithmetic/doc/Modular_arithmetic/PackageDescription.txt b/Modular_arithmetic/doc/Modular_arithmetic/PackageDescription.txt
index 0d7b0e90757..e609e68ec1e 100644
--- a/Modular_arithmetic/doc/Modular_arithmetic/PackageDescription.txt
+++ b/Modular_arithmetic/doc/Modular_arithmetic/PackageDescription.txt
@@ -6,7 +6,7 @@
\cgalPkgDescriptionBegin{Modular Arithmetic,PkgModularArithmetic}
\cgalPkgPicture{Modular_arithmetic.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Michael Hemmer and Sylvain Pion}
+\cgalPkgAuthors{Michael Hemmer, and Sylvain Pion}
\cgalPkgDesc{This package provides arithmetic over finite fields. The provided tools are in particular useful for filters based on modular arithmetic and algorithms based on Chinese remainder. }
\cgalPkgManuals{Chapter_Modular_Arithmetic,PkgModularArithmeticRef}
\cgalPkgSummaryEnd
diff --git a/Nef_3/doc/Nef_3/PackageDescription.txt b/Nef_3/doc/Nef_3/PackageDescription.txt
index 7edd3f45d4b..253676f382d 100644
--- a/Nef_3/doc/Nef_3/PackageDescription.txt
+++ b/Nef_3/doc/Nef_3/PackageDescription.txt
@@ -17,7 +17,7 @@
\cgalPkgDescriptionBegin{3D Boolean Operations on Nef Polyhedra,PkgNef3}
\cgalPkgPicture{Nef_3-teaser.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Peter Hachenberger and Lutz Kettner}
+\cgalPkgAuthors{Peter Hachenberger, and Lutz Kettner}
\cgalPkgDesc{3D Nef polyhedra, are a boundary representation for cell-complexes bounded by halfspaces that supports Boolean operations and topological operations in full generality including unbounded cells, mixed dimensional cells (e.g., isolated vertices and antennas). Nef polyhedra distinguish between open and closed sets and can represent non-manifold geometry.}
\cgalPkgManuals{Chapter_3D_Boolean_Operations_on_Nef_Polyhedra,PkgNef3Ref}
\cgalPkgSummaryEnd
diff --git a/Nef_S2/doc/Nef_S2/PackageDescription.txt b/Nef_S2/doc/Nef_S2/PackageDescription.txt
index f85581381e8..d2f472ba869 100644
--- a/Nef_S2/doc/Nef_S2/PackageDescription.txt
+++ b/Nef_S2/doc/Nef_S2/PackageDescription.txt
@@ -5,7 +5,7 @@
\cgalPkgDescriptionBegin{2D Boolean Operations on Nef Polygons Embedded on the Sphere,PkgNefS2}
\cgalPkgPicture{Nef_S2-teaser-small.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Peter Hachenberger and Lutz Kettner}
+\cgalPkgAuthors{Peter Hachenberger, and Lutz Kettner}
\cgalPkgDesc{This package offers the equivalent to 2D Nef Polygons in the plane. Here halfplanes correspond to half spheres delimited by great circles.}
\cgalPkgManuals{Chapter_2D_Boolean_Operations_on_Nef_Polygons_Embedded_on_the_Sphere,PkgNefS2Ref}
\cgalPkgSummaryEnd
diff --git a/Optimal_bounding_box/doc/Optimal_bounding_box/PackageDescription.txt b/Optimal_bounding_box/doc/Optimal_bounding_box/PackageDescription.txt
index 4ab46f8993c..78ff436c100 100644
--- a/Optimal_bounding_box/doc/Optimal_bounding_box/PackageDescription.txt
+++ b/Optimal_bounding_box/doc/Optimal_bounding_box/PackageDescription.txt
@@ -17,7 +17,7 @@
\cgalPkgDescriptionBegin{Optimal Bounding Box,PkgOptimalBoundingBox}
\cgalPkgPicture{optimal_bounding_box.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthor{Konstantinos Katrioplas, Mael Rouxel-Labbé}
+\cgalPkgAuthors{Konstantinos Katrioplas, and Mael Rouxel-Labbé}
\cgalPkgDesc{This package provides functions to compute tight oriented bounding boxes around a point set or a polygon mesh.}
\cgalPkgManuals{Chapter_Building_Optimal_Bounding_Box,PkgOptimalBoundingBoxRef}
\cgalPkgSummaryEnd
diff --git a/Optimal_transportation_reconstruction_2/doc/Optimal_transportation_reconstruction_2/PackageDescription.txt b/Optimal_transportation_reconstruction_2/doc/Optimal_transportation_reconstruction_2/PackageDescription.txt
index 1e4d7a84d0e..66636bca10b 100644
--- a/Optimal_transportation_reconstruction_2/doc/Optimal_transportation_reconstruction_2/PackageDescription.txt
+++ b/Optimal_transportation_reconstruction_2/doc/Optimal_transportation_reconstruction_2/PackageDescription.txt
@@ -12,7 +12,7 @@
\cgalPkgDescriptionBegin{Optimal Transportation Curve Reconstruction, PkgOptimalTransportationReconstruction2}
\cgalPkgPicture{RS_2_small.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthor{Pierre Alliez, David Cohen-Steiner, Fernando de Goes, Clément Jamin, Ivo Vigan}
+\cgalPkgAuthors{Pierre Alliez, David Cohen-Steiner, Fernando de Goes, Clément Jamin, and Ivo Vigan}
\cgalPkgDesc{This package provides an algorithm to reconstruct and simplify a shape from a point set in the plane, possibly hampered with noise and outliers. It generates as output a set of line segments and isolated points, which approximate the input point set.}
\cgalPkgManuals{Chapter_Optimal_Transportation_Curve_Reconstruction, PkgOptimalTransportationReconstruction2Ref}
\cgalPkgSummaryEnd
diff --git a/Orthtree/doc/Orthtree/PackageDescription.txt b/Orthtree/doc/Orthtree/PackageDescription.txt
index 4da4712b416..22b02350771 100644
--- a/Orthtree/doc/Orthtree/PackageDescription.txt
+++ b/Orthtree/doc/Orthtree/PackageDescription.txt
@@ -21,7 +21,7 @@
\cgalPkgDescriptionBegin{Quadtrees\, Octrees\, and Orthtrees,PkgOrthtree}
\cgalPkgPicture{octree_thumbnail.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Jackson Campolattaro, Simon Giraudot, Cédric Portaneri, Tong Zhao, Pierre Alliez}
+\cgalPkgAuthors{Jackson Campolattaro, Simon Giraudot, Cédric Portaneri, Tong Zhao, and Pierre Alliez}
\cgalPkgDesc{The Orthtree package provides a data structure that subdivides space, with specializations for 2D (Quadtree) and 3D (Octree), along with a collection of algorithms for operating on these structures.}
\cgalPkgManuals{Chapter_Orthtree,PkgOrthtreeRef}
\cgalPkgSummaryEnd
diff --git a/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/PackageDescription.txt b/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/PackageDescription.txt
index eae9f7d96c5..214b23b04e2 100644
--- a/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/PackageDescription.txt
+++ b/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/PackageDescription.txt
@@ -23,7 +23,7 @@
\cgalPkgPicture{Periodic_4_hyperbolic_triangulation_2/fig/new-triangulation-120px.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthor{Iordan Iordanov and Monique Teillaud}
+\cgalPkgAuthors{Iordan Iordanov, and Monique Teillaud}
\cgalPkgDesc{This package enables building and handling triangulations of point sets on the two dimensional
hyperbolic Bolza surface. Triangulations are built incrementally and can be modified by insertion or
removal of vertices. Point location facilities are also offered. The package provides Delaunay
diff --git a/Point_set_3/doc/Point_set_3/PackageDescription.txt b/Point_set_3/doc/Point_set_3/PackageDescription.txt
index 0b747c1f538..271b13b4634 100644
--- a/Point_set_3/doc/Point_set_3/PackageDescription.txt
+++ b/Point_set_3/doc/Point_set_3/PackageDescription.txt
@@ -55,7 +55,7 @@
\cgalPkgDescriptionBegin{3D Point Set, PkgPointSet3}
\cgalPkgPicture{point_set_3.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Simon Giraudot}
+\cgalPkgAuthor{Simon Giraudot}
\cgalPkgDesc{This component provides the user with a flexible 3D point set data structure. The user can define any additional property needed such as normal vectors, colors or labels. \cgal algorithms can be easily applied to this data structure.}
\cgalPkgManuals{Chapter_Point_Set_3, PkgPointSet3Ref}
\cgalPkgSummaryEnd
diff --git a/Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt b/Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt
index bf0029d6c94..f9e3c5b663e 100644
--- a/Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt
+++ b/Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt
@@ -35,7 +35,7 @@ format.
\cgalPkgDescriptionBegin{Point Set Processing,PkgPointSetProcessing3}
\cgalPkgPicture{point_set_processing_detail.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Pierre Alliez, Simon Giraudot, Clément Jamin, Florent Lafarge, Quentin Mérigot, Jocelyn Meyron, Laurent Saboret, Nader Salman, Shihao Wu, Necip Fazil Yildiran}
+\cgalPkgAuthors{Pierre Alliez, Simon Giraudot, Clément Jamin, Florent Lafarge, Quentin Mérigot, Jocelyn Meyron, Laurent Saboret, Nader Salman, Shihao Wu, and Necip Fazil Yildiran}
\cgalPkgDesc{This \cgal component implements methods to analyze and process unorganized point sets. The input is an unorganized point set, possibly with normal attributes (unoriented or oriented). The point set can be analyzed to measure its average spacing, and processed through functions devoted to the simplification, outlier removal, smoothing, normal estimation, normal orientation, feature edges estimation and registration.}
\cgalPkgManuals{Chapter_Point_Set_Processing,PkgPointSetProcessing3Ref}
\cgalPkgSummaryEnd
diff --git a/Poisson_surface_reconstruction_3/doc/Poisson_surface_reconstruction_3/PackageDescription.txt b/Poisson_surface_reconstruction_3/doc/Poisson_surface_reconstruction_3/PackageDescription.txt
index c3965089082..f615d0988b3 100644
--- a/Poisson_surface_reconstruction_3/doc/Poisson_surface_reconstruction_3/PackageDescription.txt
+++ b/Poisson_surface_reconstruction_3/doc/Poisson_surface_reconstruction_3/PackageDescription.txt
@@ -4,7 +4,7 @@
\cgalPkgDescriptionBegin{Poisson Surface Reconstruction,PkgPoissonSurfaceReconstruction3}
\cgalPkgPicture{surface_reconstruction_points_detail.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Pierre Alliez, Laurent Saboret, Gaël Guennebaud}
+\cgalPkgAuthors{Pierre Alliez, Laurent Saboret, and Gaël Guennebaud}
\cgalPkgDesc{This package implements a surface reconstruction method: Poisson Surface Reconstruction. It takes as input a set of points with oriented normals and computes an implicit function. The \cgal surface mesh generator can then be used to extract an iso-surface from this function. }
\cgalPkgManuals{Chapter_Poisson_Surface_Reconstruction,PkgPoissonSurfaceReconstruction3Ref}
\cgalPkgSummaryEnd
diff --git a/Polygon/doc/Polygon/PackageDescription.txt b/Polygon/doc/Polygon/PackageDescription.txt
index 1d48e74493c..53f074363f4 100644
--- a/Polygon/doc/Polygon/PackageDescription.txt
+++ b/Polygon/doc/Polygon/PackageDescription.txt
@@ -28,7 +28,7 @@
\cgalPkgDescriptionBegin{2D Polygons,PkgPolygon2}
\cgalPkgPicture{polygon.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Geert-Jan Giezeman and Wieger Wesselink}
+\cgalPkgAuthors{Geert-Jan Giezeman, and Wieger Wesselink}
\cgalPkgDesc{This package provides a 2D polygon class and operations on sequences of points, like bounding box, extremal points, signed area, simplicity and convexity test, orientation, and point location. The demo includes operations on polygons, such as computing a convex partition, and the straight skeleton.}
\cgalPkgManuals{Chapter_2D_Polygon,PkgPolygon2Ref}
\cgalPkgSummaryEnd
diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt b/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
index 3906fe9dab3..38617e03976 100644
--- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
+++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
@@ -75,7 +75,7 @@
\cgalPkgPicture{hole_filling_ico.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthor{Sébastien Loriot, Mael Rouxel-Labbé, Jane Tournois, Ilker %O. Yaz}
+\cgalPkgAuthors{Sébastien Loriot, Mael Rouxel-Labbé, Jane Tournois, and Ilker %O. Yaz}
\cgalPkgDesc{This package provides a collection of methods and classes for polygon mesh processing,
ranging from basic operations on simplices, to complex geometry processing algorithms such as
Boolean operations, remeshing, repairing, collision and intersection detection, and more.}
diff --git a/Polygonal_surface_reconstruction/doc/Polygonal_surface_reconstruction/PackageDescription.txt b/Polygonal_surface_reconstruction/doc/Polygonal_surface_reconstruction/PackageDescription.txt
index b02e6886d14..2bbf0b19b6e 100644
--- a/Polygonal_surface_reconstruction/doc/Polygonal_surface_reconstruction/PackageDescription.txt
+++ b/Polygonal_surface_reconstruction/doc/Polygonal_surface_reconstruction/PackageDescription.txt
@@ -9,7 +9,7 @@
\cgalPkgPicture{polyfit.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Liangliang Nan}
+\cgalPkgAuthor{Liangliang Nan}
\cgalPkgDesc{This package provides a method for piecewise planar object reconstruction from point clouds.
The method takes as input an unordered point set (and optionally planar segments) of a piecewise planar
object and outputs a lightweight and watertight surface mesh interpolating the input point set. The
@@ -33,4 +33,4 @@ robust to noise and outliers.}
## Classes ##
- `CGAL::Polygonal_surface_reconstruction`
-*/
\ No newline at end of file
+*/
diff --git a/Principal_component_analysis/doc/Principal_component_analysis/PackageDescription.txt b/Principal_component_analysis/doc/Principal_component_analysis/PackageDescription.txt
index 3ecb09e7502..10fd2d3f734 100644
--- a/Principal_component_analysis/doc/Principal_component_analysis/PackageDescription.txt
+++ b/Principal_component_analysis/doc/Principal_component_analysis/PackageDescription.txt
@@ -21,7 +21,7 @@
\cgalPkgDescriptionBegin{Principal Component Analysis,PkgPrincipalComponentAnalysisD}
\cgalPkgPicture{teaserLeastSquaresFitting.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Pierre Alliez, Sylvain Pion and Ankit Gupta}
+\cgalPkgAuthors{Pierre Alliez, Sylvain Pion, and Ankit Gupta}
\cgalPkgDesc{This package provides functions to compute global information about the shape of a set of 2D or 3D objects. It provides the computation of axis-aligned bounding boxes for point sets, and barycenters of weighted point sets. In addition, it provides computation of centroids (center of mass) and linear least squares fitting for point sets as well as for sets of other bounded objects. More specifically, it is possible to fit 2D lines to 2D segments, circles, disks, iso rectangles and triangles, as well as to fit 3D lines or 3D planes to 3D segments, triangles, iso cuboids, tetrahedra, spheres and balls. The common interface to these functions takes an iterator range of objects.}
\cgalPkgManuals{Chapter_Principal_Component_Analysis,PkgPrincipalComponentAnalysisDRef}
\cgalPkgSummaryEnd
diff --git a/Property_map/doc/Property_map/PackageDescription.txt b/Property_map/doc/Property_map/PackageDescription.txt
index 0f52bd4e7b7..3ee21914ddc 100644
--- a/Property_map/doc/Property_map/PackageDescription.txt
+++ b/Property_map/doc/Property_map/PackageDescription.txt
@@ -6,7 +6,7 @@
\cgalPkgDescriptionBegin{CGAL and Boost Property Maps,PkgPropertyMap}
\cgalPkgPicture{property_map.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Andreas Fabri and Laurent Saboret}
+\cgalPkgAuthors{Andreas Fabri, and Laurent Saboret}
\cgalPkgDesc{This package provides a framework for interfacing \cgal data structures with algorithms expecting Boost Property Maps.}
\cgalPkgManuals{Chapter_CGAL_and_Boost_Property_Maps,PkgPropertyMapRef}
\cgalPkgSummaryEnd
diff --git a/Ridges_3/doc/Ridges_3/PackageDescription.txt b/Ridges_3/doc/Ridges_3/PackageDescription.txt
index d34109ac8e3..8af98d4ef4e 100644
--- a/Ridges_3/doc/Ridges_3/PackageDescription.txt
+++ b/Ridges_3/doc/Ridges_3/PackageDescription.txt
@@ -9,7 +9,7 @@
\cgalPkgDescriptionBegin{Approximation of Ridges and Umbilics on Triangulated Surface Meshes,PkgRidges3}
\cgalPkgPicture{RidgesMechPartDetail.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Marc Pouget and Frédéric Cazals}
+\cgalPkgAuthors{Marc Pouget, and Frédéric Cazals}
\cgalPkgDesc{Global features related to curvature extrema encode important information used in segmentation, registration, matching and surface analysis. Given pointwise estimations of local differential quantities, this package allows the approximation of differential features on a triangulated surface mesh. Such curvature related features are curves: ridges or crests, and points: umbilics.}
\cgalPkgManuals{Chapter_Approximation_of_Ridges_and_Umbilics_on_Triangulated_Surface_Meshes,PkgRidges3Ref}
\cgalPkgSummaryEnd
diff --git a/SMDS_3/doc/SMDS_3/PackageDescription.txt b/SMDS_3/doc/SMDS_3/PackageDescription.txt
index 8b5ad64a507..013642d6c36 100644
--- a/SMDS_3/doc/SMDS_3/PackageDescription.txt
+++ b/SMDS_3/doc/SMDS_3/PackageDescription.txt
@@ -26,7 +26,7 @@
\cgalPkgPicture{knot_small.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Pierre Alliez, Clément Jamin, Laurent Rineau, Stéphane Tayeb, Jane Tournois, Mariette Yvinec}
+\cgalPkgAuthors{Pierre Alliez, Clément Jamin, Laurent Rineau, Stéphane Tayeb, Jane Tournois, and Mariette Yvinec}
\cgalPkgDesc{This package provides a data structure to store three-dimensional
simplicial meshes and their subcomplexes.
It provides an API for tetrahedral meshes generated with %CGAL or not,
diff --git a/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/PackageDescription.txt b/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/PackageDescription.txt
index cbe16d9ac84..08d1f716eb2 100644
--- a/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/PackageDescription.txt
+++ b/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/PackageDescription.txt
@@ -12,7 +12,7 @@
\cgalPkgDescriptionBegin{Scale-Space Surface Reconstruction,PkgScaleSpaceReconstruction3}
\cgalPkgPicture{knot_thumb.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Thijs van Lankveld}
+\cgalPkgAuthor{Thijs van Lankveld}
\cgalPkgDesc{This method allows to reconstruct a surface that interpolates a set of 3D points using either an alpha shape or the advancing front surface reconstruction method. The output interpolates the point set (as opposed to approximating the point set). How the surface connects the points depends on a scale variable, which can be estimated semi-automatically.}
\cgalPkgManuals{Chapter_Scale_space_reconstruction,PkgScaleSpaceReconstruction3Ref}
\cgalPkgSummaryEnd
diff --git a/Segment_Delaunay_graph_Linf_2/doc/Segment_Delaunay_graph_Linf_2/PackageDescription.txt b/Segment_Delaunay_graph_Linf_2/doc/Segment_Delaunay_graph_Linf_2/PackageDescription.txt
index 4564f4f3c49..3b8dcdecfb0 100644
--- a/Segment_Delaunay_graph_Linf_2/doc/Segment_Delaunay_graph_Linf_2/PackageDescription.txt
+++ b/Segment_Delaunay_graph_Linf_2/doc/Segment_Delaunay_graph_Linf_2/PackageDescription.txt
@@ -10,7 +10,7 @@
\cgalPkgPicture{sdglinf-small.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Panagiotis Cheilaris, Sandeep Kumar Dey, Evanthia Papadopoulou}
+\cgalPkgAuthors{Panagiotis Cheilaris, Sandeep Kumar Dey, and Evanthia Papadopoulou}
\cgalPkgDesc{Algorithms and geometric traits for computing the dual of
the Voronoi diagram of a set of points and segments under the
\f$L_{\infty}\f$ metric.}
diff --git a/Set_movable_separability_2/doc/Set_movable_separability_2/PackageDescription.txt b/Set_movable_separability_2/doc/Set_movable_separability_2/PackageDescription.txt
index ece7d3e1720..5644e7a60ee 100644
--- a/Set_movable_separability_2/doc/Set_movable_separability_2/PackageDescription.txt
+++ b/Set_movable_separability_2/doc/Set_movable_separability_2/PackageDescription.txt
@@ -31,7 +31,7 @@
\cgalPkgDescriptionBegin{2D Movable Separability of Sets,PkgSetMovableSeparability2}
\cgalPkgPicture{Casting_2.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Shahar Shamai, Efi Fogel}
+\cgalPkgAuthors{Shahar Shamai, and Efi Fogel}
\cgalPkgDesc{Movable Separability of Sets \cgalCite{t-mss-85} is a
class of problems that deal with moving sets of objects, such as polygons in
the plane; the challenge is to avoid collisions between the objects
diff --git a/Spatial_searching/doc/Spatial_searching/PackageDescription.txt b/Spatial_searching/doc/Spatial_searching/PackageDescription.txt
index 0ba29710374..a1ed26b9095 100644
--- a/Spatial_searching/doc/Spatial_searching/PackageDescription.txt
+++ b/Spatial_searching/doc/Spatial_searching/PackageDescription.txt
@@ -29,7 +29,7 @@
\cgalPkgDescriptionBegin{dD Spatial Searching,PkgSpatialSearchingD}
\cgalPkgPicture{windowQuery.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Hans Tangelder and Andreas Fabri}
+\cgalPkgAuthors{Hans Tangelder, and Andreas Fabri}
\cgalPkgDesc{This package implements exact and approximate distance browsing by providing exact and approximate algorithms for range searching, k-nearest and k-furthest neighbor searching, as well as incremental nearest and incremental furthest neighbor searching, where the query items are points in dD Euclidean space.}
\cgalPkgManuals{Chapter_dD_Spatial_Searching,PkgSpatialSearchingDRef}
\cgalPkgSummaryEnd
diff --git a/Spatial_sorting/doc/Spatial_sorting/PackageDescription.txt b/Spatial_sorting/doc/Spatial_sorting/PackageDescription.txt
index 0960831b264..bac9704c294 100644
--- a/Spatial_sorting/doc/Spatial_sorting/PackageDescription.txt
+++ b/Spatial_sorting/doc/Spatial_sorting/PackageDescription.txt
@@ -21,7 +21,7 @@
\cgalPkgDescriptionBegin{Spatial Sorting,PkgSpatialSorting}
\cgalPkgPicture{hilbert.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Christophe Delage and Olivier Devillers}
+\cgalPkgAuthors{Christophe Delage, and Olivier Devillers}
\cgalPkgDesc{This package provides functions for sorting geometric objects in two, three and higher dimensions, including on a sphere, in order to improve efficiency of incremental geometric algorithms.}
\cgalPkgManuals{Chapter_Spatial_Sorting,PkgSpatialSortingRef}
\cgalPkgSummaryEnd
diff --git a/Surface_mesh/doc/Surface_mesh/PackageDescription.txt b/Surface_mesh/doc/Surface_mesh/PackageDescription.txt
index f0991aafdca..974c86b9f54 100644
--- a/Surface_mesh/doc/Surface_mesh/PackageDescription.txt
+++ b/Surface_mesh/doc/Surface_mesh/PackageDescription.txt
@@ -31,7 +31,7 @@
\cgalPkgDescriptionBegin{Surface Mesh,PkgSurfaceMesh}
\cgalPkgPicture{Surface_mesh_teaser.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthor{Mario Botsch, Daniel Sieger, Philipp Moeller, and Andreas Fabri}
+\cgalPkgAuthors{Mario Botsch, Daniel Sieger, Philipp Moeller, and Andreas Fabri}
\cgalPkgDesc{The surface mesh class provided by this package is an implementation
of the halfedge data structure allowing to represent polyhedral surfaces. It is
an alternative to the packages \ref PkgHalfedgeDS and \ref PkgPolyhedron.
diff --git a/Surface_mesh_approximation/doc/Surface_mesh_approximation/PackageDescription.txt b/Surface_mesh_approximation/doc/Surface_mesh_approximation/PackageDescription.txt
index 99e6602b09a..e4f9503b14b 100644
--- a/Surface_mesh_approximation/doc/Surface_mesh_approximation/PackageDescription.txt
+++ b/Surface_mesh_approximation/doc/Surface_mesh_approximation/PackageDescription.txt
@@ -9,7 +9,7 @@
\cgalPkgPicture{sma-pkg-small.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Pierre Alliez, David Cohen-Steiner, Lingjie Zhu}
+\cgalPkgAuthors{Pierre Alliez, David Cohen-Steiner, and Lingjie Zhu}
\cgalPkgDesc{This package implements the Variational Shape Approximation method to approximate an input surface triangle mesh by a simpler surface triangle mesh. The algorithm proceeds by iterative clustering of triangles, the clustering process being seeded randomly, incrementally or hierarchically. While the default function runs an automated version of the algorithm, interactive control is possible via a class interface.
The API is flexible and can be extended to user-defined proxies and error metrics.}
\cgalPkgManuals{Chapter_Triangulated_Surface_Mesh_Approximation,PkgTSMARef}
diff --git a/Surface_mesh_deformation/doc/Surface_mesh_deformation/PackageDescription.txt b/Surface_mesh_deformation/doc/Surface_mesh_deformation/PackageDescription.txt
index 0052d2f8e84..fc3fadcbef5 100644
--- a/Surface_mesh_deformation/doc/Surface_mesh_deformation/PackageDescription.txt
+++ b/Surface_mesh_deformation/doc/Surface_mesh_deformation/PackageDescription.txt
@@ -7,7 +7,7 @@
\cgalPkgDescriptionBegin{Triangulated Surface Mesh Deformation,PkgSurfaceMeshDeformation}
\cgalPkgPicture{deform-ico.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthor{Sébastien Loriot, Olga Sorkine-Hornung, Yin Xu and Ilker %O. Yaz}
+\cgalPkgAuthors{Sébastien Loriot, Olga Sorkine-Hornung, Yin Xu, and Ilker %O. Yaz}
\cgalPkgDesc{This package offers surface mesh deformation algorithms which provide new positions to the vertices of a surface mesh
under positional constraints of some of its vertices, without requiring any additional structure other than the surface mesh itself.}
\cgalPkgManuals{Chapter_SurfaceMeshDeformation,PkgSurfaceMeshDeformationRef}
diff --git a/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/PackageDescription.txt b/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/PackageDescription.txt
index fed84152440..0b98008e169 100644
--- a/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/PackageDescription.txt
+++ b/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/PackageDescription.txt
@@ -11,7 +11,7 @@
\cgalPkgPicture{segmentation_ico.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthor{Ilker %O. Yaz and Sébastien Loriot}
+\cgalPkgAuthors{Ilker %O. Yaz, and Sébastien Loriot}
\cgalPkgDesc{This package provides a method to generate a segmentation of
a triangulated surface mesh. The algorithm first computes the
Shape Diameter Function (SDF) for all facets and applies a
diff --git a/Surface_mesh_shortest_path/doc/Surface_mesh_shortest_path/PackageDescription.txt b/Surface_mesh_shortest_path/doc/Surface_mesh_shortest_path/PackageDescription.txt
index 1f434655345..b16cceb370e 100644
--- a/Surface_mesh_shortest_path/doc/Surface_mesh_shortest_path/PackageDescription.txt
+++ b/Surface_mesh_shortest_path/doc/Surface_mesh_shortest_path/PackageDescription.txt
@@ -16,7 +16,7 @@
\cgalPkgDescriptionBegin{Triangulated Surface Mesh Shortest Paths,PkgSurfaceMeshShortestPath}
\cgalPkgPicture{shortestpathspackage-ico.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Stephen Kiazyk, Sébastien Loriot, Éric Colin de Verdière}
+\cgalPkgAuthors{Stephen Kiazyk, Sébastien Loriot, and Éric Colin de Verdière}
\cgalPkgDesc{The package provides methods for computing geodesic shortest path on triangulated surface meshes. The algorithm used is based on a paper by Xin and Wang \cgalCite{XinWang2009improvingchenandhan} . The input of this package can be any model of the `FaceListGraph` concept. }
\cgalPkgManuals{Chapter_Surface_mesh_shortest_path,PkgSurfaceMeshShortestPathRef}
\cgalPkgSummaryEnd
diff --git a/Surface_mesh_simplification/doc/Surface_mesh_simplification/PackageDescription.txt b/Surface_mesh_simplification/doc/Surface_mesh_simplification/PackageDescription.txt
index 1d97e670f9d..dcbee682d4e 100644
--- a/Surface_mesh_simplification/doc/Surface_mesh_simplification/PackageDescription.txt
+++ b/Surface_mesh_simplification/doc/Surface_mesh_simplification/PackageDescription.txt
@@ -6,7 +6,7 @@
\cgalPkgDescriptionBegin{Triangulated Surface Mesh Simplification,PkgSurfaceMeshSimplification}
\cgalPkgPicture{SMS-detail.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthor{Fernando Cacciola, Mael Rouxel-Labbé, Baskın Şenbaşlar, and Julian Komaromy}
+\cgalPkgAuthors{Fernando Cacciola, Mael Rouxel-Labbé, Baskın Şenbaşlar, and Julian Komaromy}
\cgalPkgDesc{This package provides an algorithm to simplify a triangulated surface mesh by edge collapsing.
Users can define cost, constraints, and placement strategies to decide when and how should
edges be collapsed. A few strategies are offered by default, such as the Turk/Lindstrom
diff --git a/Surface_mesh_skeletonization/doc/Surface_mesh_skeletonization/PackageDescription.txt b/Surface_mesh_skeletonization/doc/Surface_mesh_skeletonization/PackageDescription.txt
index fa4c5ae7fdb..b6c97efc05c 100644
--- a/Surface_mesh_skeletonization/doc/Surface_mesh_skeletonization/PackageDescription.txt
+++ b/Surface_mesh_skeletonization/doc/Surface_mesh_skeletonization/PackageDescription.txt
@@ -7,7 +7,7 @@
\cgalPkgDescriptionBegin{Triangulated Surface Mesh Skeletonization,PkgSurfaceMeshSkeletonization}
\cgalPkgPicture{mcfskel-small.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthor{Xiang Gao, Sébastien Loriot and Andrea Tagliasacchi}
+\cgalPkgAuthors{Xiang Gao, Sébastien Loriot, and Andrea Tagliasacchi}
\cgalPkgDesc{This package provides a (1D) curve skeleton extraction algorithm for a triangulated polygonal mesh without borders based on the mean curvature flow.
The particularity of this skeleton is that it captures the topology of the input.
For each skeleton vertex one can obtain its location and its corresponding vertices from the input mesh.
diff --git a/Surface_mesh_topology/doc/Surface_mesh_topology/PackageDescription.txt b/Surface_mesh_topology/doc/Surface_mesh_topology/PackageDescription.txt
index 97f1f3bad7e..03d6176ea70 100644
--- a/Surface_mesh_topology/doc/Surface_mesh_topology/PackageDescription.txt
+++ b/Surface_mesh_topology/doc/Surface_mesh_topology/PackageDescription.txt
@@ -20,7 +20,7 @@
\cgalPkgDescriptionBegin{Surface Mesh Topology,PkgSurfaceMeshTopology}
\cgalPkgPicture{surface-mesh-topology-logo.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthor{Guillaume Damiand, Francis Lazarus}
+\cgalPkgAuthors{Guillaume Damiand, and Francis Lazarus}
\cgalPkgDesc{This package provides a toolbox for manipulating curves on a combinatorial surface from the topological point of view. Two main functionalities are proposed. One is the computation of shortest curves that cannot be continuously deformed to a point. This includes the computation of the so-called edge width and face width of the vertex-edge graph of a combinatorial surface. The other functionality is the homotopy test for deciding if two given curves on a combinatorial surface can be continuously deformed one into the other.}
\cgalPkgManuals{Chapter_Surface_Mesh_Topology,PkgSurfaceMeshTopologyRef}
\cgalPkgSummaryEnd
diff --git a/Surface_mesher/doc/Surface_mesher/PackageDescription.txt b/Surface_mesher/doc/Surface_mesher/PackageDescription.txt
index bf46b3a6eba..39d7daf6626 100644
--- a/Surface_mesher/doc/Surface_mesher/PackageDescription.txt
+++ b/Surface_mesher/doc/Surface_mesher/PackageDescription.txt
@@ -29,7 +29,7 @@
\cgalPkgDescriptionBegin{3D Surface Mesh Generation,PkgSurfaceMesher3}
\cgalPkgPicture{segmented_head-small.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Laurent Rineau and Mariette Yvinec}
+\cgalPkgAuthors{Laurent Rineau, and Mariette Yvinec}
\cgalPkgDesc{This package provides functions to generate surface meshes that interpolate smooth surfaces. The meshing algorithm is based on Delaunay refinement and provides some guarantees on the resulting mesh: the user is able to control the size and shape of the mesh elements and the accuracy of the surface approximation. There is no restriction on the topology and number of components of input surfaces. The surface mesh generator may also be used for non smooth surfaces but without guarantee. Currently, implementations are provided for implicit surfaces described as the zero level set of some function and surfaces described as a gray level set in a three-dimensional image.}
\cgalPkgManuals{Chapter_3D_Surface_Mesh_Generation,PkgSurfaceMesher3Ref}
\cgalPkgSummaryEnd
diff --git a/TDS_2/doc/TDS_2/PackageDescription.txt b/TDS_2/doc/TDS_2/PackageDescription.txt
index d4dc2c2645e..f1ae097081e 100644
--- a/TDS_2/doc/TDS_2/PackageDescription.txt
+++ b/TDS_2/doc/TDS_2/PackageDescription.txt
@@ -7,7 +7,7 @@
\cgalPkgDescriptionBegin{2D Triangulation Data Structure,PkgTDS2}
\cgalPkgPicture{tds_small.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Sylvain Pion and Mariette Yvinec}
+\cgalPkgAuthors{Sylvain Pion, and Mariette Yvinec}
\cgalPkgDesc{This package provides a data structure to store a two-dimensional triangulation that has the topology of a two-dimensional sphere. The package acts as a container for the vertices and faces of the triangulation and provides basic combinatorial operation on the triangulation. }
\cgalPkgManuals{Chapter_2D_Triangulation_Data_Structure,PkgTDS2Ref}
\cgalPkgSummaryEnd
diff --git a/TDS_3/doc/TDS_3/PackageDescription.txt b/TDS_3/doc/TDS_3/PackageDescription.txt
index 19d3dfb5fcc..06523934036 100644
--- a/TDS_3/doc/TDS_3/PackageDescription.txt
+++ b/TDS_3/doc/TDS_3/PackageDescription.txt
@@ -14,7 +14,7 @@
\cgalPkgDescriptionBegin{3D Triangulation Data Structure,PkgTDS3}
\cgalPkgPicture{tds3_small.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Clément Jamin, Sylvain Pion and Monique Teillaud}
+\cgalPkgAuthors{Clément Jamin, Sylvain Pion, and Monique Teillaud}
\cgalPkgDesc{This package provides a data structure to store a three-dimensional triangulation that has the topology of a three-dimensional sphere. The package acts as a container for the vertices and cells of the triangulation and provides basic combinatorial operations on the triangulation.}
\cgalPkgManuals{Chapter_3D_Triangulation_Data_Structure,PkgTDS3Ref}
\cgalPkgSummaryEnd
diff --git a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/PackageDescription.txt b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/PackageDescription.txt
index 764ed582390..085ecc8c1e8 100644
--- a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/PackageDescription.txt
+++ b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/PackageDescription.txt
@@ -14,7 +14,7 @@
\cgalPkgPicture{bimba_back_small.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Jane Tournois, Noura Faraj, Jean-Marc Thiery, Tamy Boubekeur}
+\cgalPkgAuthors{Jane Tournois, Noura Faraj, Jean-Marc Thiery, and Tamy Boubekeur}
\cgalPkgDesc{
The package provides a function for remeshing tetrahedral meshes,
targeting high quality meshes with respect to dihedral angles.
diff --git a/Three/doc/Three/PackageDescription.txt b/Three/doc/Three/PackageDescription.txt
index e8173a1e95e..f04d3ec8473 100644
--- a/Three/doc/Three/PackageDescription.txt
+++ b/Three/doc/Three/PackageDescription.txt
@@ -6,7 +6,7 @@
\cgalPkgDescriptionBegin{Three,PkgThree}
\cgalPkgPicture{pkg-small.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Laurent Rineau, Sebastien Loriot, Andreas Fabri, Maxime Gimeno}
+\cgalPkgAuthors{Laurent Rineau, Sebastien Loriot, Andreas Fabri, and Maxime Gimeno}
\cgalPkgDesc{This package provides base classes for building a plugin. }
\cgalPkgManuals{Chapter_Three,PkgThreeRef}
\cgalPkgSummaryEnd
diff --git a/Triangulation_3/doc/Triangulation_3/PackageDescription.txt b/Triangulation_3/doc/Triangulation_3/PackageDescription.txt
index 856c75270ee..6e12268a179 100644
--- a/Triangulation_3/doc/Triangulation_3/PackageDescription.txt
+++ b/Triangulation_3/doc/Triangulation_3/PackageDescription.txt
@@ -28,7 +28,7 @@
\cgalPkgDescriptionBegin{3D Triangulations,PkgTriangulation3}
\cgalPkgPicture{twotets.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Clément Jamin, Sylvain Pion and Monique Teillaud}
+\cgalPkgAuthors{Clément Jamin, Sylvain Pion, and Monique Teillaud}
\cgalPkgDesc{This package allows to build and handle triangulations for point sets in three dimensions. Any \cgal triangulation covers the convex hull of its vertices. Triangulations are build incrementally and can be modified by insertion, displacements or removal of vertices. They offer point location facilities. The package provides plain triangulation (whose faces depends on the insertion order of the vertices) and Delaunay triangulations. Regular triangulations are also provided for sets of weighted points. Delaunay and regular triangulations offer nearest neighbor queries and primitives to build the dual Voronoi and power diagrams. Optionally, the main Delaunay and regular triangulation algorithms (insert, remove) support multi-core shared-memory architectures to take advantage of available parallelism.}
\cgalPkgManuals{Chapter_3D_Triangulations,PkgTriangulation3Ref}
\cgalPkgSummaryEnd
diff --git a/Visibility_2/doc/Visibility_2/PackageDescription.txt b/Visibility_2/doc/Visibility_2/PackageDescription.txt
index 24d45e71b50..4f1919adc56 100644
--- a/Visibility_2/doc/Visibility_2/PackageDescription.txt
+++ b/Visibility_2/doc/Visibility_2/PackageDescription.txt
@@ -11,7 +11,7 @@
\cgalPkgDescriptionBegin{2D Visibility Computation,PkgVisibility2}
\cgalPkgPicture{visibility-teaser-thumbnail.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Michael Hemmer, Kan Huang, Francisc Bungiu, Ning Xu}
+\cgalPkgAuthors{Michael Hemmer, Kan Huang, Francisc Bungiu, and Ning Xu}
\cgalPkgDesc{This package provides several variants to compute
the visibility area of a point within polygonal regions in two dimensions.}
\cgalPkgManuals{Chapter_2D_Visibility_Computation,PkgVisibility2Ref}
diff --git a/Weights/doc/Weights/PackageDescription.txt b/Weights/doc/Weights/PackageDescription.txt
index a2cd0632d19..b59f3e06d68 100644
--- a/Weights/doc/Weights/PackageDescription.txt
+++ b/Weights/doc/Weights/PackageDescription.txt
@@ -513,7 +513,7 @@ a model of `AnalyticWeightTraits_3` for 3D points
\cgalPkgPicture{weights_logo_120x120.png}
\cgalPkgSummaryBegin
-\cgalPkgAuthors{Dmitry Anisimov}
+\cgalPkgAuthor{Dmitry Anisimov}
\cgalPkgDesc{Many geometric algorithms rely on weighted constructions. This package
provides a simple and unified interface to different types of weights. In particular,
it includes numerous weights with a simple analytic expression, generalized barycentric