From 82860688d12f6e8596626b9d83b7fac6c56eec44 Mon Sep 17 00:00:00 2001
From: Maxime Gimeno <maxime.gimeno@gmail.com>
Date: Tue, 24 Jan 2017 09:39:23 +0100
Subject: [PATCH] Fix the doc to avoid diffs between 1.8.4 and 1.8.13 outputs

---
 AABB_tree/include/CGAL/AABB_tree.h                            | 4 ++--
 Documentation/doc/resources/1.8.13/BaseDoxyfile.in            | 4 +++-
 Documentation/doc/resources/1.8.4/BaseDoxyfile.in             | 3 ++-
 Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h    | 4 ++--
 Polygon/include/CGAL/Polygon_2/Polygon_2_edge_iterator.h      | 4 ++--
 .../include/CGAL/Polygon_mesh_processing/fair.h               | 2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/AABB_tree/include/CGAL/AABB_tree.h b/AABB_tree/include/CGAL/AABB_tree.h
index 0e38064d066..60a0666fb55 100644
--- a/AABB_tree/include/CGAL/AABB_tree.h
+++ b/AABB_tree/include/CGAL/AABB_tree.h
@@ -1127,7 +1127,7 @@ public:
 		this->traversal(query, traversal_traits);
 		return traversal_traits.is_intersection_found();
 	}
-
+#ifndef DOXYGEN_RUNNING //To avoid doxygen to consider definition and declaration as 2 different functions (size_type causes problems)
 	template<typename Tr>
 	template<typename Query>
 	typename AABB_tree<Tr>::size_type
@@ -1146,7 +1146,7 @@ public:
 		this->traversal(query, traversal_traits);
 		return counter;
 	}
-
+#endif
 	template<typename Tr>
 	template<typename Query, typename OutputIterator>
 	OutputIterator
diff --git a/Documentation/doc/resources/1.8.13/BaseDoxyfile.in b/Documentation/doc/resources/1.8.13/BaseDoxyfile.in
index 18a37b7f2ee..9a4fdcb9d51 100644
--- a/Documentation/doc/resources/1.8.13/BaseDoxyfile.in
+++ b/Documentation/doc/resources/1.8.13/BaseDoxyfile.in
@@ -931,7 +931,9 @@ EXCLUDE_SYMBOLS        = Tr \
                          Cb \
                          Fb \
                          K \
-                         Traits
+                         Traits \
+                         internal \
+                         internal::* \
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or directories
 # that contain example code fragments that are included (see the \include
diff --git a/Documentation/doc/resources/1.8.4/BaseDoxyfile.in b/Documentation/doc/resources/1.8.4/BaseDoxyfile.in
index 2d0277784cc..3bb890c3213 100644
--- a/Documentation/doc/resources/1.8.4/BaseDoxyfile.in
+++ b/Documentation/doc/resources/1.8.4/BaseDoxyfile.in
@@ -816,7 +816,8 @@ EXCLUDE_SYMBOLS        = Tr \
                          Cb \
                          Fb \
                          K \
-                         Traits
+                         Traits \
+                         internal
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or
 # directories that contain example code fragments that are included (see
diff --git a/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h b/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h
index 756fd985a1a..42fad7a69a0 100644
--- a/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h
+++ b/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h
@@ -31,9 +31,9 @@
 #include <CGAL/Polygon_2/polygon_assertions.h>
 
 namespace CGAL {
-
+#ifndef DOXYGEN_RUNNING //to avoid conflicts
 template <class _Traits, class _Container> class Polygon_2;
-
+#endif
 template <class _Traits, class _Container>
 class Polygon_2_const_edge_circulator {
   public:
diff --git a/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_iterator.h b/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_iterator.h
index e2d0c8d01f5..a0fe9b716d1 100644
--- a/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_iterator.h
+++ b/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_iterator.h
@@ -29,9 +29,9 @@
 #include <CGAL/circulator.h>
 
 namespace CGAL {
-
+#ifndef DOXYGEN_RUNNING //to avoid conflicts
 template <class Traits_, class Container_> class Polygon_2;
-
+#ifndef
 template <class Segment_>
 class Polygon_2__Segment_ptr
 {
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h
index 8d6de21215a..3a9166b4725 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h
@@ -67,7 +67,7 @@ namespace internal {
   based on solving a linear bi-Laplacian system with boundary constraints,
   described in \cgalCite{Botsch2008OnLinearVariational}.
   The optional parameter `fairing_continuity` gives the ability to control the tangential
-  continuity C<sup>\a n</sup> of the output mesh.
+  continuity C<sup>\a n </sup>of the output mesh.
 
   The region described by `vertices` might contain multiple disconnected components.
   Note that the mesh connectivity is not altered in any way,