Merge from trunk; fix ordering of libraries within categories. [Vicente Juan Botet]

[SVN r43724]

1 files changed, 25 insertions, 24 deletions

diff --git a/libs/libraries.htm b/libs/libraries.htm
index 46fbee3b80..bf31a0e837 100644
--- a/libs/libraries.htm
+++ b/libs/libraries.htm
@@ -376,13 +376,13 @@ how to download, build, and install the libraries.</p>
     <li><a href="algorithm/minmax/index.html">minmax</a> - standard library
         extensions for simultaneous min/max and min/max element computations,
         from Herv&eacute; Br&ouml;nnimann.</li>
+    <li><a href="range/index.html">range</a> - A new infrastructure
+        for generic algorithms that builds on top
+        of the new iterator concepts, from Thorsten Ottosen.</li>
     <li><a href="algorithm/string/index.html">string_algo</a> -
         String algorithms library, from Pavol Droba</li>
     <li><a href="utility/utility.htm">utility</a> - Class <b>next(),</b>&nbsp; <b>prior()</b>
       function templates, from Dave Abrahams and others. </li>
-    <li><a href="range/index.html">range</a> - A new infrastructure
-        for generic algorithms that builds on top
-        of the new iterator concepts, from Thorsten Ottosen.</li>
 </ul>
 
 <h3><a name="Function-objects">Function objects</a> and higher-order programming</h3>
@@ -422,6 +422,8 @@ how to download, build, and install the libraries.</p>
     <li><a href="utility/enable_if.html">enable_if</a> -
 	Selective inclusion of function template overloads, from Jaakko
 	J&auml;rvi, Jeremiah Willcock, and Andrew Lumsdaine.</li>
+    <li><a href="function_types/index.html">function_types</a> - Type traits
+        for callable, built-in types, from Tobias Schwinger</li>
     <li><a href="gil/doc/index.html">gil</a> - Generic Image Library, from
         Lubomir Bourdev and Hailin Jin.</li>
     <li><a href="utility/in_place_factories.html">in_place_factory, typed_in_place_factory</a>- Generic in-place construction
@@ -439,13 +441,16 @@ how to download, build, and install the libraries.</p>
     <li><a href="type_traits/index.html">type_traits</a> -
         Templates for fundamental properties of types, from John
         Maddock, Steve Cleary, et al.</li>
-    <li><a href="function_types/index.html">function_types</a> - Type traits
-        for callable, built-in types, from Tobias Schwinger</li>
 </ul>
 
 <h3>Template <a name="Metaprogramming"> Metaprogramming</a></h3>
 
 <ul>
+    <li><a href="function_types/index.html">function_types</a> - Type traits
+        for callable, built-in types, from Tobias Schwinger</li>
+    <li><a href="fusion/index.html">fusion</a> -
+        Library for working with tuples, including various containers, 
+    algorithms, etc. </li>
     <li><a href="mpl/doc/index.html">mpl</a> - Template metaprogramming
     framework of compile-time algorithms, sequences and metafunction classes,
     from Aleksey Gurtovoy.</li>
@@ -455,10 +460,6 @@ how to download, build, and install the libraries.</p>
     <li><a href="type_traits/index.html">type_traits</a> -
         Templates for fundamental properties of types, from John
         Maddock, Steve Cleary, et al.</li>
-    <li><a href="function_types/index.html">function_types</a> - Type traits
-        for callable, built-in types, from Tobias Schwinger</li>
-    <li><a href="fusion/index.html">fusion</a> -
-        Library for working with tuples, including various containers, algorithms, etc.
         From Joel de Guzman, Dan Marsden and Tobias Schwinger.</li>
 </ul>
 
@@ -486,15 +487,13 @@ how to download, build, and install the libraries.</p>
 <h3><a name="Math">Math</a> and numerics</h3>
 
 <ul>
-    <li><a href="math/doc/index.html">math</a> - Several contributions in the
-    domain of mathematics, from various authors.</li>
-    <li><a href="numeric/conversion/doc/html/index.html">numeric/conversion</a> - Optimized Policy-based Numeric Conversions,
-        from Fernando Cacciola.</li>
     <li><a href="integer/index.html">integer</a> - Headers to ease
         dealing with integral types.</li>
     <li><a href="numeric/interval/doc/interval.htm">interval </a>- Extends the
     usual arithmetic functions to mathematical intervals, from Guillaume
     Melquiond, Herv? Br?nnimann and Sylvain Pion.</li>
+    <li><a href="math/doc/index.html">math</a> - Several contributions in the
+    domain of mathematics, from various authors.</li>
     <li><a href="math/doc/complex/html/index.html">math/complex number algorithms</a> -
     These complex number algorithms are the inverses of trigonometric functions currently present in the C++ standard, from John Maddock.</li>
     <li><a href="math/doc/common_factor.html">math/common_factor</a> - Greatest
@@ -509,6 +508,8 @@ how to download, build, and install the libraries.</p>
         A wide selection of univariate statistical distributions and functions that operate on them from John Maddock and Paul Bristow</li>
     <li><a href="multi_array/doc/index.html">multi_array</a> - Multidimensional
     containers and adaptors for arrays of contiguous data, from Ron Garcia.</li>
