Boost-Commit :

barend.gehrels_at_[hidden]

-- 
Modified: trunk/libs/geometry/doc/reference.qbk
==============================================================================

--- trunk/libs/geometry/doc/reference.qbk	(original)
+++ trunk/libs/geometry/doc/reference.qbk	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -1,9 +1,7 @@
 [section:reference Reference]
 
-
 [section:algorithms Algorithms]
 
-
 [section:area area]
 [include reference/area.qbk]
 [endsect]
@@ -16,13 +14,13 @@
 [include reference/centroid.qbk]
 [endsect]
 
-[/section:combine combine]
-[/include reference/combine.qbk]
-[/endsect]
+[section:combine combine]
+[include reference/combine.qbk]
+[endsect]
 
-[/section:convert convert]
-[/include reference/convert.qbk]
-[/endsect]
+[section:convert convert]
+[include reference/convert.qbk]
+[endsect]
 
 [section:convex_hull convex_hull]
 [include reference/convex_hull.qbk]
@@ -32,9 +30,9 @@
 [include reference/difference.qbk]
 [endsect]
 
-[/section:disjoint disjoint]
-[/include reference/disjoint.qbk]
-[/endsect]
+[section:disjoint disjoint]
+[include reference/disjoint.qbk]
+[endsect]
 
 [section:dissolve dissolve]
 [include reference/dissolve.qbk]
@@ -49,13 +47,13 @@
 [include reference/envelope.qbk]
 [endsect]
 
-[/section:equals equals]
-[/include reference/equals.qbk]
-[/endsect]
+[section:equals equals]
+[include reference/equals.qbk]
+[endsect]
 
-[/ section:for_each for_each]
-[/ include reference/for_each.qbk]
-[/ endsect]
+[/section:for_each for_each]
+[/include reference/for_each.qbk]
+[/endsect]
 
 [section:intersection intersection]
 [include reference/intersection.qbk]
@@ -105,7 +103,7 @@
 [endsect]
 
 
-[endsect]
+[endsect] [/algorithms]
 
 
 
@@ -135,7 +133,6 @@
 [include reference/closing_iterator.qbk]
 
 
-[endsect]
-
+[endsect] 
 
