diff --git a/doc/doxy/Doxyfile b/doc/doxy/Doxyfile
index 880e69b0c..2cd86526b 100644
--- a/doc/doxy/Doxyfile
+++ b/doc/doxy/Doxyfile
@@ -54,6 +54,7 @@ ALIASES                = qbk{1}="\xmlonly <qbk>\1</qbk> \endxmlonly" \
 			tparam_box="Any type fulfilling a Box Concept" \
 			tparam_box_or_segment="Any type fulfilling a Box Concept or a Segment Concept" \
 			tparam_calculation="numeric type for calculation (e.g. high precision); if [*void] then it is extracted automatically from the coordinate type and (if necessary) promoted to floating point" \
+			tparam_radius="numeric type for radius (of sphere, earth)" \
 			tparam_container="container type, for example std::vector, std::deque" \
 			tparam_dimension_required="Dimension, this template parameter is required. Should contain \\[0 .. n-1\\] for an n-dimensional geometry" \
 			tparam_first_point="first point type" \
diff --git a/doc/make_qbk.py b/doc/make_qbk.py
index 219fd27b8..ae8adfda7 100755
--- a/doc/make_qbk.py
+++ b/doc/make_qbk.py
@@ -36,6 +36,7 @@ cmd = cmd + " > generated/%s.qbk"
 
 def call_doxygen():
     os.chdir("doxy");
+    os.system("rm -f doxygen_output/xml/*.xml")
     os.system(doxygen_cmd)
     os.chdir("..")
 
diff --git a/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp b/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp
index a810865a7..620b5bf4c 100644
--- a/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp
+++ b/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp
@@ -50,8 +50,6 @@ namespace strategy { namespace distance
 \ingroup strategies
 \details Calculates distance using projected-point method, and (optionally) Pythagoras
 \author Adapted from: http://geometryalgorithms.com/Archive/algorithm_0102/algorithm_0102.htm
-\tparam Point \tparam_point
-\tparam PointOfSegment \tparam_segment_point
 \tparam CalculationType \tparam_calculation
 \tparam Strategy underlying point-point distance strategy
 \par Concepts for Strategy:
diff --git a/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp b/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
index 78c65de7a..4fe651b16 100644
--- a/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
+++ b/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
@@ -115,8 +115,6 @@ public :
 /*!
 \brief Strategy to calculate the distance between two points
 \ingroup strategies
-\tparam Point1 \tparam_first_point
-\tparam Point2 \tparam_second_point
 \tparam CalculationType \tparam_calculation
 
 \qbk{
@@ -131,8 +129,10 @@ template
 <
     typename CalculationType = void
 >
-struct pythagoras
+class pythagoras
 {
+public :
+
     template <typename P1, typename P2>
     struct calculation_type
         : util::calculation_type::geometric::binary
diff --git a/include/boost/geometry/strategies/spherical/distance_cross_track.hpp b/include/boost/geometry/strategies/spherical/distance_cross_track.hpp
index 167456f94..a174b5dee 100644
--- a/include/boost/geometry/strategies/spherical/distance_cross_track.hpp
+++ b/include/boost/geometry/strategies/spherical/distance_cross_track.hpp
@@ -44,8 +44,6 @@ namespace strategy { namespace distance
 \ingroup strategies
 \details Class which calculates the distance of a point to a segment, using latlong points
 \see http://williams.best.vwh.net/avform.htm
-\tparam Point point type
-\tparam PointOfSegment \tparam_segment_point
 \tparam CalculationType \tparam_calculation
 \tparam Strategy underlying point-point distance strategy, defaults to haversine
 
diff --git a/include/boost/geometry/strategies/spherical/distance_haversine.hpp b/include/boost/geometry/strategies/spherical/distance_haversine.hpp
index 2a9b2e5fc..60ccfdbd6 100644
--- a/include/boost/geometry/strategies/spherical/distance_haversine.hpp
+++ b/include/boost/geometry/strategies/spherical/distance_haversine.hpp
@@ -100,8 +100,7 @@ private :
 \brief Distance calculation for spherical coordinates
 on a perfect sphere using haversine
 \ingroup strategies
-\tparam Point1 \tparam_first_point
-\tparam Point2 \tparam_second_point
+\tparam RadiusType \tparam_radius
 \tparam CalculationType \tparam_calculation
 \author Adapted from: http://williams.best.vwh.net/avform.htm
 \see http://en.wikipedia.org/wiki/Great-circle_distance