+    <li><a href="numeric/conversion/doc/html/index.html">numeric/conversion</a> - Optimized Policy-based Numeric Conversions,
+        from Fernando  </li>
     <li><a href="utility/operators.htm">operators</a> - Templates
         ease arithmetic classes and iterators, from Dave Abrahams
         and Jeremy Siek.</li>
@@ -543,18 +544,18 @@ how to download, build, and install the libraries.</p>
     <li><a href="utility/compressed_pair.htm">compressed_pair</a>
         - Empty member optimization, from John Maddock, Howard
         Hinnant, et al.</li>
+    <li><a href="fusion/index.html">fusion</a> -
+        Library for working with tuples, including various containers, algorithms, etc.
+        From Joel de Guzman and Dan Marsden and Tobias Schwinger.</li>
     <li><a href="multi_index/doc/index.html">multi_index</a> - Containers with
     multiple STL-compatible access interfaces, from Joaqu&iacute;n M L&oacute;pez
     Mu&ntilde;oz.</li>
     <li><a href="ptr_container/index.html">pointer container</a>
     - Containers for storing heap-allocated polymorphic objects to ease OO-programming, from Thorsten Ottosen. </li>
     <li><a href="tuple/doc/tuple_users_guide.html">tuple</a> - Ease definition of functions returning multiple values, and more,
-    from Jaakko J?rvi.</li>
+    from Jaakko Järvi.</li>
     <li><a href="variant/index.html">variant</a> - Safe, generic, stack-based
     discriminated union container, from Eric Friedman and Itay Maman.</li>
-    <li><a href="fusion/index.html">fusion</a> -
-        Library for working with tuples, including various containers, algorithms, etc.
-        From Joel de Guzman and Dan Marsden and Tobias Schwinger.</li>
 </ul>
 
 <h3><a name="Image-processing">Image processing</a></h3>
@@ -568,6 +569,10 @@ how to download, build, and install the libraries.</p>
     <li><a href="asio/index.html">asio</a> - Portable networking, including
         sockets, timers, hostname resolution and socket iostreams, from
         Chris Kohlhoff.</li>
+    <li><a href="assign/index.html">assign</a> - Filling containers
+    with constant or generated data has never been
+    easier, from Thorsten Ottosen.
+    </li>
   <li><a href="format/index.html">format</a> - Type-safe 'printf-like' format
   operations, from Samuel Krempp.</li>
   <li><a href="io/doc/ios_state.html">io state savers</a> - Save I/O state to
@@ -577,10 +582,6 @@ how to download, build, and install the libraries.</p>
   data given on command line, in config files and other sources, from Vladimir Prus.</li>
   <li><a href="serialization/doc/index.html">serialization</a> - Serialization
 of arbitrary data for persistence and marshalling, from Robert Ramey</li>
-    <li><a href="assign/index.html">assign</a> - Filling containers
-    with constant or generated data has never been
-    easier, from Thorsten Ottosen.
-    </li>
 
 </ul>
 
@@ -637,14 +638,14 @@ of arbitrary data for persistence and marshalling, from Robert Ramey</li>
         Hinnant, et al.</li>
     <li><a href="conversion/index.html">conversion</a> - Polymorphic and lexical casts, from Dave Abrahams and
         Kevlin Henney.</li>
-    <li><a href="numeric/conversion/doc/html/index.html">numeric/conversion</a> - Optimized Policy-based Numeric Conversions,
-        from Fernando Cacciola.</li>
     <li><a href="crc/index.html">crc</a> - Cyclic Redundancy Code, from Daryle
       Walker.</li>
     <li><a href="date_time/doc/index.html">date_time</a> - Date-Time library from Jeff Garland.</li>
     <li><a href="filesystem/doc/index.htm">filesystem</a> - Portable paths,
     iteration over directories, and other useful filesystem operations, from
     Beman Dawes.</li>
+    <li><a href="numeric/conversion/doc/html/index.html">numeric/conversion</a> - Optimized Policy-based Numeric Conversions,
+        from Fernando Cacciola.</li>
     <li><a href="optional/doc/html/index.html">optional</a> - Discriminated-union
     wrapper for optional values, from Fernando Cacciola.</li>
     <li><a href="../doc/html/program_options.html">program_options</a> - Access to configuration
@@ -699,7 +700,7 @@ of arbitrary data for persistence and marshalling, from Robert Ramey</li>
 
 <p>Revised
 <!--webbot bot="Timestamp" s-type="EDITED"
-s-format="%d %b %Y" startspan -->13 Mar 2008<!--webbot bot="Timestamp" endspan i-checksum="14911" --></p>
+s-format="%d %b %Y" startspan -->19 Mar 2008<!--webbot bot="Timestamp" endspan i-checksum="14923" --></p>
 
 <p>&copy; Copyright Beman Dawes 2000-2004</p>
 <p>Distributed under the Boost Software License, Version 1.0.