Merge.

[SVN r42905]

doc/boost_range.html

@@ -493,7 +493,7 @@ class=identifier>T</span><span class=special>&amp; </span><span class=identifier
         </p>
             <p>
                 <code>as_literal()</code> can be used <i>internally</i> in string 
-                algorithm librararies to such that arrays of characters are 
+                algorithm librararies such that arrays of characters are 
                 handled correctly.
                 </p>
             <p>

doc/history_ack.html

@@ -18,10 +18,10 @@
 
     <h2  >History and Acknowledgement</h2><a name="History" ></a>
     <p  >
-    The library have been under way for a long time. Dietmar K<>hl originally 
+    The library was under way for a long time. Dietmar K<>hl originally intended
-    intended to submit an <code  >array_traits</code> class template which 
+    to submit an <code  >array_traits</code> class template which had most of
-    had most of the functionality present now, but only for arrays and standard 
+    the functionality present now, but only for arrays and standard containers.
-    containers. 
+        I believe this was back in 2001 or 2002.
     </p>
     
     <p>

doc/intro.html

@@ -63,8 +63,7 @@ free-standing functions so syntactic and/or semantic differences can be removed.
 
     </ul>
     </p>
-    <p  >
+    <p  > Below is given a small example (the complete example can be found <a
-    Below are given a small example (the complete example can be found <a 
     href="../test/algorithm_example.cpp" target="_self" >here</a>): <blockquote>
         <pre  >
 <span class=comment>

doc/portability.html

@@ -35,7 +35,7 @@ href="http://boost.sourceforge.net/regression-logs/developer/range.html">here</a
     </p>
     <p  >
     Notice also that some compilers cannot do function template ordering properly. 
-    In that case one must rely of <a
+    In that case one must rely on <a
       href="boost_range.html#range_iterator"><code >range_iterator</code></a> 
       and a single function definition instead of overloaded versions for const and 
       non-const arguments.

doc/utility_class.html

@@ -33,11 +33,12 @@
     </ul>
     </ul>
 
-    The <code>iterator_range</code> class is templated on an 
+    The <code>iterator_range</code> class is templated on a <a
-    <a href="../../iterator/doc/new-iter-concepts.html#forward-traversal-iterators-lib-forward-traversal-iterators">Forward 
+    href="../../iterator/doc/new-iter-concepts.html#forward-traversal-iterators-lib-forward-traversal-iterators">Forward 
     Traversal Iterator</a> and should be used whenever fairly general code is needed. 
-    The <code>sub_range</code> class is templated on an <a href="range.html#forward_range">Forward
+    The <code>sub_range</code> class is templated on a <a 
-    Range</a> and it is less general, but a bit easier to use since its template 
+    href="range.html#forward_range">Forward Range</a> and it is less general, 
+    but a bit easier to use since its template 
     argument is easier to specify. The biggest difference is, however, that a 
     <code>sub_range</code> can propagate constness because it knows what a 
 corresponding <code>const_iterator</code> is. </p>

include/boost/range/as_literal.hpp

@@ -15,7 +15,7 @@
 # pragma once
 #endif
 
-#if BOOST_NO_FUNCTION_TEMPLATE_ORDERING
+#ifdef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
 #include <boost/range/detail/as_literal.hpp>
 #else
 
@@ -116,14 +116,14 @@ namespace boost
 
     
     template< class Char, std::size_t sz >
-	inline iterator_range<const Char*> as_literal( const Char (&arr)[sz] )
+    inline iterator_range<const Char*> as_literal( const Char (&arr)[sz] )
     {
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x590)) && __BORLANDC__ >= 0x590
         return boost::make_iterator_range<const Char*>( arr, arr + sz - 1 );
 #else
         return boost::make_iterator_range( arr, arr + sz - 1 );
 #endif
-	}
+    }
 }
 
 #endif // BOOST_NO_FUNCTION_TEMPLATE_ORDERING