Merge from trunk.

[SVN r39287]

doc/integer_mask.html

@@ -202,10 +202,9 @@ href="../../../people/daryle_walker.html">Daryle Walker</a>.</p>
 
 <p>Revised September 23, 2001</p>
 
-<p>&copy; Copyright Daryle Walker 2001.  Permission to copy, use,
+<p>&copy; Copyright Daryle Walker 2001.  Use, modification, and distribution are
-modify, sell and distribute this document is granted provided this
+subject to the Boost Software License, Version 1.0.  (See accompanying file <a
-copyright notice appears in all copies.  This document is provided
+href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or a copy at &lt;<a
-&quot;as is&quot; without express or implied warranty, and with no claim
+href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>&gt;.)</p>
-as to its suitability for any purpose.</p>
 </body>
 </html>

doc/static_min_max.html

@@ -112,10 +112,9 @@ href="../../../people/daryle_walker.html">Daryle Walker</a>.</p>
 
 <p>Revised October 12, 2001</p>
 
-<p>&copy; Copyright Daryle Walker 2001.  Permission to copy, use,
+<p>&copy; Copyright Daryle Walker 2001.  Use, modification, and distribution are
-modify, sell and distribute this document is granted provided this
+subject to the Boost Software License, Version 1.0.  (See accompanying file <a
-copyright notice appears in all copies.  This document is provided
+href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or a copy at &lt;<a
-&quot;as is&quot; without express or implied warranty, and with no claim
+href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>&gt;.)</p>
-as to its suitability for any purpose.</p>
 </body>
 </html>

include/boost/integer.hpp

@@ -34,7 +34,7 @@ namespace boost
   template< int Category > struct int_least_helper {}; // default is empty
 
   //  specializatons: 1=long, 2=int, 3=short, 4=signed char,
-  //     6=unsigned long, 7=unsigned int, 8=unsigned short, 9=unsigned long
+  //     6=unsigned long, 7=unsigned int, 8=unsigned short, 9=unsigned char
   //  no specializations for 0 and 5: requests for a type > long are in error
   template<> struct int_least_helper<1> { typedef long least; };
   template<> struct int_least_helper<2> { typedef int least; };

integer.htm

@@ -204,10 +204,9 @@ value-based sized templates.</p>
 
 <p>Revised May 20, 2001</p>
 
-<p>&copy; Copyright Beman Dawes 1999.  Permission to copy, use, modify,
+<p>&copy; Copyright Beman Dawes 1999.  Use, modification, and distribution are
-sell and distribute this document is granted provided this copyright
+subject to the Boost Software License, Version 1.0.  (See accompanying file <a
-notice appears in all copies.  This document is provided &quot;as
+href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or a copy at &lt;<a
-is&quot; without express or implied warranty, and with no claim as to
+href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>&gt;.)</p>
-its suitability for any purpose.</p>
 </body>
 </html>