diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index 5ac6f4ca1..006ea7920 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -1,7 +1,9 @@
-# doc/quickbook/Jamfile.v2 builds Quickbook documentation for Geometry library
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
-# Copyright (c) 2010 Barend Gehrels
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
diff --git a/doc/about_documentation.qbk b/doc/about_documentation.qbk
index 75ad4468e..4a4abe0fa 100644
--- a/doc/about_documentation.qbk
+++ b/doc/about_documentation.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/acknowledgments.qbk b/doc/acknowledgments.qbk
index 2b6521e23..3678f49c5 100644
--- a/doc/acknowledgments.qbk
+++ b/doc/acknowledgments.qbk
@@ -1,9 +1,9 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
-  Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
+  Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 
   Use, modification and distribution is subject to the Boost Software License,
   Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/concept/box.qbk b/doc/concept/box.qbk
index 6d85ceea9..496e4df9d 100644
--- a/doc/concept/box.qbk
+++ b/doc/concept/box.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/concept/linestring.qbk b/doc/concept/linestring.qbk
index 5fcab43e0..dba503eb3 100644
--- a/doc/concept/linestring.qbk
+++ b/doc/concept/linestring.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/concept/multi_linestring.qbk b/doc/concept/multi_linestring.qbk
index 24e094bfd..3b7e0569b 100644
--- a/doc/concept/multi_linestring.qbk
+++ b/doc/concept/multi_linestring.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/concept/multi_point.qbk b/doc/concept/multi_point.qbk
index e785caf3c..4127c47aa 100644
--- a/doc/concept/multi_point.qbk
+++ b/doc/concept/multi_point.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/concept/multi_polygon.qbk b/doc/concept/multi_polygon.qbk
index ca705c26f..3dbae687b 100644
--- a/doc/concept/multi_polygon.qbk
+++ b/doc/concept/multi_polygon.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/concept/point.qbk b/doc/concept/point.qbk
index 11c6a753c..d44170444 100644
--- a/doc/concept/point.qbk
+++ b/doc/concept/point.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/concept/polygon.qbk b/doc/concept/polygon.qbk
index 4db97db07..cebdd1722 100644
--- a/doc/concept/polygon.qbk
+++ b/doc/concept/polygon.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/concept/ring.qbk b/doc/concept/ring.qbk
index 3219e18a0..ea57f115e 100644
--- a/doc/concept/ring.qbk
+++ b/doc/concept/ring.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/concept/segment.qbk b/doc/concept/segment.qbk
index 6dd6958f9..a0cf0dd75 100644
--- a/doc/concept/segment.qbk
+++ b/doc/concept/segment.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/design_rationale.qbk b/doc/design_rationale.qbk
index b0318243b..b718e8930 100644
--- a/doc/design_rationale.qbk
+++ b/doc/design_rationale.qbk
@@ -1,7 +1,7 @@
 [/==============================================================================
-    Copyright (c) 1995-2010 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-    Copyright (c) 2008-2010 Bruno Lalande, Paris, France.
-    Copyright (c) 2009-2010 Mateusz Loskot (mateusz@loskot.net), London, UK
+    Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+    Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+    Copyright (c) 2009-2011 Mateusz Loskot, London, UK., London, UK
 
     Use, modification and distribution is subject to the Boost Software License,
     Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/doxy/doxygen_enhance.py b/doc/doxy/doxygen_enhance.py
index 69ce6067a..af892be98 100755
--- a/doc/doxy/doxygen_enhance.py
+++ b/doc/doxy/doxygen_enhance.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 # ===========================================================================
-#  Copyright (c) 2010 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+#  Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
 # 
 #  Use, modification and distribution is subject to the Boost Software License,
 #  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/doxy/doxygen_input/ggl_doxygen_footer.html b/doc/doxy/doxygen_input/ggl_doxygen_footer.html
index f30fadf3a..277d8c692 100644
--- a/doc/doxy/doxygen_input/ggl_doxygen_footer.html
+++ b/doc/doxy/doxygen_input/ggl_doxygen_footer.html
@@ -3,12 +3,13 @@
 <tbody>
 <tr>
 <td align="left"><small>
-<p>December 31, 2010</p>
+<p>April 2, 2011</p>
 </small></td>
 <td align="right">
-<small>Copyright © 1995-2010 Barend Gehrels, Geodan, Amsterdam<br>
-Copyright © 2008-2010 Bruno Lalande, Paris<br>
-Copyright © 2010 Mateusz Loskot, Cadcorp, London<br>
+<small>
+Copyright &copy; 2007-2011 Barend Gehrels, Amsterdam, the Netherlands<br>
+Copyright &copy; 2008-2011 Bruno Lalande, Paris, France<br>
+Copyright &copy; 2009-2010 Mateusz Loskot, London, UK<br>
 </small>
 </td>
 </tr>
diff --git a/doc/doxy/doxygen_input/groups/groups.hpp b/doc/doxy/doxygen_input/groups/groups.hpp
index a72a87dd2..32aff8ee2 100644
--- a/doc/doxy/doxygen_input/groups/groups.hpp
+++ b/doc/doxy/doxygen_input/groups/groups.hpp
@@ -1,6 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2011, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/doc/doxy/doxygen_input/pages/doxygen_b_sets.hpp b/doc/doxy/doxygen_input/pages/doxygen_b_sets.hpp
index f94b13bfe..4a562772e 100644
--- a/doc/doxy/doxygen_input/pages/doxygen_b_sets.hpp
+++ b/doc/doxy/doxygen_input/pages/doxygen_b_sets.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/doxy/doxygen_input/pages/doxygen_c_strategy_rationale.hpp b/doc/doxy/doxygen_input/pages/doxygen_c_strategy_rationale.hpp
index e72c83340..3e5409108 100644
--- a/doc/doxy/doxygen_input/pages/doxygen_c_strategy_rationale.hpp
+++ b/doc/doxy/doxygen_input/pages/doxygen_c_strategy_rationale.hpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/doxy/doxygen_input/pages/doxygen_d_robustness.hpp b/doc/doxy/doxygen_input/pages/doxygen_d_robustness.hpp
index 4646ef4c6..6cf0e57d6 100644
--- a/doc/doxy/doxygen_input/pages/doxygen_d_robustness.hpp
+++ b/doc/doxy/doxygen_input/pages/doxygen_d_robustness.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka Boost.Geometry, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/doxy/doxygen_input/pages/doxygen_examples.hpp b/doc/doxy/doxygen_input/pages/doxygen_examples.hpp
index 68a0f74ec..665a6423e 100644
--- a/doc/doxy/doxygen_input/pages/doxygen_examples.hpp
+++ b/doc/doxy/doxygen_input/pages/doxygen_examples.hpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/doxy/doxygen_input/pages/doxygen_mainpage.hpp b/doc/doxy/doxygen_input/pages/doxygen_mainpage.hpp
index c96e8d8d5..c61c69c74 100644
--- a/doc/doxy/doxygen_input/pages/doxygen_mainpage.hpp
+++ b/doc/doxy/doxygen_input/pages/doxygen_mainpage.hpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2010, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2010
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/doxy/doxygen_input/pages/doxygen_pages.hpp b/doc/doxy/doxygen_input/pages/doxygen_pages.hpp
index c1293c718..c48a13788 100644
--- a/doc/doxy/doxygen_input/pages/doxygen_pages.hpp
+++ b/doc/doxy/doxygen_input/pages/doxygen_pages.hpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/doxy/doxygen_input/pages/doxygen_z_article09.hpp b/doc/doxy/doxygen_input/pages/doxygen_z_article09.hpp
index 92b324c50..6684acdad 100644
--- a/doc/doxy/doxygen_input/pages/doxygen_z_article09.hpp
+++ b/doc/doxy/doxygen_input/pages/doxygen_z_article09.hpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp b/doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp
index 2838b00f5..ccfcd994f 100644
--- a/doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp
+++ b/doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp
@@ -2,8 +2,8 @@ OBSOLETE
 
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/doxy/doxygen_input/sourcecode/doxygen_2.cpp b/doc/doxy/doxygen_input/sourcecode/doxygen_2.cpp
index 93895d8ac..dd3594c7e 100644
--- a/doc/doxy/doxygen_input/sourcecode/doxygen_2.cpp
+++ b/doc/doxy/doxygen_input/sourcecode/doxygen_2.cpp
@@ -2,8 +2,8 @@ OBSOLETE
 
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/doxy/doxygen_input/sourcecode/doxygen_3.cpp b/doc/doxy/doxygen_input/sourcecode/doxygen_3.cpp
index 306d0c722..1b6de0e60 100644
--- a/doc/doxy/doxygen_input/sourcecode/doxygen_3.cpp
+++ b/doc/doxy/doxygen_input/sourcecode/doxygen_3.cpp
@@ -2,8 +2,8 @@ OBSOLETE
 
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp b/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp
index 8a52a0956..c78f99745 100644
--- a/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp
+++ b/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp
@@ -2,8 +2,8 @@ OBSOLETE
 
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/doxy/doxygen_input/sourcecode/doxygen_5.cpp b/doc/doxy/doxygen_input/sourcecode/doxygen_5.cpp
index 772157bbc..4bab23d94 100644
--- a/doc/doxy/doxygen_input/sourcecode/doxygen_5.cpp
+++ b/doc/doxy/doxygen_input/sourcecode/doxygen_5.cpp
@@ -2,8 +2,8 @@ OBSOLETE
 
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/doxy/make_documentation.bat b/doc/doxy/make_documentation.bat
index e7e3dcea2..bdb6d8feb 100644
--- a/doc/doxy/make_documentation.bat
+++ b/doc/doxy/make_documentation.bat
@@ -1,5 +1,5 @@
 :: ===========================================================================
-::  Copyright (c) 2010 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+::  Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
 :: 
 ::  Use, modification and distribution is subject to the Boost Software License,
 ::  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/generated/boost-no-inspect b/doc/generated/boost-no-inspect
new file mode 100644
index 000000000..b0177ad8c
--- /dev/null
+++ b/doc/generated/boost-no-inspect
@@ -0,0 +1 @@
+Tell inspect to ignore directory
\ No newline at end of file
diff --git a/doc/geometry.qbk b/doc/geometry.qbk
index b88eff880..52ef199eb 100644
--- a/doc/geometry.qbk
+++ b/doc/geometry.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/imports.qbk b/doc/imports.qbk
index a40b9cca7..708d276c4 100644
--- a/doc/imports.qbk
+++ b/doc/imports.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/introduction.qbk b/doc/introduction.qbk
index 5849ac84a..c1a155240 100644
--- a/doc/introduction.qbk
+++ b/doc/introduction.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/make_qbk.py b/doc/make_qbk.py
index 111e122a5..5401471b7 100755
--- a/doc/make_qbk.py
+++ b/doc/make_qbk.py
@@ -1,9 +1,9 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 # ===========================================================================
-#  Copyright (c) 1995-2010 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-#  Copyright (c) 2008-2010 Bruno Lalande, Paris, France.
-#  Copyright (c) 2009-2010 Mateusz Loskot (mateusz@loskot.net), London, UK
+#  Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+#  Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+#  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net), London, UK
 # 
 #  Use, modification and distribution is subject to the Boost Software License,
 #  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/matrix.qbk b/doc/matrix.qbk
index edce80f34..3612c7e11 100644
--- a/doc/matrix.qbk
+++ b/doc/matrix.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/quickbook/arithmetic.qbk b/doc/quickbook/arithmetic.qbk
index 833440f67..d7d4f5aed 100644
--- a/doc/quickbook/arithmetic.qbk
+++ b/doc/quickbook/arithmetic.qbk
@@ -1,7 +1,7 @@
 [/==============================================================================
-    Copyright (c) 1995-2010 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-    Copyright (c) 2008-2010 Bruno Lalande, Paris, France.
-    Copyright (c) 2009-2010 Mateusz Loskot (mateusz@loskot.net), London, UK
+    Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+    Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+    Copyright (c) 2009-2011 Mateusz Loskot, London, UK., London, UK
 
     Use, modification and distribution is subject to the Boost Software License,
     Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/quickbook/boolean.qbk b/doc/quickbook/boolean.qbk
index 4d99a23dd..a984fa077 100644
--- a/doc/quickbook/boolean.qbk
+++ b/doc/quickbook/boolean.qbk
@@ -1,7 +1,7 @@
 [/==============================================================================
-    Copyright (c) 1995-2010 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-    Copyright (c) 2008-2010 Bruno Lalande, Paris, France.
-    Copyright (c) 2009-2010 Mateusz Loskot (mateusz@loskot.net), London, UK
+    Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+    Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+    Copyright (c) 2009-2011 Mateusz Loskot, London, UK., London, UK
 
     Use, modification and distribution is subject to the Boost Software License,
     Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/quickbook/geometries.qbk b/doc/quickbook/geometries.qbk
index b869633bd..0832848f8 100644
--- a/doc/quickbook/geometries.qbk
+++ b/doc/quickbook/geometries.qbk
@@ -1,7 +1,7 @@
 [/==============================================================================
-    Copyright (c) 1995-2010 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-    Copyright (c) 2008-2010 Bruno Lalande, Paris, France.
-    Copyright (c) 2009-2010 Mateusz Loskot (mateusz@loskot.net), London, UK
+    Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+    Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+    Copyright (c) 2009-2011 Mateusz Loskot, London, UK., London, UK
 
     Use, modification and distribution is subject to the Boost Software License,
     Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/quickbook/geometry_concepts.qbk b/doc/quickbook/geometry_concepts.qbk
index 1b31ca478..e96a4f9bf 100644
--- a/doc/quickbook/geometry_concepts.qbk
+++ b/doc/quickbook/geometry_concepts.qbk
@@ -1,7 +1,7 @@
 [/==============================================================================
-    Copyright (c) 1995-2010 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-    Copyright (c) 2008-2010 Bruno Lalande, Paris, France.
-    Copyright (c) 2009-2010 Mateusz Loskot (mateusz@loskot.net), London, UK
+    Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+    Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+    Copyright (c) 2009-2011 Mateusz Loskot, London, UK., London, UK
 
     Use, modification and distribution is subject to the Boost Software License,
     Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/quickbook/geometry_types.qbk b/doc/quickbook/geometry_types.qbk
index 8be790bb8..702e1c587 100644
--- a/doc/quickbook/geometry_types.qbk
+++ b/doc/quickbook/geometry_types.qbk
@@ -1,7 +1,7 @@
 [/==============================================================================
-    Copyright (c) 1995-2010 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-    Copyright (c) 2008-2010 Bruno Lalande, Paris, France.
-    Copyright (c) 2009-2010 Mateusz Loskot (mateusz@loskot.net), London, UK
+    Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+    Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+    Copyright (c) 2009-2011 Mateusz Loskot, London, UK., London, UK
 
     Use, modification and distribution is subject to the Boost Software License,
     Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/quickbook/misc.qbk b/doc/quickbook/misc.qbk
index 3d082086f..e97074741 100644
--- a/doc/quickbook/misc.qbk
+++ b/doc/quickbook/misc.qbk
@@ -1,7 +1,7 @@
 [/==============================================================================
-    Copyright (c) 1995-2010 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-    Copyright (c) 2008-2010 Bruno Lalande, Paris, France.
-    Copyright (c) 2009-2010 Mateusz Loskot (mateusz@loskot.net), London, UK
+    Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+    Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+    Copyright (c) 2009-2011 Mateusz Loskot, London, UK., London, UK
 
     Use, modification and distribution is subject to the Boost Software License,
     Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/quickbook/readme.txt b/doc/quickbook/readme.txt
index 30c976dcf..afcc3292a 100644
--- a/doc/quickbook/readme.txt
+++ b/doc/quickbook/readme.txt
@@ -1,5 +1,5 @@
 ===========================================================================
- Copyright (c) 2010 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+ Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
 
  Use, modification and distribution is subject to the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/quickbook/references.qbk b/doc/quickbook/references.qbk
index d66ac4cba..077a4264f 100644
--- a/doc/quickbook/references.qbk
+++ b/doc/quickbook/references.qbk
@@ -1,7 +1,7 @@
 [/==============================================================================
-    Copyright (c) 1995-2010 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-    Copyright (c) 2008-2010 Bruno Lalande, Paris, France.
-    Copyright (c) 2009-2010 Mateusz Loskot (mateusz@loskot.net), London, UK
+    Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+    Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+    Copyright (c) 2009-2011 Mateusz Loskot, London, UK., London, UK
 
     Use, modification and distribution is subject to the Boost Software License,
     Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/quickbook/strategy_rationale.qbk b/doc/quickbook/strategy_rationale.qbk
index 4de8aa331..911c1a08c 100644
--- a/doc/quickbook/strategy_rationale.qbk
+++ b/doc/quickbook/strategy_rationale.qbk
@@ -1,7 +1,7 @@
 [/==============================================================================
-    Copyright (c) 1995-2010 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-    Copyright (c) 2008-2010 Bruno Lalande, Paris, France.
-    Copyright (c) 2009-2010 Mateusz Loskot (mateusz@loskot.net), London, UK
+    Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+    Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+    Copyright (c) 2009-2011 Mateusz Loskot, London, UK., London, UK
 
     Use, modification and distribution is subject to the Boost Software License,
     Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/quickref.xml b/doc/quickref.xml
index 671beaf7d..1da360c6f 100644
--- a/doc/quickref.xml
+++ b/doc/quickref.xml
@@ -5,8 +5,8 @@
 <!--
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/quickstart.qbk b/doc/quickstart.qbk
index 288057039..98893fc8c 100644
--- a/doc/quickstart.qbk
+++ b/doc/quickstart.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/readme.txt b/doc/readme.txt
index dce7e74fb..ffc623eb2 100644
--- a/doc/readme.txt
+++ b/doc/readme.txt
@@ -1,7 +1,7 @@
 ===========================================================================
- Copyright (c) 1995-2010 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
- Copyright (c) 2008-2010 Bruno Lalande, Paris, France.
- Copyright (c) 2009-2010 Mateusz Loskot (mateusz@loskot.net), London, UK
+ Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+ Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+ Copyright (c) 2009-2011 Mateusz Loskot, London, UK
 
  Use, modification and distribution is subject to the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/reference.qbk b/doc/reference.qbk
index 50a784573..d5a045365 100644
--- a/doc/reference.qbk
+++ b/doc/reference.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/append.qbk b/doc/reference/algorithms/append.qbk
index 4261adfb5..51bd98273 100644
--- a/doc/reference/algorithms/append.qbk
+++ b/doc/reference/algorithms/append.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/area.qbk b/doc/reference/algorithms/area.qbk
index ef43280f5..dfa6a1852 100644
--- a/doc/reference/algorithms/area.qbk
+++ b/doc/reference/algorithms/area.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/buffer.qbk b/doc/reference/algorithms/buffer.qbk
index 6ae71a426..950775230 100644
--- a/doc/reference/algorithms/buffer.qbk
+++ b/doc/reference/algorithms/buffer.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/centroid.qbk b/doc/reference/algorithms/centroid.qbk
index 8803e9e4d..1e29aea50 100644
--- a/doc/reference/algorithms/centroid.qbk
+++ b/doc/reference/algorithms/centroid.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/centroid_strategies.qbk b/doc/reference/algorithms/centroid_strategies.qbk
index f3d34740b..5f643ceaa 100644
--- a/doc/reference/algorithms/centroid_strategies.qbk
+++ b/doc/reference/algorithms/centroid_strategies.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/intersection.qbk b/doc/reference/algorithms/intersection.qbk
index ad897034f..e51377874 100644
--- a/doc/reference/algorithms/intersection.qbk
+++ b/doc/reference/algorithms/intersection.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/intersects.qbk b/doc/reference/algorithms/intersects.qbk
index 809ca5f51..5553f17b2 100644
--- a/doc/reference/algorithms/intersects.qbk
+++ b/doc/reference/algorithms/intersects.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/length.qbk b/doc/reference/algorithms/length.qbk
index 8511e53c0..0d2dadc11 100644
--- a/doc/reference/algorithms/length.qbk
+++ b/doc/reference/algorithms/length.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/num_geometries.qbk b/doc/reference/algorithms/num_geometries.qbk
index ce4de4c5a..d37577e54 100644
--- a/doc/reference/algorithms/num_geometries.qbk
+++ b/doc/reference/algorithms/num_geometries.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/num_interior_rings.qbk b/doc/reference/algorithms/num_interior_rings.qbk
index ee27b6186..0dfe57057 100644
--- a/doc/reference/algorithms/num_interior_rings.qbk
+++ b/doc/reference/algorithms/num_interior_rings.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/num_points.qbk b/doc/reference/algorithms/num_points.qbk
index d23e1d24a..cd8c58a65 100644
--- a/doc/reference/algorithms/num_points.qbk
+++ b/doc/reference/algorithms/num_points.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/perimeter.qbk b/doc/reference/algorithms/perimeter.qbk
index 9c4103b03..0b7898469 100644
--- a/doc/reference/algorithms/perimeter.qbk
+++ b/doc/reference/algorithms/perimeter.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/simplify.qbk b/doc/reference/algorithms/simplify.qbk
index 39b43fcc1..a134d3645 100644
--- a/doc/reference/algorithms/simplify.qbk
+++ b/doc/reference/algorithms/simplify.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/simplify_inserter.qbk b/doc/reference/algorithms/simplify_inserter.qbk
index 148a227a5..1dd96bd39 100644
--- a/doc/reference/algorithms/simplify_inserter.qbk
+++ b/doc/reference/algorithms/simplify_inserter.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/sym_difference.qbk b/doc/reference/algorithms/sym_difference.qbk
index cf0b8d0da..2058ca2d9 100644
--- a/doc/reference/algorithms/sym_difference.qbk
+++ b/doc/reference/algorithms/sym_difference.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/union.qbk b/doc/reference/algorithms/union.qbk
index d6bb91591..8c86a6110 100644
--- a/doc/reference/algorithms/union.qbk
+++ b/doc/reference/algorithms/union.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/algorithms/within.qbk b/doc/reference/algorithms/within.qbk
index 054b8ce5e..d2c907ca1 100644
--- a/doc/reference/algorithms/within.qbk
+++ b/doc/reference/algorithms/within.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/core/get_box.qbk b/doc/reference/core/get_box.qbk
index 5971ef28e..964278857 100644
--- a/doc/reference/core/get_box.qbk
+++ b/doc/reference/core/get_box.qbk
@@ -1,7 +1,7 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
 
   Use, modification and distribution is subject to the Boost Software License,
   Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/reference/core/get_point.qbk b/doc/reference/core/get_point.qbk
index 1091ccd5d..f1495158c 100644
--- a/doc/reference/core/get_point.qbk
+++ b/doc/reference/core/get_point.qbk
@@ -1,7 +1,7 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
 
   Use, modification and distribution is subject to the Boost Software License,
   Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/reference/core/set_box.qbk b/doc/reference/core/set_box.qbk
index 530084d15..9f3ff0fe9 100644
--- a/doc/reference/core/set_box.qbk
+++ b/doc/reference/core/set_box.qbk
@@ -1,7 +1,7 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
 
   Use, modification and distribution is subject to the Boost Software License,
   Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/reference/core/set_point.qbk b/doc/reference/core/set_point.qbk
index 8591a655b..73d36ff9b 100644
--- a/doc/reference/core/set_point.qbk
+++ b/doc/reference/core/set_point.qbk
@@ -1,7 +1,7 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
 
   Use, modification and distribution is subject to the Boost Software License,
   Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/reference/geometries/point.qbk b/doc/reference/geometries/point.qbk
index 34c14eec8..eb949a99a 100644
--- a/doc/reference/geometries/point.qbk
+++ b/doc/reference/geometries/point.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/reference/geometries/register/point.qbk b/doc/reference/geometries/register/point.qbk
index f337e5216..b3d056664 100644
--- a/doc/reference/geometries/register/point.qbk
+++ b/doc/reference/geometries/register/point.qbk
@@ -1,8 +1,8 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net)
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
   Copyright (c) 2009-2011 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/Jamfile.v2 b/doc/src/docutils/tools/doxygen_xml2qbk/Jamfile.v2
index b5eed0617..b775048d0 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/Jamfile.v2
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/Jamfile.v2
@@ -1,7 +1,9 @@
-# Controls building of doxygen_xml2qbk
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+# Doxygen XML to QuickBook
 #
-# Copyright Barend Gehrels, Geodan Holding B.V. Amsterdam, the Netherlands.
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2010-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/configuration.hpp b/doc/src/docutils/tools/doxygen_xml2qbk/configuration.hpp
index c0af6abd3..977dc5784 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/configuration.hpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/configuration.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_elements.hpp b/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_elements.hpp
index 449e2b2d9..cafb9b934 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_elements.hpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_elements.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp b/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp
index a6eb4eb92..1c86ec551 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp
@@ -1,6 +1,6 @@
 // doxml2qbk (developed in the context of Boost.Geometry documentation)
 //
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp b/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp
index 3f8a7b9fc..a3a999927 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/file_to_string.hpp b/doc/src/docutils/tools/doxygen_xml2qbk/file_to_string.hpp
index 976102765..6bd75c1ac 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/file_to_string.hpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/file_to_string.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/parameter_predicates.hpp b/doc/src/docutils/tools/doxygen_xml2qbk/parameter_predicates.hpp
index a4fa3a0ab..d658da997 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/parameter_predicates.hpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/parameter_predicates.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp b/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp
index e3953b459..f1fb92869 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/rapidxml_util.hpp b/doc/src/docutils/tools/doxygen_xml2qbk/rapidxml_util.hpp
index afd9d650d..914c0d2fb 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/rapidxml_util.hpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/rapidxml_util.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/sample/Jamfile.v2 b/doc/src/docutils/tools/doxygen_xml2qbk/sample/Jamfile.v2
index 6fca69f6e..28384b5e8 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/sample/Jamfile.v2
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/sample/Jamfile.v2
@@ -1,6 +1,9 @@
-# doc/quickbook/Jamfile.v2 builds Quickbook documentation for Geometry library
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2011 Barend Gehrels
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/sample/fruit.qbk b/doc/src/docutils/tools/doxygen_xml2qbk/sample/fruit.qbk
index 4145bb8ec..46a211913 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/sample/fruit.qbk
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/sample/fruit.qbk
@@ -1,7 +1,7 @@
 [/============================================================================
   Boost.Fruit (aka GGL, Generic Fruit Library)
 
-  Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
   Use, modification and distribution is subject to 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)
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/sample/make_qbk.py b/doc/src/docutils/tools/doxygen_xml2qbk/sample/make_qbk.py
index 1424e1970..fc52700e4 100755
--- a/doc/src/docutils/tools/doxygen_xml2qbk/sample/make_qbk.py
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/sample/make_qbk.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 # ===========================================================================
-#  Copyright (c) 2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
+#  Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
 # 
 #  Use, modification and distribution is subject to the Boost Software License,
 #  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/sample/src/examples/apple_example.cpp b/doc/src/docutils/tools/doxygen_xml2qbk/sample/src/examples/apple_example.cpp
index 8effa188a..e985236ba 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/sample/src/examples/apple_example.cpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/sample/src/examples/apple_example.cpp
@@ -1,12 +1,11 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2011, Geodan, Amsterdam, the Netherlands
+// doxygen_xml2qbk Example
+
+// Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
-//
-// Quickbook Example
-// (in this case a near literally copy of the main but normally a small example
 
 //[apple
 //` Call eat for the apple
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/sample/src/fruit.cpp b/doc/src/docutils/tools/doxygen_xml2qbk/sample/src/fruit.cpp
index 953e4f8df..a0efd0f56 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/sample/src/fruit.cpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/sample/src/fruit.cpp
@@ -1,3 +1,13 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// doxygen_xml2qbk Example
+
+// Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
+
+// Use, modification and distribution is subject to 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)
+
+
 #include <iostream>
 #include <string>
 
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/sample/src/fruit.hpp b/doc/src/docutils/tools/doxygen_xml2qbk/sample/src/fruit.hpp
index 3ba752764..eff722b4d 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/sample/src/fruit.hpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/sample/src/fruit.hpp
@@ -1,3 +1,13 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// doxygen_xml2qbk Example
+
+// Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
+
+// Use, modification and distribution is subject to 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)
+
+
 #ifndef FRUIT_HPP
 #define FRUIT_HPP
 
diff --git a/doc/src/docutils/tools/implementation_status/Jamfile.v2 b/doc/src/docutils/tools/implementation_status/Jamfile.v2
index 5c17c367d..0733ec621 100644
--- a/doc/src/docutils/tools/implementation_status/Jamfile.v2
+++ b/doc/src/docutils/tools/implementation_status/Jamfile.v2
@@ -1,7 +1,9 @@
-# example/Jamfile.v2 controls building of Generic Geometry Library examples
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright Barend Gehrels, Geodan Holding B.V. Amsterdam, the Netherlands.
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
diff --git a/doc/src/docutils/tools/implementation_status/implementation_status.cpp b/doc/src/docutils/tools/implementation_status/implementation_status.cpp
index 5a17ecde9..3ce54c289 100644
--- a/doc/src/docutils/tools/implementation_status/implementation_status.cpp
+++ b/doc/src/docutils/tools/implementation_status/implementation_status.cpp
@@ -1,6 +1,9 @@
-// implementation_status (developed in the context of Boost.Geometry documentation)
-//
-// Copyright Barend Gehrels 2010, 2011, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Tool reporting Implementation Status in QBK format
+
+// Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2011 Bruno Lalande, Paris, France.
+
 // Use, modification and distribution is subject to 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)
diff --git a/doc/src/docutils/tools/implementation_status/implementation_status.hpp b/doc/src/docutils/tools/implementation_status/implementation_status.hpp
index 1c52fd3dd..6e2718ba1 100644
--- a/doc/src/docutils/tools/implementation_status/implementation_status.hpp
+++ b/doc/src/docutils/tools/implementation_status/implementation_status.hpp
@@ -1,3 +1,5 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
 // implementation_status (developed in the context of Boost.Geometry documentation)
 //
 // Copyright Barend Gehrels 2010, 2011, Geodan, Amsterdam, the Netherlands
diff --git a/doc/src/docutils/tools/implementation_status/tmp/Jamfile.v2 b/doc/src/docutils/tools/implementation_status/tmp/Jamfile.v2
index 0e9ee06bc..db7e5490a 100644
--- a/doc/src/docutils/tools/implementation_status/tmp/Jamfile.v2
+++ b/doc/src/docutils/tools/implementation_status/tmp/Jamfile.v2
@@ -1,7 +1,8 @@
-# example/Jamfile.v2 controls building of Generic Geometry Library examples
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright Barend Gehrels, Geodan Holding B.V. Amsterdam, the Netherlands.
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2011 Bruno Lalande, Paris, France.
+
 # Use, modification and distribution is subject to 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)
diff --git a/doc/src/examples/Jamfile.v2 b/doc/src/examples/Jamfile.v2
index d480d2835..527b07c19 100644
--- a/doc/src/examples/Jamfile.v2
+++ b/doc/src/examples/Jamfile.v2
@@ -1,7 +1,9 @@
 # Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright Barend Gehrels, Geodan Holding B.V. Amsterdam, the Netherlands.
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
diff --git a/doc/src/examples/algorithms/Jamfile.v2 b/doc/src/examples/algorithms/Jamfile.v2
index 7f3da6c3f..d1be69fb9 100644
--- a/doc/src/examples/algorithms/Jamfile.v2
+++ b/doc/src/examples/algorithms/Jamfile.v2
@@ -1,7 +1,9 @@
 # Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright Barend Gehrels, Geodan Holding B.V. Amsterdam, the Netherlands.
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
diff --git a/doc/src/examples/core/Jamfile.v2 b/doc/src/examples/core/Jamfile.v2
index 727fd79d4..9575b21cc 100644
--- a/doc/src/examples/core/Jamfile.v2
+++ b/doc/src/examples/core/Jamfile.v2
@@ -1,7 +1,9 @@
 # Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright Barend Gehrels, Geodan Holding B.V. Amsterdam, the Netherlands.
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
diff --git a/doc/src/examples/geometries/Jamfile.v2 b/doc/src/examples/geometries/Jamfile.v2
index 121f778ba..49465b344 100644
--- a/doc/src/examples/geometries/Jamfile.v2
+++ b/doc/src/examples/geometries/Jamfile.v2
@@ -1,7 +1,9 @@
 # Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright Barend Gehrels, Geodan Holding B.V. Amsterdam, the Netherlands.
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
diff --git a/doc/src/examples/geometries/register/Jamfile.v2 b/doc/src/examples/geometries/register/Jamfile.v2
index 0840d65d0..b22d5f7a0 100644
--- a/doc/src/examples/geometries/register/Jamfile.v2
+++ b/doc/src/examples/geometries/register/Jamfile.v2
@@ -1,7 +1,9 @@
 # Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright Barend Gehrels, Geodan Holding B.V. Amsterdam, the Netherlands.
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
diff --git a/example/01_point_example.cpp b/example/01_point_example.cpp
index d3f5b4b38..ee5698de2 100644
--- a/example/01_point_example.cpp
+++ b/example/01_point_example.cpp
@@ -1,7 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/02_linestring_example.cpp b/example/02_linestring_example.cpp
index d457d42e7..014aaa2a8 100644
--- a/example/02_linestring_example.cpp
+++ b/example/02_linestring_example.cpp
@@ -1,7 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/03_polygon_example.cpp b/example/03_polygon_example.cpp
index 3be684232..0e36dd73d 100644
--- a/example/03_polygon_example.cpp
+++ b/example/03_polygon_example.cpp
@@ -1,7 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/04_boost_example.cpp b/example/04_boost_example.cpp
index 99efbd283..288ea6690 100644
--- a/example/04_boost_example.cpp
+++ b/example/04_boost_example.cpp
@@ -1,6 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2011, Geodan, Amsterdam, the Netherlands
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/05_a_overlay_polygon_example.cpp b/example/05_a_overlay_polygon_example.cpp
index 0312d298e..40d7b4633 100644
--- a/example/05_a_overlay_polygon_example.cpp
+++ b/example/05_a_overlay_polygon_example.cpp
@@ -1,6 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright (C) 2010 Mateusz Loskot <mateusz at loskot dot net>, London, UK
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/05_b_overlay_linestring_polygon_example.cpp b/example/05_b_overlay_linestring_polygon_example.cpp
index 1b2463942..93cc98861 100644
--- a/example/05_b_overlay_linestring_polygon_example.cpp
+++ b/example/05_b_overlay_linestring_polygon_example.cpp
@@ -1,6 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/06_a_transformation_example.cpp b/example/06_a_transformation_example.cpp
index b239ddcbc..2c13911e2 100644
--- a/example/06_a_transformation_example.cpp
+++ b/example/06_a_transformation_example.cpp
@@ -1,7 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/06_b_transformation_example.cpp b/example/06_b_transformation_example.cpp
index 1f17aa5cd..f31c7fd13 100644
--- a/example/06_b_transformation_example.cpp
+++ b/example/06_b_transformation_example.cpp
@@ -1,12 +1,12 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
+// Example: Affine Transformation (translate, scale, rotate)
 //
-// Copyright (c) 2009 Mateusz Loskot (mateusz@loskot.net), London, UK
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 //
 // Use, modification and distribution is subject to 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)
-//
-// Example: Affine Transformation (translate, scale, rotate)
+
 
 #include <ctime> // for std::time
 #include <algorithm>
diff --git a/example/07_a_graph_route_example.cpp b/example/07_a_graph_route_example.cpp
index 17d368409..a41575a25 100644
--- a/example/07_a_graph_route_example.cpp
+++ b/example/07_a_graph_route_example.cpp
@@ -1,7 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/07_b_graph_route_example.cpp b/example/07_b_graph_route_example.cpp
index e6a64983c..7ab224433 100644
--- a/example/07_b_graph_route_example.cpp
+++ b/example/07_b_graph_route_example.cpp
@@ -1,7 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/08_units_example.cpp b/example/08_units_example.cpp
index 5badd1287..ca65a6ef7 100644
--- a/example/08_units_example.cpp
+++ b/example/08_units_example.cpp
@@ -1,6 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2011, Geodan, Amsterdam, the Netherlands
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/Jamfile.v2 b/example/Jamfile.v2
index 00cfe0ca4..fe9380115 100644
--- a/example/Jamfile.v2
+++ b/example/Jamfile.v2
@@ -1,7 +1,10 @@
-# example/Jamfile.v2 controls building of Generic Geometry Library examples
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+# Controls building of Boost.Geometry examples
 #
-# Copyright Barend Gehrels, Geodan Holding B.V. Amsterdam, the Netherlands.
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
@@ -29,9 +32,7 @@ exe c04_a_custom_triangle_example : c04_a_custom_triangle_example.cpp ;
 exe c04_b_custom_triangle_example : c04_b_custom_triangle_example.cpp ;
 exe c06_custom_polygon_example : c06_custom_polygon_example.cpp  ;
 exe c07_custom_ring_pointer_example : c07_custom_ring_pointer_example.cpp ;
-
 exe c08_custom_non_std_example : c08_custom_non_std_example.cpp ;
 exe c09_custom_fusion_example : c09_custom_fusion_example.cpp ;
-
 exe c10_custom_cs_example : c10_custom_cs_example.cpp ;
 exe c11_custom_cs_transform_example : c11_custom_cs_transform_example.cpp ;
diff --git a/example/c01_custom_point_example.cpp b/example/c01_custom_point_example.cpp
index 5f9a9020c..0534feb04 100644
--- a/example/c01_custom_point_example.cpp
+++ b/example/c01_custom_point_example.cpp
@@ -1,7 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/c02_custom_box_example.cpp b/example/c02_custom_box_example.cpp
index bcfe55374..5d6d74e6b 100644
--- a/example/c02_custom_box_example.cpp
+++ b/example/c02_custom_box_example.cpp
@@ -1,7 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/c03_custom_linestring_example.cpp b/example/c03_custom_linestring_example.cpp
index a699a0fbf..118bbaced 100644
--- a/example/c03_custom_linestring_example.cpp
+++ b/example/c03_custom_linestring_example.cpp
@@ -1,7 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/c04_a_custom_triangle_example.cpp b/example/c04_a_custom_triangle_example.cpp
index f90eb5ffb..a8084a98c 100644
--- a/example/c04_a_custom_triangle_example.cpp
+++ b/example/c04_a_custom_triangle_example.cpp
@@ -1,7 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/c04_b_custom_triangle_example.cpp b/example/c04_b_custom_triangle_example.cpp
index f50778d53..99acaa34e 100644
--- a/example/c04_b_custom_triangle_example.cpp
+++ b/example/c04_b_custom_triangle_example.cpp
@@ -1,7 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/c05_custom_point_pointer_example.cpp b/example/c05_custom_point_pointer_example.cpp
index 79ac3747d..d3787df7e 100644
--- a/example/c05_custom_point_pointer_example.cpp
+++ b/example/c05_custom_point_pointer_example.cpp
@@ -1,7 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/c06_custom_polygon_example.cpp b/example/c06_custom_polygon_example.cpp
index e036af9ae..6067a7358 100644
--- a/example/c06_custom_polygon_example.cpp
+++ b/example/c06_custom_polygon_example.cpp
@@ -1,6 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/c07_custom_ring_pointer_example.cpp b/example/c07_custom_ring_pointer_example.cpp
index fdd82a9c4..8168dc0d9 100644
--- a/example/c07_custom_ring_pointer_example.cpp
+++ b/example/c07_custom_ring_pointer_example.cpp
@@ -1,6 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/c08_custom_non_std_example.cpp b/example/c08_custom_non_std_example.cpp
index 7d98182a8..2a8460ecf 100644
--- a/example/c08_custom_non_std_example.cpp
+++ b/example/c08_custom_non_std_example.cpp
@@ -1,6 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2009, Geodan, Amsterdam, the Netherlands.
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/c09_custom_fusion_example.cpp b/example/c09_custom_fusion_example.cpp
index e1b5cfeb4..6bc3779b7 100644
--- a/example/c09_custom_fusion_example.cpp
+++ b/example/c09_custom_fusion_example.cpp
@@ -1,7 +1,8 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2011, Geodan, Amsterdam, the Netherlands
-// Copyright Akira Takahashi 2011
+
+// Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2011 Akira Takahashi
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/c10_custom_cs_example.cpp b/example/c10_custom_cs_example.cpp
index b24c60d88..bd1ace607 100644
--- a/example/c10_custom_cs_example.cpp
+++ b/example/c10_custom_cs_example.cpp
@@ -1,6 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/c11_custom_cs_transform_example.cpp b/example/c11_custom_cs_transform_example.cpp
index 0e3979130..35465581a 100644
--- a/example/c11_custom_cs_transform_example.cpp
+++ b/example/c11_custom_cs_transform_example.cpp
@@ -1,6 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/example/experimental/geometry_of.cpp b/example/experimental/geometry_of.cpp
index fb2fb4e65..71626c2f1 100644
--- a/example/experimental/geometry_of.cpp
+++ b/example/experimental/geometry_of.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/example/extensions/Jamfile.v2 b/example/extensions/Jamfile.v2
index a66cf74bc..265f37c48 100644
--- a/example/extensions/Jamfile.v2
+++ b/example/extensions/Jamfile.v2
@@ -1,6 +1,9 @@
-# example/extensions/Jamfile.v2 controls building examples for GGL extensions
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
diff --git a/example/extensions/gis/Jamfile.v2 b/example/extensions/gis/Jamfile.v2
index 3cd927ab8..b8ef373f5 100644
--- a/example/extensions/gis/Jamfile.v2
+++ b/example/extensions/gis/Jamfile.v2
@@ -1,6 +1,9 @@
-# example/extensions/gis/Jamfile.v2 controls building of GGL examples for GIS
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
diff --git a/example/extensions/gis/io/shapelib/shapelib.cpp b/example/extensions/gis/io/shapelib/shapelib.cpp
index 27ee276b8..c7fc4931b 100644
--- a/example/extensions/gis/io/shapelib/shapelib.cpp
+++ b/example/extensions/gis/io/shapelib/shapelib.cpp
@@ -1,6 +1,6 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/example/extensions/gis/latlong/Jamfile.v2 b/example/extensions/gis/latlong/Jamfile.v2
index 526716b1a..b0444821f 100644
--- a/example/extensions/gis/latlong/Jamfile.v2
+++ b/example/extensions/gis/latlong/Jamfile.v2
@@ -1,6 +1,9 @@
-# example/Jamfile.v2 controls building of Generic Geometry Library examples
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright Barend Gehrels, Geodan Holding B.V. Amsterdam, the Netherlands.
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
diff --git a/example/extensions/gis/latlong/distance_example.cpp b/example/extensions/gis/latlong/distance_example.cpp
index 294e24db0..c1279db28 100644
--- a/example/extensions/gis/latlong/distance_example.cpp
+++ b/example/extensions/gis/latlong/distance_example.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/example/extensions/gis/latlong/point_ll_example.cpp b/example/extensions/gis/latlong/point_ll_example.cpp
index 4477c3f38..91dc4e2c6 100644
--- a/example/extensions/gis/latlong/point_ll_example.cpp
+++ b/example/extensions/gis/latlong/point_ll_example.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/example/extensions/gis/projections/Jamfile.v2 b/example/extensions/gis/projections/Jamfile.v2
index 913c7a402..5c138eb74 100644
--- a/example/extensions/gis/projections/Jamfile.v2
+++ b/example/extensions/gis/projections/Jamfile.v2
@@ -1,6 +1,9 @@
-# example/Jamfile.v2 controls building of Generic Geometry Library examples
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright Barend Gehrels, Geodan Holding B.V. Amsterdam, the Netherlands.
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
diff --git a/example/extensions/gis/projections/p01_projection_example.cpp b/example/extensions/gis/projections/p01_projection_example.cpp
index 1518571bf..5692867e2 100644
--- a/example/extensions/gis/projections/p01_projection_example.cpp
+++ b/example/extensions/gis/projections/p01_projection_example.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/example/extensions/gis/projections/p02_projfactory_example.cpp b/example/extensions/gis/projections/p02_projfactory_example.cpp
index b21060515..469fb7c81 100644
--- a/example/extensions/gis/projections/p02_projfactory_example.cpp
+++ b/example/extensions/gis/projections/p02_projfactory_example.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/example/extensions/gis/projections/p03_projmap_example.cpp b/example/extensions/gis/projections/p03_projmap_example.cpp
index c60b0f59a..48f65c245 100644
--- a/example/extensions/gis/projections/p03_projmap_example.cpp
+++ b/example/extensions/gis/projections/p03_projmap_example.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/example/with_external_libs/x01_qt_example.cpp b/example/with_external_libs/x01_qt_example.cpp
index 9ca94e9af..639026fa6 100644
--- a/example/with_external_libs/x01_qt_example.cpp
+++ b/example/with_external_libs/x01_qt_example.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/example/with_external_libs/x02_gd_example.cpp b/example/with_external_libs/x02_gd_example.cpp
index e3b05fe5a..e51e6d09f 100644
--- a/example/with_external_libs/x02_gd_example.cpp
+++ b/example/with_external_libs/x02_gd_example.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/example/with_external_libs/x03_a_soci_example.cpp b/example/with_external_libs/x03_a_soci_example.cpp
index 7802ab9c5..9177d15c4 100644
--- a/example/with_external_libs/x03_a_soci_example.cpp
+++ b/example/with_external_libs/x03_a_soci_example.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/example/with_external_libs/x03_b_soci_example.cpp b/example/with_external_libs/x03_b_soci_example.cpp
index 3e227f4ba..238e694b0 100644
--- a/example/with_external_libs/x03_b_soci_example.cpp
+++ b/example/with_external_libs/x03_b_soci_example.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/example/with_external_libs/x03_c_soci_example.cpp b/example/with_external_libs/x03_c_soci_example.cpp
index a648d804e..d2310ba75 100644
--- a/example/with_external_libs/x03_c_soci_example.cpp
+++ b/example/with_external_libs/x03_c_soci_example.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Mateusz Loskot 2009, mateusz@loskot.net
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/example/with_external_libs/x03_d_soci_example.cpp b/example/with_external_libs/x03_d_soci_example.cpp
index 58cdf8693..448bc3658 100644
--- a/example/with_external_libs/x03_d_soci_example.cpp
+++ b/example/with_external_libs/x03_d_soci_example.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Mateusz Loskot 2009, mateusz@loskot.net
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/example/with_external_libs/x04_wxwidgets_world_mapper.cpp b/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
index 2faf60adc..b09f3f3b7 100644
--- a/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
+++ b/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/example/with_external_libs/x05_shapelib_example.cpp b/example/with_external_libs/x05_shapelib_example.cpp
index fe3791385..c096c9b8b 100644
--- a/example/with_external_libs/x05_shapelib_example.cpp
+++ b/example/with_external_libs/x05_shapelib_example.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/example/with_external_libs/x06_qt_world_mapper.cpp b/example/with_external_libs/x06_qt_world_mapper.cpp
index 8b71bd4d5..ebf788c95 100644
--- a/example/with_external_libs/x06_qt_world_mapper.cpp
+++ b/example/with_external_libs/x06_qt_world_mapper.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 8b45e8cc1..6a26f8729 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/Jamfile.v2 controls building of Generic Geometry Library unit tests
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/algorithms/Jamfile.v2 b/test/algorithms/Jamfile.v2
index 03de334e6..4c3a0f705 100644
--- a/test/algorithms/Jamfile.v2
+++ b/test/algorithms/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/algorithms/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/algorithms/append.cpp b/test/algorithms/append.cpp
index b3b0f749e..f16d8a3c3 100644
--- a/test/algorithms/append.cpp
+++ b/test/algorithms/append.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/area.cpp b/test/algorithms/area.cpp
index c0fa46768..c3d56a63e 100644
--- a/test/algorithms/area.cpp
+++ b/test/algorithms/area.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/assign.cpp b/test/algorithms/assign.cpp
index feb1119b8..96bd35e0a 100644
--- a/test/algorithms/assign.cpp
+++ b/test/algorithms/assign.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/buffer.cpp b/test/algorithms/buffer.cpp
index 0ffca4c03..3f662bca4 100644
--- a/test/algorithms/buffer.cpp
+++ b/test/algorithms/buffer.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/centroid.cpp b/test/algorithms/centroid.cpp
index e077f83d9..22ce6bc11 100644
--- a/test/algorithms/centroid.cpp
+++ b/test/algorithms/centroid.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/comparable_distance.cpp b/test/algorithms/comparable_distance.cpp
index 4b01320f3..ccf93e5d4 100644
--- a/test/algorithms/comparable_distance.cpp
+++ b/test/algorithms/comparable_distance.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/convert.cpp b/test/algorithms/convert.cpp
index e3426f32a..5a3669e0a 100644
--- a/test/algorithms/convert.cpp
+++ b/test/algorithms/convert.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/convex_hull.cpp b/test/algorithms/convex_hull.cpp
index fb211c42a..53c0e246a 100644
--- a/test/algorithms/convex_hull.cpp
+++ b/test/algorithms/convex_hull.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/correct.cpp b/test/algorithms/correct.cpp
index 093d66abc..869e6efa9 100644
--- a/test/algorithms/correct.cpp
+++ b/test/algorithms/correct.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/detail/Jamfile.v2 b/test/algorithms/detail/Jamfile.v2
index b574c592d..e34d4986c 100644
--- a/test/algorithms/detail/Jamfile.v2
+++ b/test/algorithms/detail/Jamfile.v2
@@ -1,4 +1,8 @@
-# Copyright (c) 2011 Barend Gehrels
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/algorithms/detail/partition.cpp b/test/algorithms/detail/partition.cpp
index d0eef1c22..37eb4ae34 100644
--- a/test/algorithms/detail/partition.cpp
+++ b/test/algorithms/detail/partition.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/detail/sections/Jamfile.v2 b/test/algorithms/detail/sections/Jamfile.v2
index 303034b49..222861a01 100644
--- a/test/algorithms/detail/sections/Jamfile.v2
+++ b/test/algorithms/detail/sections/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/algorithms/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2010 Barend Gehrels
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/algorithms/detail/sections/range_by_section.cpp b/test/algorithms/detail/sections/range_by_section.cpp
index a0dc13131..4ac576f2a 100644
--- a/test/algorithms/detail/sections/range_by_section.cpp
+++ b/test/algorithms/detail/sections/range_by_section.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/detail/sections/sectionalize.cpp b/test/algorithms/detail/sections/sectionalize.cpp
index b61315c89..0fe0c5138 100644
--- a/test/algorithms/detail/sections/sectionalize.cpp
+++ b/test/algorithms/detail/sections/sectionalize.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2010, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/difference.cpp b/test/algorithms/difference.cpp
index ea25608d9..948b79bc9 100644
--- a/test/algorithms/difference.cpp
+++ b/test/algorithms/difference.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/disjoint.cpp b/test/algorithms/disjoint.cpp
index 17781e557..4e326236b 100644
--- a/test/algorithms/disjoint.cpp
+++ b/test/algorithms/disjoint.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/distance.cpp b/test/algorithms/distance.cpp
index f74637150..aed42dbf2 100644
--- a/test/algorithms/distance.cpp
+++ b/test/algorithms/distance.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/envelope.cpp b/test/algorithms/envelope.cpp
index 8460864ea..c790c0579 100644
--- a/test/algorithms/envelope.cpp
+++ b/test/algorithms/envelope.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/equals.cpp b/test/algorithms/equals.cpp
index 36e1b3006..989489a74 100644
--- a/test/algorithms/equals.cpp
+++ b/test/algorithms/equals.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/expand.cpp b/test/algorithms/expand.cpp
index 31083d588..040f2c3c5 100644
--- a/test/algorithms/expand.cpp
+++ b/test/algorithms/expand.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/for_each.cpp b/test/algorithms/for_each.cpp
index 0741dfd46..5d6f46ed4 100644
--- a/test/algorithms/for_each.cpp
+++ b/test/algorithms/for_each.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/intersection.cpp b/test/algorithms/intersection.cpp
index 065b27e03..5a3bada28 100644
--- a/test/algorithms/intersection.cpp
+++ b/test/algorithms/intersection.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/intersection_segment.cpp b/test/algorithms/intersection_segment.cpp
index 1b0931385..c19d2e598 100644
--- a/test/algorithms/intersection_segment.cpp
+++ b/test/algorithms/intersection_segment.cpp
@@ -1,7 +1,12 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/intersects.cpp b/test/algorithms/intersects.cpp
index 648e64e43..769827c46 100644
--- a/test/algorithms/intersects.cpp
+++ b/test/algorithms/intersects.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/length.cpp b/test/algorithms/length.cpp
index abeb6dd1b..1700881e4 100644
--- a/test/algorithms/length.cpp
+++ b/test/algorithms/length.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/make.cpp b/test/algorithms/make.cpp
index 12b2217f2..58a26c43f 100644
--- a/test/algorithms/make.cpp
+++ b/test/algorithms/make.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlaps.cpp b/test/algorithms/overlaps.cpp
index 225045eec..d49404e99 100644
--- a/test/algorithms/overlaps.cpp
+++ b/test/algorithms/overlaps.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/Jamfile.v2 b/test/algorithms/overlay/Jamfile.v2
index bd31c9168..e4ffc8c9e 100644
--- a/test/algorithms/overlay/Jamfile.v2
+++ b/test/algorithms/overlay/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/algorithms/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2010 Barend Gehrels
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/algorithms/overlay/assemble.cpp b/test/algorithms/overlay/assemble.cpp
index ac4121e5f..a566bfc95 100644
--- a/test/algorithms/overlay/assemble.cpp
+++ b/test/algorithms/overlay/assemble.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/ccw_traverse.cpp b/test/algorithms/overlay/ccw_traverse.cpp
index 215cdfaa1..ffd74e39f 100644
--- a/test/algorithms/overlay/ccw_traverse.cpp
+++ b/test/algorithms/overlay/ccw_traverse.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/dissolver.cpp b/test/algorithms/overlay/dissolver.cpp
index 0cc6522cd..2c298dc59 100644
--- a/test/algorithms/overlay/dissolver.cpp
+++ b/test/algorithms/overlay/dissolver.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/enrich_intersection_points.cpp b/test/algorithms/overlay/enrich_intersection_points.cpp
index 05359ef26..4e11033fc 100644
--- a/test/algorithms/overlay/enrich_intersection_points.cpp
+++ b/test/algorithms/overlay/enrich_intersection_points.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/get_turn_info.cpp b/test/algorithms/overlay/get_turn_info.cpp
index b7c417bdb..62f68c748 100644
--- a/test/algorithms/overlay/get_turn_info.cpp
+++ b/test/algorithms/overlay/get_turn_info.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/get_turns.cpp b/test/algorithms/overlay/get_turns.cpp
index 80873b257..2ee3a050c 100644
--- a/test/algorithms/overlay/get_turns.cpp
+++ b/test/algorithms/overlay/get_turns.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/overlay_cases.hpp b/test/algorithms/overlay/overlay_cases.hpp
index 5d01fc75c..650a49123 100644
--- a/test/algorithms/overlay/overlay_cases.hpp
+++ b/test/algorithms/overlay/overlay_cases.hpp
@@ -1,14 +1,15 @@
-#ifndef BOOST_GEOMETRY_TEST_OVERLAY_CASES_HPP
-#define BOOST_GEOMETRY_TEST_OVERLAY_CASES_HPP
-
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
 
 
+#ifndef BOOST_GEOMETRY_TEST_OVERLAY_CASES_HPP
+#define BOOST_GEOMETRY_TEST_OVERLAY_CASES_HPP
+
 #include <string>
 
 // See powerpoint
diff --git a/test/algorithms/overlay/overlay_common.hpp b/test/algorithms/overlay/overlay_common.hpp
index 42cb9a6e4..de991806b 100644
--- a/test/algorithms/overlay/overlay_common.hpp
+++ b/test/algorithms/overlay/overlay_common.hpp
@@ -1,16 +1,16 @@
-#ifndef BOOST_GEOMETRY_TEST_OVERLAY_COMMON_HPP
-#define BOOST_GEOMETRY_TEST_OVERLAY_COMMON_HPP
-
-
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
 
 
+#ifndef BOOST_GEOMETRY_TEST_OVERLAY_COMMON_HPP
+#define BOOST_GEOMETRY_TEST_OVERLAY_COMMON_HPP
+
+
 #if defined(_MSC_VER)
 // We deliberately mix float/double's here so turn off warning
 #pragma warning( disable : 4244 )
diff --git a/test/algorithms/overlay/relative_order.cpp b/test/algorithms/overlay/relative_order.cpp
index 2c9d15a36..5101347d6 100644
--- a/test/algorithms/overlay/relative_order.cpp
+++ b/test/algorithms/overlay/relative_order.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/robustness/interior_triangles.cpp b/test/algorithms/overlay/robustness/interior_triangles.cpp
index eff646dd2..d96121778 100644
--- a/test/algorithms/overlay/robustness/interior_triangles.cpp
+++ b/test/algorithms/overlay/robustness/interior_triangles.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/robustness/intersection_pies.cpp b/test/algorithms/overlay/robustness/intersection_pies.cpp
index 2ea58fa76..1a8e24eff 100644
--- a/test/algorithms/overlay/robustness/intersection_pies.cpp
+++ b/test/algorithms/overlay/robustness/intersection_pies.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/robustness/intersection_stars.cpp b/test/algorithms/overlay/robustness/intersection_stars.cpp
index 5d0acf7f6..6ad252ff7 100644
--- a/test/algorithms/overlay/robustness/intersection_stars.cpp
+++ b/test/algorithms/overlay/robustness/intersection_stars.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/robustness/random_ellipses_stars.cpp b/test/algorithms/overlay/robustness/random_ellipses_stars.cpp
index 0b8698a66..40d7f7a55 100644
--- a/test/algorithms/overlay/robustness/random_ellipses_stars.cpp
+++ b/test/algorithms/overlay/robustness/random_ellipses_stars.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/robustness/recursive_polygons.cpp b/test/algorithms/overlay/robustness/recursive_polygons.cpp
index ac3d66f81..9153170d2 100644
--- a/test/algorithms/overlay/robustness/recursive_polygons.cpp
+++ b/test/algorithms/overlay/robustness/recursive_polygons.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/robustness/star_comb.cpp b/test/algorithms/overlay/robustness/star_comb.cpp
index 8a52e5dd9..445270997 100644
--- a/test/algorithms/overlay/robustness/star_comb.cpp
+++ b/test/algorithms/overlay/robustness/star_comb.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/robustness/star_comb.hpp b/test/algorithms/overlay/robustness/star_comb.hpp
index 049f024e2..00cc1282b 100644
--- a/test/algorithms/overlay/robustness/star_comb.hpp
+++ b/test/algorithms/overlay/robustness/star_comb.hpp
@@ -1,6 +1,7 @@
-#include <test_overlay_p_q.hpp>
-//
-// Copyright Barend Gehrels, 2009, 2011, Geodan Holding B.V. Amsterdam, the Netherlands.
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
@@ -16,6 +17,8 @@
 #include <boost/tuple/tuple.hpp>
 #include <boost/math/constants/constants.hpp>
 
+#include <test_overlay_p_q.hpp>
+
 
 template <typename Polygon, typename AddFunctor>
 inline void make_star(Polygon& polygon, AddFunctor functor,
diff --git a/test/algorithms/overlay/robustness/test_overlay_p_q.hpp b/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
index 0c21beaa8..2607113f5 100644
--- a/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
+++ b/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
 //
-// Copyright Barend Gehrels 2009, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2009-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/select_rings.cpp b/test/algorithms/overlay/select_rings.cpp
index 1d52993f3..e547b8a1a 100644
--- a/test/algorithms/overlay/select_rings.cpp
+++ b/test/algorithms/overlay/select_rings.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/self_intersection_points.cpp b/test/algorithms/overlay/self_intersection_points.cpp
index 98c3717e7..763243a89 100644
--- a/test/algorithms/overlay/self_intersection_points.cpp
+++ b/test/algorithms/overlay/self_intersection_points.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/split_rings.cpp b/test/algorithms/overlay/split_rings.cpp
index 1bd7a12c2..9495a9b35 100644
--- a/test/algorithms/overlay/split_rings.cpp
+++ b/test/algorithms/overlay/split_rings.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/traverse.cpp b/test/algorithms/overlay/traverse.cpp
index 3d6b1eca5..baf0653cb 100644
--- a/test/algorithms/overlay/traverse.cpp
+++ b/test/algorithms/overlay/traverse.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/overlay/traverse_gmp.cpp b/test/algorithms/overlay/traverse_gmp.cpp
index a0f901845..58cbd4ef3 100644
--- a/test/algorithms/overlay/traverse_gmp.cpp
+++ b/test/algorithms/overlay/traverse_gmp.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/perimeter.cpp b/test/algorithms/perimeter.cpp
index 11b65c06f..66fdbfcb4 100644
--- a/test/algorithms/perimeter.cpp
+++ b/test/algorithms/perimeter.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/reverse.cpp b/test/algorithms/reverse.cpp
index ae0973041..509ecbd81 100644
--- a/test/algorithms/reverse.cpp
+++ b/test/algorithms/reverse.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/simplify.cpp b/test/algorithms/simplify.cpp
index 4f32738f6..bebdd6d9d 100644
--- a/test/algorithms/simplify.cpp
+++ b/test/algorithms/simplify.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_area.hpp b/test/algorithms/test_area.hpp
index 111340a1a..5441bcffc 100644
--- a/test/algorithms/test_area.hpp
+++ b/test/algorithms/test_area.hpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_centroid.hpp b/test/algorithms/test_centroid.hpp
index 9abb8b153..c9467251e 100644
--- a/test/algorithms/test_centroid.hpp
+++ b/test/algorithms/test_centroid.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_convex_hull.hpp b/test/algorithms/test_convex_hull.hpp
index 72d6e05e0..4385a8493 100644
--- a/test/algorithms/test_convex_hull.hpp
+++ b/test/algorithms/test_convex_hull.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_difference.hpp b/test/algorithms/test_difference.hpp
index b643c10b8..30b97bbb2 100644
--- a/test/algorithms/test_difference.hpp
+++ b/test/algorithms/test_difference.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_distance.hpp b/test/algorithms/test_distance.hpp
index b527eba3a..c8f567398 100644
--- a/test/algorithms/test_distance.hpp
+++ b/test/algorithms/test_distance.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_envelope.hpp b/test/algorithms/test_envelope.hpp
index 56f7c788c..072c04fb9 100644
--- a/test/algorithms/test_envelope.hpp
+++ b/test/algorithms/test_envelope.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_equals.hpp b/test/algorithms/test_equals.hpp
index bc8008a6c..5641b56e7 100644
--- a/test/algorithms/test_equals.hpp
+++ b/test/algorithms/test_equals.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_expand.hpp b/test/algorithms/test_expand.hpp
index a4c6198c1..a952bb6de 100644
--- a/test/algorithms/test_expand.hpp
+++ b/test/algorithms/test_expand.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_for_each.hpp b/test/algorithms/test_for_each.hpp
index 71fd64d41..cf1b93679 100644
--- a/test/algorithms/test_for_each.hpp
+++ b/test/algorithms/test_for_each.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_intersection.hpp b/test/algorithms/test_intersection.hpp
index f2b310788..4dcda0e8e 100644
--- a/test/algorithms/test_intersection.hpp
+++ b/test/algorithms/test_intersection.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_intersects.hpp b/test/algorithms/test_intersects.hpp
index b707a1fe4..56efd979f 100644
--- a/test/algorithms/test_intersects.hpp
+++ b/test/algorithms/test_intersects.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_length.hpp b/test/algorithms/test_length.hpp
index 511c3ca85..2e67d7199 100644
--- a/test/algorithms/test_length.hpp
+++ b/test/algorithms/test_length.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_overlaps.hpp b/test/algorithms/test_overlaps.hpp
index 84cde7c1c..0d00fec7b 100644
--- a/test/algorithms/test_overlaps.hpp
+++ b/test/algorithms/test_overlaps.hpp
@@ -1,6 +1,7 @@
-// Generic Geometry2 Library test file
-//
-// Copyright Barend Gehrels, 1995-2009, Geodan Holding B.V. Amsterdam, the Netherlands.
+// Generic Geometry2 Library 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_overlay.hpp b/test/algorithms/test_overlay.hpp
index e068f13d8..acae98ce2 100644
--- a/test/algorithms/test_overlay.hpp
+++ b/test/algorithms/test_overlay.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_perimeter.hpp b/test/algorithms/test_perimeter.hpp
index 67b35b35f..bb070ac8f 100644
--- a/test/algorithms/test_perimeter.hpp
+++ b/test/algorithms/test_perimeter.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_relate.hpp b/test/algorithms/test_relate.hpp
index 04d98ca27..4ae2188f7 100644
--- a/test/algorithms/test_relate.hpp
+++ b/test/algorithms/test_relate.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_reverse.hpp b/test/algorithms/test_reverse.hpp
index cdc346253..4e69c47d1 100644
--- a/test/algorithms/test_reverse.hpp
+++ b/test/algorithms/test_reverse.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_simplify.hpp b/test/algorithms/test_simplify.hpp
index 1317e0c93..df7fda6ab 100644
--- a/test/algorithms/test_simplify.hpp
+++ b/test/algorithms/test_simplify.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_union.hpp b/test/algorithms/test_union.hpp
index 0678afadb..dc316d349 100644
--- a/test/algorithms/test_union.hpp
+++ b/test/algorithms/test_union.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/test_unique.hpp b/test/algorithms/test_unique.hpp
index 37c6f0689..47474147e 100644
--- a/test/algorithms/test_unique.hpp
+++ b/test/algorithms/test_unique.hpp
@@ -1,10 +1,12 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
 
+
 #ifndef BOOST_GEOMETRY_TEST_UNIQUE_HPP
 #define BOOST_GEOMETRY_TEST_UNIQUE_HPP
 
diff --git a/test/algorithms/test_within.hpp b/test/algorithms/test_within.hpp
index ab8418be4..c15b0f3e4 100644
--- a/test/algorithms/test_within.hpp
+++ b/test/algorithms/test_within.hpp
@@ -1,10 +1,12 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
 
+
 #ifndef BOOST_GEOMETRY_TEST_WITHIN_HPP
 #define BOOST_GEOMETRY_TEST_WITHIN_HPP
 
diff --git a/test/algorithms/transform.cpp b/test/algorithms/transform.cpp
index 8d9d9343d..e4d5bc9a7 100644
--- a/test/algorithms/transform.cpp
+++ b/test/algorithms/transform.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/union.cpp b/test/algorithms/union.cpp
index c8e4f94ff..6f150232c 100644
--- a/test/algorithms/union.cpp
+++ b/test/algorithms/union.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/unique.cpp b/test/algorithms/unique.cpp
index bea68a515..1446bc713 100644
--- a/test/algorithms/unique.cpp
+++ b/test/algorithms/unique.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/algorithms/within.cpp b/test/algorithms/within.cpp
index d9d7e53ad..f91e24054 100644
--- a/test/algorithms/within.cpp
+++ b/test/algorithms/within.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/arithmetic/Jamfile.v2 b/test/arithmetic/Jamfile.v2
index 958e21b31..596d46f71 100644
--- a/test/arithmetic/Jamfile.v2
+++ b/test/arithmetic/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/arithmetic/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/arithmetic/arithmetic.cpp b/test/arithmetic/arithmetic.cpp
index 72eff00ed..8ed3cd8d1 100644
--- a/test/arithmetic/arithmetic.cpp
+++ b/test/arithmetic/arithmetic.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/arithmetic/dot_product.cpp b/test/arithmetic/dot_product.cpp
index d6a35462b..806b10424 100644
--- a/test/arithmetic/dot_product.cpp
+++ b/test/arithmetic/dot_product.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/compile_test.cpp b/test/compile_test.cpp
index c349dfb1c..31d02020e 100644
--- a/test/compile_test.cpp
+++ b/test/compile_test.cpp
@@ -2,7 +2,7 @@
 
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/concepts/Jamfile.v2 b/test/concepts/Jamfile.v2
index f183dd8e5..80a1d467b 100644
--- a/test/concepts/Jamfile.v2
+++ b/test/concepts/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/geometries/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/concepts/linestring_concept.cpp b/test/concepts/linestring_concept.cpp
index f78d6ea4c..11a6862f6 100644
--- a/test/concepts/linestring_concept.cpp
+++ b/test/concepts/linestring_concept.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2011, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/core/Jamfile.v2 b/test/core/Jamfile.v2
index 90f7f74f7..9d01e4309 100644
--- a/test/core/Jamfile.v2
+++ b/test/core/Jamfile.v2
@@ -1,12 +1,14 @@
-# test/core/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to 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)
 
-test-suite ggl-core
+test-suite boost-geometry-core
     :
     [ run access.cpp ]
     [ run coordinate_dimension.cpp ]
diff --git a/test/core/access.cpp b/test/core/access.cpp
index 12509b1ee..f5e2cb033 100644
--- a/test/core/access.cpp
+++ b/test/core/access.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/core/coordinate_dimension.cpp b/test/core/coordinate_dimension.cpp
index e228d3a39..7013b3155 100644
--- a/test/core/coordinate_dimension.cpp
+++ b/test/core/coordinate_dimension.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/core/coordinate_system.cpp b/test/core/coordinate_system.cpp
index ed7aeef99..d3aa6cdd6 100644
--- a/test/core/coordinate_system.cpp
+++ b/test/core/coordinate_system.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/core/coordinate_type.cpp b/test/core/coordinate_type.cpp
index ecb8baf0c..71dbc4ae6 100644
--- a/test/core/coordinate_type.cpp
+++ b/test/core/coordinate_type.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/core/geometry_id.cpp b/test/core/geometry_id.cpp
index 28b83f8e1..d80b4f8fb 100644
--- a/test/core/geometry_id.cpp
+++ b/test/core/geometry_id.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/core/point_type.cpp b/test/core/point_type.cpp
index 3d7ae584e..957b8ebc6 100644
--- a/test/core/point_type.cpp
+++ b/test/core/point_type.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/core/radian_access.cpp b/test/core/radian_access.cpp
index d8ed32bc2..208383a38 100644
--- a/test/core/radian_access.cpp
+++ b/test/core/radian_access.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/core/reverse_dispatch.cpp b/test/core/reverse_dispatch.cpp
index 268b0743f..94e14e828 100644
--- a/test/core/reverse_dispatch.cpp
+++ b/test/core/reverse_dispatch.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/core/ring.cpp b/test/core/ring.cpp
index 9edd2ad23..506644c53 100644
--- a/test/core/ring.cpp
+++ b/test/core/ring.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/core/tag.cpp b/test/core/tag.cpp
index c9d9bc6cc..21361d42c 100644
--- a/test/core/tag.cpp
+++ b/test/core/tag.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/core/topological_dimension.cpp b/test/core/topological_dimension.cpp
index 7495ec0cc..c2edfa47a 100644
--- a/test/core/topological_dimension.cpp
+++ b/test/core/topological_dimension.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/domains/Jamfile.v2 b/test/domains/Jamfile.v2
index a75e911b1..6ec8a2463 100644
--- a/test/domains/Jamfile.v2
+++ b/test/domains/Jamfile.v2
@@ -1,4 +1,8 @@
-# Copyright (c) 2011 Barend Gehrels
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/domains/gis/Jamfile.v2 b/test/domains/gis/Jamfile.v2
index efe37d5f5..edbc115ff 100644
--- a/test/domains/gis/Jamfile.v2
+++ b/test/domains/gis/Jamfile.v2
@@ -1,4 +1,8 @@
-# Copyright (c) 2011 Barend Gehrels
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/domains/gis/io/Jamfile.v2 b/test/domains/gis/io/Jamfile.v2
index 6d575f30b..1e0fa6ed6 100644
--- a/test/domains/gis/io/Jamfile.v2
+++ b/test/domains/gis/io/Jamfile.v2
@@ -1,4 +1,8 @@
-# Copyright (c) 2011 Barend Gehrels
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/domains/gis/io/wkt/Jamfile.v2 b/test/domains/gis/io/wkt/Jamfile.v2
index e781411ec..f93c637f8 100644
--- a/test/domains/gis/io/wkt/Jamfile.v2
+++ b/test/domains/gis/io/wkt/Jamfile.v2
@@ -1,4 +1,8 @@
-# Copyright (c) 2011 Barend Gehrels
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/domains/gis/io/wkt/multi_wkt.cpp b/test/domains/gis/io/wkt/multi_wkt.cpp
index d7986ca20..98b6a1083 100644
--- a/test/domains/gis/io/wkt/multi_wkt.cpp
+++ b/test/domains/gis/io/wkt/multi_wkt.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008-2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/domains/gis/io/wkt/wkt.cpp b/test/domains/gis/io/wkt/wkt.cpp
index 7c562500c..b72f15be8 100644
--- a/test/domains/gis/io/wkt/wkt.cpp
+++ b/test/domains/gis/io/wkt/wkt.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008-2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/Jamfile.v2 b/test/extensions/Jamfile.v2
index b1e7b664a..7db38499b 100644
--- a/test/extensions/Jamfile.v2
+++ b/test/extensions/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/extensions/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2010 Barend Gehrels
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/extensions/algorithms/Jamfile.v2 b/test/extensions/algorithms/Jamfile.v2
index 0762c6f33..59eca9a2b 100644
--- a/test/extensions/algorithms/Jamfile.v2
+++ b/test/extensions/algorithms/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/extensions/algorithms/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2011 Barend Gehrels
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/extensions/algorithms/buffer/linestring_buffer.cpp b/test/extensions/algorithms/buffer/linestring_buffer.cpp
index 2bf4b7160..b44538b42 100644
--- a/test/extensions/algorithms/buffer/linestring_buffer.cpp
+++ b/test/extensions/algorithms/buffer/linestring_buffer.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/algorithms/buffer/polygon_buffer.cpp b/test/extensions/algorithms/buffer/polygon_buffer.cpp
index bc4bb8619..9e4822b5e 100644
--- a/test/extensions/algorithms/buffer/polygon_buffer.cpp
+++ b/test/extensions/algorithms/buffer/polygon_buffer.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/algorithms/buffer/test_buffer.hpp b/test/extensions/algorithms/buffer/test_buffer.hpp
index a950c886d..5e15b041e 100644
--- a/test/extensions/algorithms/buffer/test_buffer.hpp
+++ b/test/extensions/algorithms/buffer/test_buffer.hpp
@@ -1,10 +1,12 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
 
+
 #ifndef BOOST_GEOMETRY_TEST_BUFFER_HPP
 #define BOOST_GEOMETRY_TEST_BUFFER_HPP
 
diff --git a/test/extensions/algorithms/connect.cpp b/test/extensions/algorithms/connect.cpp
index 58e8f48df..6fc59f203 100644
--- a/test/extensions/algorithms/connect.cpp
+++ b/test/extensions/algorithms/connect.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/algorithms/dissolve.cpp b/test/extensions/algorithms/dissolve.cpp
index 93ba24e0b..3838aeaaa 100644
--- a/test/extensions/algorithms/dissolve.cpp
+++ b/test/extensions/algorithms/dissolve.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/algorithms/is_convex.cpp b/test/extensions/algorithms/is_convex.cpp
index f66cba62e..df97a545e 100644
--- a/test/extensions/algorithms/is_convex.cpp
+++ b/test/extensions/algorithms/is_convex.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/algorithms/mark_spikes.cpp b/test/extensions/algorithms/mark_spikes.cpp
index 51565e151..9a326d444 100644
--- a/test/extensions/algorithms/mark_spikes.cpp
+++ b/test/extensions/algorithms/mark_spikes.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2011, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/algorithms/midpoints.cpp b/test/extensions/algorithms/midpoints.cpp
index 0e460eafb..b7070f178 100644
--- a/test/extensions/algorithms/midpoints.cpp
+++ b/test/extensions/algorithms/midpoints.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/algorithms/offset.cpp b/test/extensions/algorithms/offset.cpp
index fbecae3f7..e98ece407 100644
--- a/test/extensions/algorithms/offset.cpp
+++ b/test/extensions/algorithms/offset.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/algorithms/remove_holes_if.cpp b/test/extensions/algorithms/remove_holes_if.cpp
index d1fb44b55..353adeafc 100644
--- a/test/extensions/algorithms/remove_holes_if.cpp
+++ b/test/extensions/algorithms/remove_holes_if.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/algorithms/selected.cpp b/test/extensions/algorithms/selected.cpp
index 0c41e2f58..dc3c55fe3 100644
--- a/test/extensions/algorithms/selected.cpp
+++ b/test/extensions/algorithms/selected.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/arithmetic/Jamfile.v2 b/test/extensions/arithmetic/Jamfile.v2
index e3b09a40a..e07af3770 100644
--- a/test/extensions/arithmetic/Jamfile.v2
+++ b/test/extensions/arithmetic/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/arithmetic/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/extensions/arithmetic/cross_product.cpp b/test/extensions/arithmetic/cross_product.cpp
index 63c0b1260..ca9d5bb9b 100644
--- a/test/extensions/arithmetic/cross_product.cpp
+++ b/test/extensions/arithmetic/cross_product.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright (c) 2009 Mateusz Loskot, (mateusz@loskot.net)
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/gis/Jamfile.v2 b/test/extensions/gis/Jamfile.v2
index 14826c18e..e17a7f946 100644
--- a/test/extensions/gis/Jamfile.v2
+++ b/test/extensions/gis/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/extensions/gis/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2010 Barend Gehrels
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/extensions/gis/io/wkb/read_wkb.cpp b/test/extensions/gis/io/wkb/read_wkb.cpp
index 02434fde7..aebc31aab 100644
--- a/test/extensions/gis/io/wkb/read_wkb.cpp
+++ b/test/extensions/gis/io/wkb/read_wkb.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Mateusz Loskot <mateusz@loskot.net>, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/gis/latlong/Jamfile.v2 b/test/extensions/gis/latlong/Jamfile.v2
index e136da585..9be3ae029 100644
--- a/test/extensions/gis/latlong/Jamfile.v2
+++ b/test/extensions/gis/latlong/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/extensions/gis/latlong/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2010 Barend Gehrels
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/extensions/gis/latlong/andoyer.cpp b/test/extensions/gis/latlong/andoyer.cpp
index 8be26ea1e..2e3113d60 100644
--- a/test/extensions/gis/latlong/andoyer.cpp
+++ b/test/extensions/gis/latlong/andoyer.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/gis/latlong/area_ll.cpp b/test/extensions/gis/latlong/area_ll.cpp
index 2929c4c1d..8a0b9ed57 100644
--- a/test/extensions/gis/latlong/area_ll.cpp
+++ b/test/extensions/gis/latlong/area_ll.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/gis/latlong/cross_track.cpp b/test/extensions/gis/latlong/cross_track.cpp
index e3f898ae6..c76d8ce67 100644
--- a/test/extensions/gis/latlong/cross_track.cpp
+++ b/test/extensions/gis/latlong/cross_track.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/gis/latlong/distance_mixed.cpp b/test/extensions/gis/latlong/distance_mixed.cpp
index c169511a9..802a13e98 100644
--- a/test/extensions/gis/latlong/distance_mixed.cpp
+++ b/test/extensions/gis/latlong/distance_mixed.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/gis/latlong/parse.cpp b/test/extensions/gis/latlong/parse.cpp
index 24bc078a6..6471709ed 100644
--- a/test/extensions/gis/latlong/parse.cpp
+++ b/test/extensions/gis/latlong/parse.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/gis/latlong/parse_dms.cpp b/test/extensions/gis/latlong/parse_dms.cpp
index 1ff95ad2c..9e83155d6 100644
--- a/test/extensions/gis/latlong/parse_dms.cpp
+++ b/test/extensions/gis/latlong/parse_dms.cpp
@@ -1,9 +1,15 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or parse_dms at
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <string>
diff --git a/test/extensions/gis/latlong/point_ll.cpp b/test/extensions/gis/latlong/point_ll.cpp
index b0984e253..9602e4b52 100644
--- a/test/extensions/gis/latlong/point_ll.cpp
+++ b/test/extensions/gis/latlong/point_ll.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/gis/latlong/vincenty.cpp b/test/extensions/gis/latlong/vincenty.cpp
index 07f546e5f..737208c3d 100644
--- a/test/extensions/gis/latlong/vincenty.cpp
+++ b/test/extensions/gis/latlong/vincenty.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/gis/projections/Jamfile.v2 b/test/extensions/gis/projections/Jamfile.v2
index 26e182d9d..23d32ae3b 100644
--- a/test/extensions/gis/projections/Jamfile.v2
+++ b/test/extensions/gis/projections/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/extensions/gis/projections/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2010 Barend Gehrels
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/extensions/gis/projections/projection.cpp b/test/extensions/gis/projections/projection.cpp
index 331cd9352..c8e0253e7 100644
--- a/test/extensions/gis/projections/projection.cpp
+++ b/test/extensions/gis/projections/projection.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/gis/projections/projection_epsg.cpp b/test/extensions/gis/projections/projection_epsg.cpp
index 2d81b4a3d..45498a3e8 100644
--- a/test/extensions/gis/projections/projection_epsg.cpp
+++ b/test/extensions/gis/projections/projection_epsg.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/gis/projections/projections.cpp b/test/extensions/gis/projections/projections.cpp
index c3e3587ac..e71f16e53 100644
--- a/test/extensions/gis/projections/projections.cpp
+++ b/test/extensions/gis/projections/projections.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/index/rtree.cpp b/test/extensions/index/rtree.cpp
index f992590e2..7a0179352 100644
--- a/test/extensions/index/rtree.cpp
+++ b/test/extensions/index/rtree.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Mateusz Loskot <mateusz@loskot.net>, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/iterators/Jamfile.v2 b/test/extensions/iterators/Jamfile.v2
index 993b4e9ac..04a5d810d 100644
--- a/test/extensions/iterators/Jamfile.v2
+++ b/test/extensions/iterators/Jamfile.v2
@@ -1,6 +1,8 @@
-# ggl/test/iterators/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/extensions/iterators/segment_returning_iterator.cpp b/test/extensions/iterators/segment_returning_iterator.cpp
index 79bffd495..3c43c51ac 100644
--- a/test/extensions/iterators/segment_returning_iterator.cpp
+++ b/test/extensions/iterators/segment_returning_iterator.cpp
@@ -1,8 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Mateusz Loskot 2009, mateusz@loskot.net
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/nsphere/access.cpp b/test/extensions/nsphere/access.cpp
index eabd6d095..ffa47aa72 100644
--- a/test/extensions/nsphere/access.cpp
+++ b/test/extensions/nsphere/access.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/nsphere/area.cpp b/test/extensions/nsphere/area.cpp
index f086dc6ae..35745e199 100644
--- a/test/extensions/nsphere/area.cpp
+++ b/test/extensions/nsphere/area.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/nsphere/circle.cpp b/test/extensions/nsphere/circle.cpp
index 9e8cdacd1..da71c8a89 100644
--- a/test/extensions/nsphere/circle.cpp
+++ b/test/extensions/nsphere/circle.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/nsphere/multi_within.cpp b/test/extensions/nsphere/multi_within.cpp
index 281cd8fe0..29b084ff4 100644
--- a/test/extensions/nsphere/multi_within.cpp
+++ b/test/extensions/nsphere/multi_within.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/nsphere/point_type.cpp b/test/extensions/nsphere/point_type.cpp
index fb4653507..7c99903e1 100644
--- a/test/extensions/nsphere/point_type.cpp
+++ b/test/extensions/nsphere/point_type.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/extensions/nsphere/within.cpp b/test/extensions/nsphere/within.cpp
index 5fc061588..498ee2f55 100644
--- a/test/extensions/nsphere/within.cpp
+++ b/test/extensions/nsphere/within.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/geometries/Jamfile.v2 b/test/geometries/Jamfile.v2
index 481394870..35c197764 100644
--- a/test/geometries/Jamfile.v2
+++ b/test/geometries/Jamfile.v2
@@ -1,7 +1,9 @@
-# test/geometries/Jamfile.v2 
-#
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
 # Use, modification and distribution is subject to 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)
diff --git a/test/geometries/adapted.cpp b/test/geometries/adapted.cpp
index ad8661921..309324fc1 100644
--- a/test/geometries/adapted.cpp
+++ b/test/geometries/adapted.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/geometries/boost_array_as_point.cpp b/test/geometries/boost_array_as_point.cpp
index 7a42a4ed0..a74e4815c 100644
--- a/test/geometries/boost_array_as_point.cpp
+++ b/test/geometries/boost_array_as_point.cpp
@@ -1,7 +1,9 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
 // Copyright Alfredo Correa 2010
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/geometries/boost_fusion.cpp b/test/geometries/boost_fusion.cpp
index fce1d7b9f..6ed8fd056 100644
--- a/test/geometries/boost_fusion.cpp
+++ b/test/geometries/boost_fusion.cpp
@@ -1,7 +1,9 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2011, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright Akira Takahashi 2011
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/geometries/boost_polygon.cpp b/test/geometries/boost_polygon.cpp
index 67866ec03..95f72b3e5 100644
--- a/test/geometries/boost_polygon.cpp
+++ b/test/geometries/boost_polygon.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/geometries/boost_polygon_overlay.cpp b/test/geometries/boost_polygon_overlay.cpp
index 1b6264ca2..d18e2a472 100644
--- a/test/geometries/boost_polygon_overlay.cpp
+++ b/test/geometries/boost_polygon_overlay.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2011, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/geometries/boost_range.cpp b/test/geometries/boost_range.cpp
index 8bc54fcc1..50cc43c88 100644
--- a/test/geometries/boost_range.cpp
+++ b/test/geometries/boost_range.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/geometries/box.cpp b/test/geometries/box.cpp
index d2842e188..17e89a9ba 100644
--- a/test/geometries/box.cpp
+++ b/test/geometries/box.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/geometries/concepts/check.cpp b/test/geometries/concepts/check.cpp
index 4209df3ea..657541d8c 100644
--- a/test/geometries/concepts/check.cpp
+++ b/test/geometries/concepts/check.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) Point concept test file
-//
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/geometries/custom_linestring.cpp b/test/geometries/custom_linestring.cpp
index e20cba49d..7596a7d9f 100644
--- a/test/geometries/custom_linestring.cpp
+++ b/test/geometries/custom_linestring.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/geometries/segment.cpp b/test/geometries/segment.cpp
index 6fcb1bfc9..9845021d4 100644
--- a/test/geometries/segment.cpp
+++ b/test/geometries/segment.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/geometry_test_common.hpp b/test/geometry_test_common.hpp
index ba75946b9..9fbe8b26d 100644
--- a/test/geometry_test_common.hpp
+++ b/test/geometry_test_common.hpp
@@ -1,7 +1,12 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/iterators/Jamfile.v2 b/test/iterators/Jamfile.v2
index 83f4a8448..ad7a0368d 100644
--- a/test/iterators/Jamfile.v2
+++ b/test/iterators/Jamfile.v2
@@ -1,6 +1,8 @@
-# ggl/test/iterators/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/iterators/box_iterator.cpp b/test/iterators/box_iterator.cpp
index f9b4e100d..db059fcc5 100644
--- a/test/iterators/box_iterator.cpp
+++ b/test/iterators/box_iterator.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Box Library)
 //
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/iterators/circular_iterator.cpp b/test/iterators/circular_iterator.cpp
index eeb5f0a5f..c6224867c 100644
--- a/test/iterators/circular_iterator.cpp
+++ b/test/iterators/circular_iterator.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/iterators/closing_iterator.cpp b/test/iterators/closing_iterator.cpp
index 5ebfd6c7a..9b3db2b5a 100644
--- a/test/iterators/closing_iterator.cpp
+++ b/test/iterators/closing_iterator.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/iterators/ever_circling_iterator.cpp b/test/iterators/ever_circling_iterator.cpp
index e7d203d59..b68d35a64 100644
--- a/test/iterators/ever_circling_iterator.cpp
+++ b/test/iterators/ever_circling_iterator.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/iterators/segment_range_iterator.cpp b/test/iterators/segment_range_iterator.cpp
index 8b97b425d..501e7f78c 100644
--- a/test/iterators/segment_range_iterator.cpp
+++ b/test/iterators/segment_range_iterator.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Segment Library)
 //
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/Jamfile.v2 b/test/multi/Jamfile.v2
index 71a693180..941933e6e 100644
--- a/test/multi/Jamfile.v2
+++ b/test/multi/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/multi/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Barend Gehrels
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/multi/algorithms/Jamfile.v2 b/test/multi/algorithms/Jamfile.v2
index f0506bdf4..9087b7ac3 100644
--- a/test/multi/algorithms/Jamfile.v2
+++ b/test/multi/algorithms/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/arithmetic/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/multi/algorithms/multi_area.cpp b/test/multi/algorithms/multi_area.cpp
index 4cdd7e31f..bf5b13c1e 100644
--- a/test/multi/algorithms/multi_area.cpp
+++ b/test/multi/algorithms/multi_area.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_centroid.cpp b/test/multi/algorithms/multi_centroid.cpp
index 1c2948f63..dc58bef3c 100644
--- a/test/multi/algorithms/multi_centroid.cpp
+++ b/test/multi/algorithms/multi_centroid.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_convex_hull.cpp b/test/multi/algorithms/multi_convex_hull.cpp
index 28f8ee99b..7112eab8d 100644
--- a/test/multi/algorithms/multi_convex_hull.cpp
+++ b/test/multi/algorithms/multi_convex_hull.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_correct.cpp b/test/multi/algorithms/multi_correct.cpp
index 408c7171a..ee9ffe76b 100644
--- a/test/multi/algorithms/multi_correct.cpp
+++ b/test/multi/algorithms/multi_correct.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_difference.cpp b/test/multi/algorithms/multi_difference.cpp
index 024259164..e93a9f4af 100644
--- a/test/multi/algorithms/multi_difference.cpp
+++ b/test/multi/algorithms/multi_difference.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_distance.cpp b/test/multi/algorithms/multi_distance.cpp
index 9b8375b68..2eedc5690 100644
--- a/test/multi/algorithms/multi_distance.cpp
+++ b/test/multi/algorithms/multi_distance.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_envelope.cpp b/test/multi/algorithms/multi_envelope.cpp
index 4a977972c..0d033b7d6 100644
--- a/test/multi/algorithms/multi_envelope.cpp
+++ b/test/multi/algorithms/multi_envelope.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_equals.cpp b/test/multi/algorithms/multi_equals.cpp
index 2ad3b260c..95eb3a05b 100644
--- a/test/multi/algorithms/multi_equals.cpp
+++ b/test/multi/algorithms/multi_equals.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_for_each.cpp b/test/multi/algorithms/multi_for_each.cpp
index 45a1fb736..b5fd7d566 100644
--- a/test/multi/algorithms/multi_for_each.cpp
+++ b/test/multi/algorithms/multi_for_each.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_intersection.cpp b/test/multi/algorithms/multi_intersection.cpp
index 34d9efef7..087b9f791 100644
--- a/test/multi/algorithms/multi_intersection.cpp
+++ b/test/multi/algorithms/multi_intersection.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_length.cpp b/test/multi/algorithms/multi_length.cpp
index d86579ff4..65ee8621e 100644
--- a/test/multi/algorithms/multi_length.cpp
+++ b/test/multi/algorithms/multi_length.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_perimeter.cpp b/test/multi/algorithms/multi_perimeter.cpp
index ebcb20a36..1cc823f32 100644
--- a/test/multi/algorithms/multi_perimeter.cpp
+++ b/test/multi/algorithms/multi_perimeter.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_reverse.cpp b/test/multi/algorithms/multi_reverse.cpp
index cb61e93a4..301be3fdb 100644
--- a/test/multi/algorithms/multi_reverse.cpp
+++ b/test/multi/algorithms/multi_reverse.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_simplify.cpp b/test/multi/algorithms/multi_simplify.cpp
index e4a787d5c..816fe3faa 100644
--- a/test/multi/algorithms/multi_simplify.cpp
+++ b/test/multi/algorithms/multi_simplify.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_transform.cpp b/test/multi/algorithms/multi_transform.cpp
index 876efa220..ebc58cb0d 100644
--- a/test/multi/algorithms/multi_transform.cpp
+++ b/test/multi/algorithms/multi_transform.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_union.cpp b/test/multi/algorithms/multi_union.cpp
index 1675acf10..498602346 100644
--- a/test/multi/algorithms/multi_union.cpp
+++ b/test/multi/algorithms/multi_union.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_unique.cpp b/test/multi/algorithms/multi_unique.cpp
index f8b02f277..a6a127adf 100644
--- a/test/multi/algorithms/multi_unique.cpp
+++ b/test/multi/algorithms/multi_unique.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/multi_within.cpp b/test/multi/algorithms/multi_within.cpp
index e4519ec4d..9c02145bd 100644
--- a/test/multi/algorithms/multi_within.cpp
+++ b/test/multi/algorithms/multi_within.cpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
-// Copyright Barend Gehrels, Geodan B.V. Amsterdam, the Netherlands.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/overlay/Jamfile.v2 b/test/multi/algorithms/overlay/Jamfile.v2
index 3e8d1dd55..144d09439 100644
--- a/test/multi/algorithms/overlay/Jamfile.v2
+++ b/test/multi/algorithms/overlay/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/algorithms/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2010 Barend Gehrels
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/multi/algorithms/overlay/multi_overlay_cases.hpp b/test/multi/algorithms/overlay/multi_overlay_cases.hpp
index 97b324cd1..20da40441 100644
--- a/test/multi/algorithms/overlay/multi_overlay_cases.hpp
+++ b/test/multi/algorithms/overlay/multi_overlay_cases.hpp
@@ -1,6 +1,7 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/multi/algorithms/overlay/multi_overlay_common.hpp b/test/multi/algorithms/overlay/multi_overlay_common.hpp
index 314036dad..1f44f114d 100644
--- a/test/multi/algorithms/overlay/multi_overlay_common.hpp
+++ b/test/multi/algorithms/overlay/multi_overlay_common.hpp
@@ -1,16 +1,17 @@
-#ifndef GEOMETRY_TEST_MULTI_OVERLAY_COMMON_HPP
-#define GEOMETRY_TEST_MULTI_OVERLAY_COMMON_HPP
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
 
-
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
 
 
+#ifndef GEOMETRY_TEST_MULTI_OVERLAY_COMMON_HPP
+#define GEOMETRY_TEST_MULTI_OVERLAY_COMMON_HPP
+
+
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
diff --git a/test/multi/algorithms/overlay/multi_traverse.cpp b/test/multi/algorithms/overlay/multi_traverse.cpp
index 7c76a6c6f..19f296223 100644
--- a/test/multi/algorithms/overlay/multi_traverse.cpp
+++ b/test/multi/algorithms/overlay/multi_traverse.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/point_concept/Jamfile.v2 b/test/point_concept/Jamfile.v2
index b659c90f7..a7d229615 100644
--- a/test/point_concept/Jamfile.v2
+++ b/test/point_concept/Jamfile.v2
@@ -1,12 +1,14 @@
-# test/point_concept/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to 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)
 
-test-suite ggl-point-concept
+test-suite boost-geometry-point-concept
     :
     [ compile concept_checker.cpp ]
     [ compile well_formed_point.cpp ]
diff --git a/test/point_concept/array_point.cpp b/test/point_concept/array_point.cpp
index 9b8268cb5..61ae34a9c 100644
--- a/test/point_concept/array_point.cpp
+++ b/test/point_concept/array_point.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) Point concept test file
-//
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/point_concept/concept_checker.cpp b/test/point_concept/concept_checker.cpp
index 587bf43e1..bd9f78b6c 100644
--- a/test/point_concept/concept_checker.cpp
+++ b/test/point_concept/concept_checker.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) Point concept test file
-//
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/point_concept/function_asserting_a_point.hpp b/test/point_concept/function_asserting_a_point.hpp
index 1e335c42e..a14154b6d 100644
--- a/test/point_concept/function_asserting_a_point.hpp
+++ b/test/point_concept/function_asserting_a_point.hpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library) Point concept unit tests
 //
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/point_concept/function_requiring_a_point.hpp b/test/point_concept/function_requiring_a_point.hpp
index 64700f3a6..8affabbbf 100644
--- a/test/point_concept/function_requiring_a_point.hpp
+++ b/test/point_concept/function_requiring_a_point.hpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library) Point concept unit tests
 //
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to 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)
diff --git a/test/point_concept/point_with_incorrect_dimension.cpp b/test/point_concept/point_with_incorrect_dimension.cpp
index 43d050d28..ba2f01264 100644
--- a/test/point_concept/point_with_incorrect_dimension.cpp
+++ b/test/point_concept/point_with_incorrect_dimension.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) Point concept test file
-//
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/point_concept/point_without_coordinate_type.cpp b/test/point_concept/point_without_coordinate_type.cpp
index daf5fd855..972a1b2f1 100644
--- a/test/point_concept/point_without_coordinate_type.cpp
+++ b/test/point_concept/point_without_coordinate_type.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) Point concept test file
-//
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/point_concept/point_without_dimension.cpp b/test/point_concept/point_without_dimension.cpp
index 083b03ccc..1bae6c0ad 100644
--- a/test/point_concept/point_without_dimension.cpp
+++ b/test/point_concept/point_without_dimension.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) Point concept test file
-//
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/point_concept/point_without_getter.cpp b/test/point_concept/point_without_getter.cpp
index 9bf8a0957..d1e15376c 100644
--- a/test/point_concept/point_without_getter.cpp
+++ b/test/point_concept/point_without_getter.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) Point concept test file
-//
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/point_concept/point_without_setter.cpp b/test/point_concept/point_without_setter.cpp
index b729cf78f..dd11b1593 100644
--- a/test/point_concept/point_without_setter.cpp
+++ b/test/point_concept/point_without_setter.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) Point concept test file
-//
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/point_concept/well_formed_point.cpp b/test/point_concept/well_formed_point.cpp
index 154cfbe76..1b56b9f04 100644
--- a/test/point_concept/well_formed_point.cpp
+++ b/test/point_concept/well_formed_point.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) Point concept test file
-//
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/point_concept/well_formed_point_traits.cpp b/test/point_concept/well_formed_point_traits.cpp
index 2a3942da8..b43a166fc 100644
--- a/test/point_concept/well_formed_point_traits.cpp
+++ b/test/point_concept/well_formed_point_traits.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) Point concept test file
-//
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/policies/Jamfile.v2 b/test/policies/Jamfile.v2
index 5ead83ff5..44585c539 100644
--- a/test/policies/Jamfile.v2
+++ b/test/policies/Jamfile.v2
@@ -1,12 +1,14 @@
-# test/util/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Barend Gehrels
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to 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)
 
