From 90d86774dd8369734eaf4184e70f31489cd2a4bb Mon Sep 17 00:00:00 2001
From: Sebastian Morr <sebastian@morr.cc>
Date: Wed, 13 Aug 2014 13:51:40 +0200
Subject: [PATCH] Documentation: Mention AABB_tree dependency, add authors

---
 Minkowski_sum_2/doc/Minkowski_sum_2/PackageDescription.txt   | 5 ++---
 Minkowski_sum_2/doc/Minkowski_sum_2/dependencies             | 1 +
 .../include/CGAL/Minkowski_sum_2/AABB_tree_with_join.h       | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Minkowski_sum_2/doc/Minkowski_sum_2/PackageDescription.txt b/Minkowski_sum_2/doc/Minkowski_sum_2/PackageDescription.txt
index 65f3c2b2171..a97dc0fe177 100644
--- a/Minkowski_sum_2/doc/Minkowski_sum_2/PackageDescription.txt
+++ b/Minkowski_sum_2/doc/Minkowski_sum_2/PackageDescription.txt
@@ -5,17 +5,16 @@
 
 /*!
 \addtogroup PkgMinkowskiSum2
-\todo check generated documentation
 \cgalPkgDescriptionBegin{2D Minkowski Sums,PkgMinkowskiSum2Summary}
 \cgalPkgPicture{Minkowski_sum_2/fig/Minkowski_sum_2.png}
 \cgalPkgSummaryBegin
-\cgalPkgAuthor{Ron Wein}
+\cgalPkgAuthor{Ron Wein, Alon Baram, 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 <I>offsetting</I> or <I>dilating</I> 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,PkgMinkowskiSum2}
 \cgalPkgSummaryEnd
 \cgalPkgShortInfoBegin
 \cgalPkgSince{3.3}
-\cgalPkgDependsOn{\ref PkgArrangement2Summary}
+\cgalPkgDependsOn{\ref PkgArrangement2Summary, \ref PkgAABB_treeSummary}
 \cgalPkgBib{cgal:w-rms2}
 \cgalPkgLicense{\ref licensesGPL "GPL"}
 \cgalPkgShortInfoEnd
diff --git a/Minkowski_sum_2/doc/Minkowski_sum_2/dependencies b/Minkowski_sum_2/doc/Minkowski_sum_2/dependencies
index 6258435cf9e..af082a5444b 100644
--- a/Minkowski_sum_2/doc/Minkowski_sum_2/dependencies
+++ b/Minkowski_sum_2/doc/Minkowski_sum_2/dependencies
@@ -9,3 +9,4 @@ Polygon
 Partition_2
 Boolean_set_operations_2
 Number_types
+AABB_tree
diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/AABB_tree_with_join.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/AABB_tree_with_join.h
index c030fd2c230..fe1c8c74187 100644
--- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/AABB_tree_with_join.h
+++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/AABB_tree_with_join.h
@@ -87,7 +87,6 @@ namespace CGAL {
 		typedef typename AABBTraits::Bounding_box Bounding_box;
     /// 
 		typedef typename AABBTraits::Point_and_primitive_id Point_and_primitive_id;
-    /// \deprecated 
 		typedef typename AABBTraits::Object_and_primitive_id Object_and_primitive_id;
 
     /*!