diff --git a/CGAL_ipelets/doc/CGAL_ipelets/CGAL/CGAL_Ipelet_base.h b/CGAL_ipelets/doc/CGAL_ipelets/CGAL/CGAL_Ipelet_base.h
index 6de155b98db..9e85a493cdb 100644
--- a/CGAL_ipelets/doc/CGAL_ipelets/CGAL/CGAL_Ipelet_base.h
+++ b/CGAL_ipelets/doc/CGAL_ipelets/CGAL/CGAL_Ipelet_base.h
@@ -99,12 +99,12 @@ typedef Kernel::Iso_rectangle_2 Iso_rectangle_2;
 /*! 
 Class type providing operators to extract points from segments and polygons. 
 */ 
-template<class output_iterator> Point_grabber; 
+template<class OutputIterator> Point_grabber; 
 
 /*! 
 Class type providing operators to extract segments from polygons. 
 */ 
-template<class output_iterator> Segment_grabber; 
+template<class OutputIterator> Segment_grabber; 
 
 /// @} 
 
@@ -185,7 +185,7 @@ bool deselect_all=true,
 bool delete_selected_objects=false); 
 
 /*! 
-returns an output iterator which wraps `it`. `Output_iterator` must be a model 
+returns an output iterator which wraps `it`. `OutputIterator` must be a model 
 of the output iterator concept accepting assignments from `Point_2`. 
 The returned output iterator will accept assignments from objects of types 
 `Polygon_2` or `Segment_2` or `Point_2`, it decomposes them in 
@@ -194,11 +194,11 @@ For more details on the returned output iterator refer to the Boost library
 <A HREF="http://www.boost.org/doc/libs/1_39_0/libs/iterator/doc/function_output_iterator.html">documentation</A>. 
 
 */ 
-template<class Output_iterator> 
-boost::function_output_iterator<Point_grabber<Output_iterator> > point_grabber(Output_iterator it); 
+template<class OutputIterator> 
+boost::function_output_iterator<Point_grabber<OutputIterator> > point_grabber(OutputIterator it); 
 
 /*! 
-returns an output iterator which wraps `it`. `Output_iterator` must be a model 
+returns an output iterator which wraps `it`. `OutputIterator` must be a model 
 of the output iterator concept accepting assignments from `Segment_2`. 
 The returned output iterator will accept assignments from objects of types 
 `Polygon_2` or `Segment_2`, it decomposes them in objects of type `Segment_2` 
@@ -207,8 +207,8 @@ For more details on the returned output iterator refer to the Boost library
 <A HREF="http://www.boost.org/doc/libs/1_39_0/libs/iterator/doc/function_output_iterator.html">documentation</A>. 
 
 */ 
-template<class Output_iterator> 
-boost::function_output_iterator<Segment_grabber<Output_iterator> > segment_grabber(Output_iterator it); 
+template<class OutputIterator> 
+boost::function_output_iterator<Segment_grabber<OutputIterator> > segment_grabber(OutputIterator it); 
 
 /*! 
 
diff --git a/Documentation/doxyassist.xml b/Documentation/doxyassist.xml
index d08cbed1e9a..54faf146e1e 100644
--- a/Documentation/doxyassist.xml
+++ b/Documentation/doxyassist.xml
@@ -1037,6 +1037,8 @@ namespace for the XML file to be processed properly.  -->
             <item>../CGAL_ipelets/examples</item>
             <item>../CGAL_ipelets/demo</item>
           </list>
+          <list name="TAGFILES" append="true">
+            <item>./tags/Polygon.tag=../../CGAL.CGAL.2D-Polygons/html</item>
         </doxygen>
       </project>