-test-suite ggl-policies
+test-suite boost-geometry-policies
     :
     [ run compare.cpp ]
     ;
diff --git a/test/policies/compare.cpp b/test/policies/compare.cpp
index 7e8d319c2..a1e406173 100644
--- a/test/policies/compare.cpp
+++ b/test/policies/compare.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/ranges/Jamfile.v2 b/test/ranges/Jamfile.v2
index 09c7edfbe..991051bf0 100644
--- a/test/ranges/Jamfile.v2
+++ b/test/ranges/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/iterators/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2010 Barend Gehrels
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/ranges/box_range.cpp b/test/ranges/box_range.cpp
index d27bc6c53..0deb4f266 100644
--- a/test/ranges/box_range.cpp
+++ b/test/ranges/box_range.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/ranges/segment_range.cpp b/test/ranges/segment_range.cpp
index 31e65519e..1c9520190 100644
--- a/test/ranges/segment_range.cpp
+++ b/test/ranges/segment_range.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/strategies/Jamfile.v2 b/test/strategies/Jamfile.v2
index 8c9178be7..87e1a74e2 100644
--- a/test/strategies/Jamfile.v2
+++ b/test/strategies/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/strategies/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/strategies/cross_track.cpp b/test/strategies/cross_track.cpp
index 95fe2e04b..ac43c1bb2 100644
--- a/test/strategies/cross_track.cpp
+++ b/test/strategies/cross_track.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/strategies/haversine.cpp b/test/strategies/haversine.cpp
index 8f4ee55db..432602cd8 100644
--- a/test/strategies/haversine.cpp
+++ b/test/strategies/haversine.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/strategies/projected_point.cpp b/test/strategies/projected_point.cpp
index 38716d70e..86fe16190 100644
--- a/test/strategies/projected_point.cpp
+++ b/test/strategies/projected_point.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/strategies/pythagoras.cpp b/test/strategies/pythagoras.cpp
index e736c7dad..2b022fdfa 100644
--- a/test/strategies/pythagoras.cpp
+++ b/test/strategies/pythagoras.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/strategies/segment_intersection.cpp b/test/strategies/segment_intersection.cpp
index 5ff14bcf8..ddf096f0e 100644
--- a/test/strategies/segment_intersection.cpp
+++ b/test/strategies/segment_intersection.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/strategies/segment_intersection_collinear.cpp b/test/strategies/segment_intersection_collinear.cpp
index da06b248f..e2bc08e18 100644
--- a/test/strategies/segment_intersection_collinear.cpp
+++ b/test/strategies/segment_intersection_collinear.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/strategies/side_by_cross_track.cpp b/test/strategies/side_by_cross_track.cpp
index 98eae77f5..68c8c2495 100644
--- a/test/strategies/side_by_cross_track.cpp
+++ b/test/strategies/side_by_cross_track.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/strategies/transformer.cpp b/test/strategies/transformer.cpp
index bbb9fca1b..c8467817b 100644
--- a/test/strategies/transformer.cpp
+++ b/test/strategies/transformer.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/strategies/within.cpp b/test/strategies/within.cpp
index 063a78e7d..ef6b9179c 100644
--- a/test/strategies/within.cpp
+++ b/test/strategies/within.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/test_common/test_point.hpp b/test/test_common/test_point.hpp
index 60a6e44e8..8d076674b 100644
--- a/test/test_common/test_point.hpp
+++ b/test/test_common/test_point.hpp
@@ -1,7 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/test/test_common/with_pointer.hpp b/test/test_common/with_pointer.hpp
index b7df76429..17dba04dd 100644
--- a/test/test_common/with_pointer.hpp
+++ b/test/test_common/with_pointer.hpp
@@ -1,7 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
 // Use, modification and distribution is subject to 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)