-[endsect]
+[endsect] [/reference]
Modified: trunk/libs/geometry/doc/reference/combine.qbk
==============================================================================
--- trunk/libs/geometry/doc/reference/combine.qbk	(original)
+++ trunk/libs/geometry/doc/reference/combine.qbk	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -1,6 +1,6 @@
 [/ Generated by doxygen_xml2qbk, don't change, it will be overwritten automatically]
-[/ Generated from ..\doxygen_output\xml\group__combine.xml]
-[section:combine_2 combine (2)]
+[/ Generated from doxy/doxygen_output/xml/group__combine.xml]
+[section:combine combine]
 
 Combines a box with another geometry (box, point). 
 
@@ -13,17 +13,11 @@
 [table
 [[Type] [Concept] [Name] [Description] ]
 [[Box &] [type of the box ] [box] [box to combine another geometry with, might be changed ]]
-[[Geometry const &] [Any type fulfilling a Geometry concept ] [geometry] [A model of the specified concept ]]
+[[Geometry const &] [Any type fulfilling a Geometry Concept ] [geometry] [A model of the specified concept ]]
 ]
 
 
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/combine.hpp>`
 
 
Modified: trunk/libs/geometry/doc/reference/concept_point.qbk
==============================================================================
--- trunk/libs/geometry/doc/reference/concept_point.qbk	(original)
+++ trunk/libs/geometry/doc/reference/concept_point.qbk	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -1,2 +1,38 @@
 [/ Generated by doxygen_xml2qbk, don't change, it will be overwritten automatically]
-[/ Generated from doxy/doxygen_output/xml/classboost_1_1geometry_1_1concept_1_1_point.xml.xml]
+[/ Generated from doxy/doxygen_output/xml/classboost_1_1geometry_1_1concept_1_1_point.xml]
+[section:concept::Point concept::Point]
+
+[heading Description]
+A legacy point, defining the necessary specializations to fulfil to the concept.
+
+Suppose that the following point is defined:  
+
+It can then be adapted to the concept as following:  
+
+Note that it is done like above to show the system. Users will normally use the registration macro.
+
+A read-only legacy point, using a macro to fulfil to the 
+
+The point looks like the following:
+
+It uses the macro as following:  
+
+[heading Synopsis]
+``template<typename Geometry>
+class concept::Point
+{
+  // ...
+};
+``
+
+[heading Template parameter(s)]
+[table
+[[Parameter] [Description]]
+[[typename Geometry] []]
+]
+
+[heading Header]
+`#include <boost/geometry/geometries/concepts/point_concept.hpp>`
+
+[endsect]
+
Modified: trunk/libs/geometry/doc/reference/convert.qbk
==============================================================================
--- trunk/libs/geometry/doc/reference/convert.qbk	(original)
+++ trunk/libs/geometry/doc/reference/convert.qbk	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -1,9 +1,12 @@
 [/ Generated by doxygen_xml2qbk, don't change, it will be overwritten automatically]
-[/ Generated from ..\doxygen_output\xml\group__convert.xml]
-[section:convert_2 convert (2)]
+[/ Generated from doxy/doxygen_output/xml/group__convert.xml]
+[section:convert convert]
 
 Converts one geometry to another geometry. 
 
+[heading Description]
+The convert algorithm converts one geometry, e.g. a BOX, to another geometry, e.g. a RING. This only if it is possible and applicable.
+
 [heading Synopsis]
 ``template<typename Geometry1, typename Geometry2>
 void convert (Geometry1 const &geometry1, Geometry2 &geometry2)``
@@ -12,18 +15,12 @@
 
 [table
 [[Type] [Concept] [Name] [Description] ]
-[[Geometry1 const &] [Any type fulfilling a Geometry concept ] [geometry1] [A model of the specified concept (source) ]]
-[[Geometry2 &] [Any type fulfilling a Geometry concept ] [geometry2] [A model of the specified concept (target) ]]
+[[Geometry1 const &] [Any type fulfilling a Geometry Concept ] [geometry1] [A model of the specified concept (source) ]]
+[[Geometry2 &] [Any type fulfilling a Geometry Concept ] [geometry2] [A model of the specified concept (target) ]]
 ]
 
 
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/convert.hpp>`
 
 
Modified: trunk/libs/geometry/doc/reference/difference.qbk
==============================================================================
--- trunk/libs/geometry/doc/reference/difference.qbk	(original)
+++ trunk/libs/geometry/doc/reference/difference.qbk	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -1,30 +1,27 @@
 [/ Generated by doxygen_xml2qbk, don't change, it will be overwritten automatically]
-[/ Generated from ..\doxygen_output\xml\group__difference.xml]
-[section:difference_3 difference (3)]
+[/ Generated from doxy/doxygen_output/xml/group__difference.xml]
+[section:difference difference]
 
 
 
+[heading Description]
+Calculate the difference of two geometries
+
 [heading Synopsis]
 ``template<typename Geometry1, typename Geometry2, typename Collection>
-void difference (Geometry1 const &geometry1, Geometry2 geometry2, Collection &output_collection)``
+void difference (Geometry1 const &geometry1, Geometry2 const &geometry2, Collection &output_collection)``
 
 [heading Parameters]
 
 [table
 [[Type] [Concept] [Name] [Description] ]
-[[Geometry1 const &] [Any type fulfilling a Geometry concept ] [geometry1] [A model of the specified concept ]]
-[[Geometry2] [Any type fulfilling a Geometry concept ] [geometry2] [A model of the specified concept ]]
+[[Geometry1 const &] [Any type fulfilling a Geometry Concept ] [geometry1] [A model of the specified concept ]]
+[[Geometry2 const &] [Any type fulfilling a Geometry Concept ] [geometry2] [A model of the specified concept ]]
 [[Collection &] [output collection, either a multi-geometry, or a std::vector<Geometry> / std::deque<Geometry> etc ] [output_collection] [the output collection ]]
 ]
 
 
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/difference.hpp>`
 
 
Modified: trunk/libs/geometry/doc/reference/disjoint.qbk
==============================================================================
--- trunk/libs/geometry/doc/reference/disjoint.qbk	(original)
+++ trunk/libs/geometry/doc/reference/disjoint.qbk	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -1,6 +1,6 @@
 [/ Generated by doxygen_xml2qbk, don't change, it will be overwritten automatically]
-[/ Generated from ..\doxygen_output\xml\group__disjoint.xml]
-[section:disjoint_2 disjoint (2)]
+[/ Generated from doxy/doxygen_output/xml/group__disjoint.xml]
+[section:disjoint disjoint]
 
 Checks if two geometries are disjoint. 
 
@@ -12,8 +12,8 @@
 
 [table
 [[Type] [Concept] [Name] [Description] ]
-[[Geometry1 const &] [Any type fulfilling a Geometry concept ] [geometry1] [A model of the specified concept ]]
-[[Geometry2 const &] [Any type fulfilling a Geometry concept ] [geometry2] [A model of the specified concept ]]
+[[Geometry1 const &] [Any type fulfilling a Geometry Concept ] [geometry1] [A model of the specified concept ]]
+[[Geometry2 const &] [Any type fulfilling a Geometry Concept ] [geometry2] [A model of the specified concept ]]
 ]
 
 
@@ -21,12 +21,6 @@
 Returns true if two geometries are disjoint 
 
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/disjoint.hpp>`
 
 
Modified: trunk/libs/geometry/doc/reference/equals.qbk
==============================================================================
--- trunk/libs/geometry/doc/reference/equals.qbk	(original)
+++ trunk/libs/geometry/doc/reference/equals.qbk	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -1,6 +1,6 @@
 [/ Generated by doxygen_xml2qbk, don't change, it will be overwritten automatically]
-[/ Generated from ..\doxygen_output\xml\group__equals.xml]
-[section:equals_2 equals (2)]
+[/ Generated from doxy/doxygen_output/xml/group__equals.xml]
+[section:equals equals]
 
 Checks if a geometry are spatially equal. 
 
@@ -12,8 +12,8 @@
 
 [table
 [[Type] [Concept] [Name] [Description] ]
-[[Geometry1 const &] [Any type fulfilling a Geometry concept ] [geometry1] [A model of the specified concept ]]
-[[Geometry2 const &] [Any type fulfilling a Geometry concept ] [geometry2] [A model of the specified concept ]]
+[[Geometry1 const &] [Any type fulfilling a Geometry Concept ] [geometry1] [A model of the specified concept ]]
+[[Geometry2 const &] [Any type fulfilling a Geometry Concept ] [geometry2] [A model of the specified concept ]]
 ]
 
 
@@ -21,12 +21,6 @@
 Returns true if two geometries are spatially disjoint 
 
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/equals.hpp>`
 
 
Modified: trunk/libs/geometry/doc/reference/for_each.qbk
==============================================================================
--- trunk/libs/geometry/doc/reference/for_each.qbk	(original)
+++ trunk/libs/geometry/doc/reference/for_each.qbk	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -1,128 +1,104 @@
 [/ Generated by doxygen_xml2qbk, don't change, it will be overwritten automatically]
-[/ Generated from ..\doxygen_output\xml\group__for__each.xml]
-[section:for_each_point_2 for_each_point (2)]
+[/ Generated from doxy/doxygen_output/xml/group__for__each.xml]
+[section:for_each_point_2 for_each_point]
 
 Calls functor for geometry. 
 
 [heading Description]
-Calls the functor the specified 
+Calls the functor for the specified geometry 
 
 [heading Synopsis]
 ``template<typename Geometry, typename Functor>
-Functor for_each_point (Geometry const &geometry, Functor f)``
+Functor for_each_point (Geometry &geometry, Functor f)``
 
 [heading Parameters]
 
 [table
 [[Type] [Concept] [Name] [Description] ]
-[[Geometry const &] [] [geometry] [geometry to loop through ]]
+[[Geometry &] [] [geometry] [geometry to loop through ]]
 [[Functor] [] [f] [functor to use]]
 ]
 
 
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/for_each.hpp>`
 
 
 [endsect]
 
-[section:for_each_point_2 for_each_point (2)]
+[section:for_each_point_2 for_each_point]
 
 Calls functor for geometry. 
 
 [heading Description]
-Calls the functor for the specified geometry 
+Calls the functor the specified 
 
 [heading Synopsis]
 ``template<typename Geometry, typename Functor>
-Functor for_each_point (Geometry &geometry, Functor f)``
+Functor for_each_point (Geometry const &geometry, Functor f)``
 
 [heading Parameters]
 
 [table
 [[Type] [Concept] [Name] [Description] ]
-[[Geometry &] [] [geometry] [geometry to loop through ]]
+[[Geometry const &] [] [geometry] [geometry to loop through ]]
 [[Functor] [] [f] [functor to use]]
 ]
 
 
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/for_each.hpp>`
 
 
 [endsect]
 
-[section:for_each_segment_2 for_each_segment (2)]
+[section:for_each_segment_2 for_each_segment]
 
 Calls functor for segments on linestrings, rings, polygons, ... 
 
 [heading Description]
-Calls the functor all 
+Calls the functor all segments of the specified geometry 
 
 [heading Synopsis]
 ``template<typename Geometry, typename Functor>
-Functor for_each_segment (Geometry const &geometry, Functor f)``
+Functor for_each_segment (Geometry &geometry, Functor f)``
 
 [heading Parameters]
 
 [table
 [[Type] [Concept] [Name] [Description] ]
-[[Geometry const &] [] [geometry] [geometry to loop through ]]
+[[Geometry &] [] [geometry] [geometry to loop through ]]
 [[Functor] [] [f] [functor to use]]
 ]
 
 
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/for_each.hpp>`
 
 
 [endsect]
 
-[section:for_each_segment_2 for_each_segment (2)]
+[section:for_each_segment_2 for_each_segment]
 
 Calls functor for segments on linestrings, rings, polygons, ... 
 
 [heading Description]
-Calls the functor all segments of the specified geometry 
+Calls the functor all 
 
 [heading Synopsis]
 ``template<typename Geometry, typename Functor>
-Functor for_each_segment (Geometry &geometry, Functor f)``
+Functor for_each_segment (Geometry const &geometry, Functor f)``
 
 [heading Parameters]
 
 [table
 [[Type] [Concept] [Name] [Description] ]
-[[Geometry &] [] [geometry] [geometry to loop through ]]
+[[Geometry const &] [] [geometry] [geometry to loop through ]]
 [[Functor] [] [f] [functor to use]]
 ]
 
 
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/for_each.hpp>`
 
 
Modified: trunk/libs/geometry/doc/reference/overlaps.qbk
==============================================================================
--- trunk/libs/geometry/doc/reference/overlaps.qbk	(original)
+++ trunk/libs/geometry/doc/reference/overlaps.qbk	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -1,6 +1,6 @@
 [/ Generated by doxygen_xml2qbk, don't change, it will be overwritten automatically]
-[/ Generated from ..\doxygen_output\xml\group__overlaps.xml]
-[section:overlaps_2 overlaps (2)]
+[/ Generated from doxy/doxygen_output/xml/group__overlaps.xml]
+[section:overlaps overlaps]
 
 Checks if two geometries overlap. 
 
@@ -21,12 +21,6 @@
 Returns true if two geometries overlap 
 
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/overlaps.hpp>`
 
 
Modified: trunk/libs/geometry/doc/reference/sym_difference.qbk
==============================================================================
--- trunk/libs/geometry/doc/reference/sym_difference.qbk	(original)
+++ trunk/libs/geometry/doc/reference/sym_difference.qbk	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -1,30 +1,24 @@
 [/ Generated by doxygen_xml2qbk, don't change, it will be overwritten automatically]
-[/ Generated from ..\doxygen_output\xml\group__sym__difference.xml]
-[section:sym_difference_3 sym_difference (3)]
+[/ Generated from doxy/doxygen_output/xml/group__sym__difference.xml]
+[section:sym_difference sym_difference]
 
-calculates2{symmetric difference} 
+Calculate the symmetric difference of two geometries. 
 
 [heading Synopsis]
 ``template<typename Geometry1, typename Geometry2, typename Collection>
-void sym_difference (Geometry1 geometry1, Geometry2 geometry2, Collection &output_collection)``
+void sym_difference (Geometry1 const &geometry1, Geometry2 const &geometry2, Collection &output_collection)``
 
 [heading Parameters]
 
 [table
 [[Type] [Concept] [Name] [Description] ]
-[[Geometry1] [Any type fulfilling a Geometry concept ] [geometry1] [A model of the specified concept ]]
-[[Geometry2] [Any type fulfilling a Geometry concept ] [geometry2] [A model of the specified concept ]]
+[[Geometry1 const &] [Any type fulfilling a Geometry Concept ] [geometry1] [A model of the specified concept ]]
+[[Geometry2 const &] [Any type fulfilling a Geometry Concept ] [geometry2] [A model of the specified concept ]]
 [[Collection &] [output collection, either a multi-geometry, or a std::vector<Geometry> / std::deque<Geometry> etc ] [output_collection] [the output collection ]]
 ]
 
 
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/sym_difference.hpp>`
 
 
Modified: trunk/libs/geometry/doc/reference/transform.qbk
==============================================================================
--- trunk/libs/geometry/doc/reference/transform.qbk	(original)
+++ trunk/libs/geometry/doc/reference/transform.qbk	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -1,62 +1,50 @@
 [/ Generated by doxygen_xml2qbk, don't change, it will be overwritten automatically]
-[/ Generated from ..\doxygen_output\xml\group__transform.xml]
-[section:transform_3 transform (3)]
+[/ Generated from doxy/doxygen_output/xml/group__transform.xml]
+[section:transform_2 transform]
 
 Transforms from one geometry to another geometry using a strategy. 
 
 [heading Synopsis]
-``template<typename Geometry1, typename Geometry2, typename Strategy>
-bool transform (Geometry1 const &geometry1, Geometry2 &geometry2, Strategy const &strategy)``
+``template<typename Geometry1, typename Geometry2>
+bool transform (Geometry1 const &geometry1, Geometry2 &geometry2)``
 
 [heading Parameters]
 
 [table
 [[Type] [Concept] [Name] [Description] ]
-[[Geometry1 const &] [Any type fulfilling a Geometry concept ] [geometry1] [A model of the specified concept ]]
-[[Geometry2 &] [Any type fulfilling a Geometry concept ] [geometry2] [A model of the specified concept ]]
-[[Strategy const &] [strategy ] [strategy] [the strategy to be used for transformation ]]
+[[Geometry1 const &] [Any type fulfilling a Geometry Concept ] [geometry1] [A model of the specified concept ]]
+[[Geometry2 &] [Any type fulfilling a Geometry Concept ] [geometry2] [A model of the specified concept ]]
 ]
 
 
-[heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
+[heading Returns]
+true if the transformation could be done 
 
+[heading Header]
 `#include <boost/geometry/algorithms/transform.hpp>`
 
 
 [endsect]
 
-[section:transform_2 transform (2)]
+[section:transform_3 transform]
 
 Transforms from one geometry to another geometry using a strategy. 
 
 [heading Synopsis]
-``template<typename Geometry1, typename Geometry2>
-bool transform (Geometry1 const &geometry1, Geometry2 &geometry2)``
+``template<typename Geometry1, typename Geometry2, typename Strategy>
+bool transform (Geometry1 const &geometry1, Geometry2 &geometry2, Strategy const &strategy)``
 
 [heading Parameters]
 
 [table
 [[Type] [Concept] [Name] [Description] ]
-[[Geometry1 const &] [Any type fulfilling a Geometry concept ] [geometry1] [A model of the specified concept ]]
-[[Geometry2 &] [Any type fulfilling a Geometry concept ] [geometry2] [A model of the specified concept ]]
+[[Geometry1 const &] [Any type fulfilling a Geometry Concept ] [geometry1] [A model of the specified concept ]]
+[[Geometry2 &] [Any type fulfilling a Geometry Concept ] [geometry2] [A model of the specified concept ]]
+[[Strategy const &] [strategy ] [strategy] [the strategy to be used for transformation ]]
 ]
 
 
-[heading Returns]
-true if the transformation could be done 
-
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/transform.hpp>`
 
 
Modified: trunk/libs/geometry/doc/reference/union.qbk
==============================================================================
--- trunk/libs/geometry/doc/reference/union.qbk	(original)
+++ trunk/libs/geometry/doc/reference/union.qbk	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -1,6 +1,6 @@
 [/ Generated by doxygen_xml2qbk, don't change, it will be overwritten automatically]
-[/ Generated from ..\doxygen_output\xml\group__union.xml]
-[section:union__3 union_ (3)]
+[/ Generated from doxy/doxygen_output/xml/group__union.xml]
+[section:union_ union_]
 
 Combines two geometries which each other. 
 
@@ -12,40 +12,34 @@
 
 [table
 [[Type] [Concept] [Name] [Description] ]
-[[Geometry1 const &] [Any type fulfilling a Geometry concept ] [geometry1] [A model of the specified concept ]]
-[[Geometry2 const &] [Any type fulfilling a Geometry concept ] [geometry2] [A model of the specified concept ]]
+[[Geometry1 const &] [Any type fulfilling a Geometry Concept ] [geometry1] [A model of the specified concept ]]
+[[Geometry2 const &] [Any type fulfilling a Geometry Concept ] [geometry2] [A model of the specified concept ]]
 [[Collection &] [output collection, either a multi-geometry, or a std::vector<Geometry> / std::deque<Geometry> etc ] [output_collection] [the output collection ]]
 ]
 
 
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/union.hpp>`
 
 
 [endsect]
 
-[section:union_inserter_4 union_inserter (4)]
+[section:union_inserter_3 union_inserter]
 
 Combines two geometries which each other. 
 
 [heading Synopsis]
-``template<typename GeometryOut, typename Geometry1, typename Geometry2, typename OutputIterator, typename Strategy>
-OutputIterator union_inserter (Geometry1 const &geometry1, Geometry2 const &geometry2, OutputIterator out, Strategy const &strategy)``
+``template<typename GeometryOut, typename Geometry1, typename Geometry2, typename OutputIterator>
+OutputIterator union_inserter (Geometry1 const &geometry1, Geometry2 const &geometry2, OutputIterator out)``
 
 [heading Parameters]
 
 [table
 [[Type] [Concept] [Name] [Description] ]
-[[Geometry1 const &] [Any type fulfilling a Geometry concept ] [geometry1] [A model of the specified concept ]]
-[[Geometry2 const &] [Any type fulfilling a Geometry concept ] [geometry2] [A model of the specified concept ]]
+[[GeometryOut] [output geometry type, must be specified ] [ - ] [Must be specified]]
+[[Geometry1 const &] [Any type fulfilling a Geometry Concept ] [geometry1] [A model of the specified concept ]]
+[[Geometry2 const &] [Any type fulfilling a Geometry Concept ] [geometry2] [A model of the specified concept ]]
 [[OutputIterator] [output iterator ] [out] [the output iterator, outputting polygons ]]
-[[Strategy const &] [compound strategy for intersection ] [strategy] [the strategy ]]
 ]
 
 
@@ -53,32 +47,28 @@
 the output iterator 
 
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/union.hpp>`
 
 
 [endsect]
 
-[section:union_inserter_3 union_inserter (3)]
+[section:union_inserter_4 union_inserter]
 
 Combines two geometries which each other. 
 
 [heading Synopsis]
-``template<typename GeometryOut, typename Geometry1, typename Geometry2, typename OutputIterator>
-OutputIterator union_inserter (Geometry1 const &geometry1, Geometry2 const &geometry2, OutputIterator out)``
+``template<typename GeometryOut, typename Geometry1, typename Geometry2, typename OutputIterator, typename Strategy>
+OutputIterator union_inserter (Geometry1 const &geometry1, Geometry2 const &geometry2, OutputIterator out, Strategy const &strategy)``
 
 [heading Parameters]
 
 [table
 [[Type] [Concept] [Name] [Description] ]
-[[Geometry1 const &] [Any type fulfilling a Geometry concept ] [geometry1] [A model of the specified concept ]]
-[[Geometry2 const &] [Any type fulfilling a Geometry concept ] [geometry2] [A model of the specified concept ]]
+[[GeometryOut] [output geometry type, must be specified ] [ - ] [Must be specified]]
+[[Geometry1 const &] [Any type fulfilling a Geometry Concept ] [geometry1] [A model of the specified concept ]]
+[[Geometry2 const &] [Any type fulfilling a Geometry Concept ] [geometry2] [A model of the specified concept ]]
 [[OutputIterator] [output iterator ] [out] [the output iterator, outputting polygons ]]
+[[Strategy const &] [compound strategy for intersection ] [strategy] [the strategy ]]
 ]
 
 
@@ -86,12 +76,6 @@
 the output iterator 
 
 [heading Header]
-Either
-
-`#include <boost/geometry/geometry.hpp>`
-
-Or
-
 `#include <boost/geometry/algorithms/union.hpp>`
 
 
Added: trunk/libs/geometry/index.html
==============================================================================
--- (empty file)
+++ trunk/libs/geometry/index.html	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -0,0 +1,16 @@
+
+<!--
+Copyright 2010 Barend Gehrels.
+Distributed under the Boost Software License, Version 1.0. (See accompanying
+file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+-->
+
+<html>
+<head>
+    <meta http-equiv="refresh" content="0; URL=doc/html/index.html">
+</head>
+<body>
+Automatic redirection failed, please go to
+doc/html/index.html
+</body>
+</html>
Modified: trunk/libs/libraries.htm
==============================================================================
--- trunk/libs/libraries.htm	(original)
+++ trunk/libs/libraries.htm	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -151,11 +151,13 @@
         From Joel de Guzman, Dan Marsden and Tobias Schwinger.</li>
     <li>gil - Generic Image Library, from
         Lubomir Bourdev and Hailin Jin.</li>
+    <li>geometry - Geometry Library, from
+        Barend Gehrels, Bruno Lalande and Mateusz Loskot.</li>
     <li>graph -
         Generic graph components and algorithms, from Jeremy Siek
         and a University of Notre Dame team; now maintained by Andrew Sutton and Jeremiah Willcock.</li>
     <li>icl -
-        Interval Container Library, interval sets and maps and aggregation 
+        Interval Container Library, interval sets and maps and aggregation
         of associated values, from Joachim Faulhaber.</li>
     <li>integer - Headers to ease
         dealing with integral types.</li>
@@ -243,10 +245,10 @@
         Abrahams.</li>
     <li>random - A complete
         system for random number generation, from Jens Maurer.</li>
-    <li>range - Concepts and utilities for 
-        range-based algorithms, as well as range-based algorithms and range 
-        adaptors that allow for efficient and very expressive code, from 
-        Thorsten Ottosen and Neil Groves.</li> 
+    <li>range - Concepts and utilities for
+        range-based algorithms, as well as range-based algorithms and range
+        adaptors that allow for efficient and very expressive code, from
+        Thorsten Ottosen and Neil Groves.</li>
     <li>rational - A rational
         number class, from Paul Moore.</li>
 
@@ -368,7 +370,7 @@
         Generic graph components and algorithms, from Jeremy Siek
         and a University of Notre Dame team; now maintained by Andrew Sutton and Jeremiah Willcock.</li>
     <li>icl -
-        Interval Container Library, interval sets and maps and aggregation 
+        Interval Container Library, interval sets and maps and aggregation
         of associated values, from Joachim Faulhaber.</li>
     <li>intrusive - Intrusive containers and algorithms, from Ion Gazta&ntilde;aga</li>
     <li>multi_array - Multidimensional
@@ -414,6 +416,8 @@
         iterating over the elements of a sequence, from Eric Niebler.</li>
     <li>gil - Generic Image Library, from
         Lubomir Bourdev and Hailin Jin.</li>
+    <li>geometry - Geometry Library, from
+        Barend Gehrels, Bruno Lalande and Mateusz Loskot.</li>
     <li>graph -
         Generic graph components and algorithms, from Jeremy Siek
         and a University of Notre Dame team; now maintained by Andrew Sutton and Jeremiah Willcock.</li>
@@ -542,6 +546,8 @@
 <ul>
     <li>accumulators - Framework for incremental
         calculation, and collection of statistical accumulators, from Eric Niebler.</li>
+    <li>geometry - Geometry Library, from
+        Barend Gehrels, Bruno Lalande and Mateusz Loskot.</li>
     <li>integer - Headers to ease
         dealing with integral types.</li>
     <li>interval - Extends the
@@ -603,7 +609,7 @@
         Library for working with tuples, including various containers, algorithms, etc.
         From Joel de Guzman and Dan Marsden and Tobias Schwinger.</li>
     <li>icl -
-        Interval Container Library, interval sets and maps and aggregation 
+        Interval Container Library, interval sets and maps and aggregation
         of associated values, from Joachim Faulhaber.</li>
     <li>multi_index - Containers with
     multiple STL-compatible access interfaces, from Joaqu&iacute;n M L&oacute;pez
Modified: trunk/libs/maintainers.txt
==============================================================================
--- trunk/libs/maintainers.txt	(original)
+++ trunk/libs/maintainers.txt	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -38,6 +38,7 @@
 functional/hash       Daniel James <dnljms -at- gmail.com>
 fusion                Joel de Guzman <joel -at- boost-consulting.com>, Dan Marsden <danmarsden -at- yahoo.co.uk>, Tobias Schwinger <tschwinger -at- isonews2.com>
 function_types        Tobias Schwinger <tschwinger -at- isonews2.com>
+geometry              Barend Gehrels <barend -at- geodan.nl>, Bruno Lalande <bruno.lalande -at- gmail.com> and Mateusz Loskot <mateusz -at- loskot.net>
 gil                   Lubomir Bourdev <lbourdev -at- adobe.com>, Hailin Jin <hljin -at- adobe.com>
 graph                 Andrew Sutton <asutton -at- cs.kent.edu>
 icl                   Joachim Faulhaber <afojgo -at- gmail.com>
Modified: trunk/status/Jamfile.v2
==============================================================================
--- trunk/status/Jamfile.v2	(original)
+++ trunk/status/Jamfile.v2	2010-12-31 09:29:53 EST (Fri, 31 Dec 2010)
@@ -75,6 +75,7 @@
     functional/hash/test        # test-suite functional/hash
     function_types/test         # test-suite function_types
     fusion/test                 # test-suite fusion
+    geometry/test               # test-suite geometry
     gil/test                    # test-suite gil
     graph/test                  # test-suite graph
     graph_parallel/test         # test-suite graph/parallel