diff --git a/test/test_geometries/all_custom_container.hpp b/test/test_geometries/all_custom_container.hpp
index 2716a4e74..4ded906d5 100644
--- a/test/test_geometries/all_custom_container.hpp
+++ b/test/test_geometries/all_custom_container.hpp
@@ -1,8 +1,10 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2011, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy ar
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
diff --git a/test/test_geometries/all_custom_linestring.hpp b/test/test_geometries/all_custom_linestring.hpp
index f66ddf61c..c6f742234 100644
--- a/test/test_geometries/all_custom_linestring.hpp
+++ b/test/test_geometries/all_custom_linestring.hpp
@@ -1,8 +1,9 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2011, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
 // Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy ar
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef GEOMETRY_TEST_TEST_GEOMETRIES_ALL_CUSTOM_LINESTRING_HPP
diff --git a/test/test_geometries/all_custom_polygon.hpp b/test/test_geometries/all_custom_polygon.hpp
index 6d5a7e046..f6f6022cc 100644
--- a/test/test_geometries/all_custom_polygon.hpp
+++ b/test/test_geometries/all_custom_polygon.hpp
@@ -1,8 +1,10 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2011, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy ar
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef GEOMETRY_TEST_TEST_GEOMETRIES_ALL_CUSTOM_POLYGON_HPP
diff --git a/test/test_geometries/all_custom_ring.hpp b/test/test_geometries/all_custom_ring.hpp
index f3a390fbb..c9e79f827 100644
--- a/test/test_geometries/all_custom_ring.hpp
+++ b/test/test_geometries/all_custom_ring.hpp
@@ -1,8 +1,10 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2011, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy ar
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef GEOMETRY_TEST_TEST_GEOMETRIES_ALL_CUSTOM_RING_HPP
diff --git a/test/test_geometries/custom_segment.hpp b/test/test_geometries/custom_segment.hpp
index 1ab9e238e..413138a63 100644
--- a/test/test_geometries/custom_segment.hpp
+++ b/test/test_geometries/custom_segment.hpp
@@ -1,8 +1,10 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy ar
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
diff --git a/test/test_geometries/wrapped_boost_array.hpp b/test/test_geometries/wrapped_boost_array.hpp
index 123a0fedc..3496a9cca 100644
--- a/test/test_geometries/wrapped_boost_array.hpp
+++ b/test/test_geometries/wrapped_boost_array.hpp
@@ -1,8 +1,10 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2010-2011 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy ar
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
diff --git a/test/util/Jamfile.v2 b/test/util/Jamfile.v2
index 8183fa172..0ec3e7543 100644
--- a/test/util/Jamfile.v2
+++ b/test/util/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/util/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/util/as_range.cpp b/test/util/as_range.cpp
index 75b5ee60e..3b51d4687 100644
--- a/test/util/as_range.cpp
+++ b/test/util/as_range.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/util/for_each_coordinate.cpp b/test/util/for_each_coordinate.cpp
index 78bb5cf26..3187d3de1 100644
--- a/test/util/for_each_coordinate.cpp
+++ b/test/util/for_each_coordinate.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/util/select_most_precise.cpp b/test/util/select_most_precise.cpp
index 7339b6e9a..b29b04df8 100644
--- a/test/util/select_most_precise.cpp
+++ b/test/util/select_most_precise.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/util/write_dsv.cpp b/test/util/write_dsv.cpp
index 695c69904..3836c3de9 100644
--- a/test/util/write_dsv.cpp
+++ b/test/util/write_dsv.cpp
@@ -1,7 +1,13 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008-2009
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/views/Jamfile.v2 b/test/views/Jamfile.v2
index 93b7f247a..e28d498c8 100644
--- a/test/views/Jamfile.v2
+++ b/test/views/Jamfile.v2
@@ -1,6 +1,8 @@
-# test/iterators/Jamfile.v2 
+# Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2010 Barend Gehrels
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/test/views/closeable_view.cpp b/test/views/closeable_view.cpp
index 993ddb206..29b626349 100644
--- a/test/views/closeable_view.cpp
+++ b/test/views/closeable_view.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/views/reversible_closeable.cpp b/test/views/reversible_closeable.cpp
index 8e36134ec..4dedb4cd5 100644
--- a/test/views/reversible_closeable.cpp
+++ b/test/views/reversible_closeable.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)
diff --git a/test/views/reversible_view.cpp b/test/views/reversible_view.cpp
index 1ba45f7a3..865c3063f 100644
--- a/test/views/reversible_view.cpp
+++ b/test/views/reversible_view.cpp
@@ -1,6 +1,8 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010 Barend Gehrels, Amsterdam, the Netherlands.
+
 // Use, modification and distribution is subject to 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)