Merge from trunk

[SVN r50818]

2 files changed, 15 insertions, 13 deletions

diff --git a/index.html b/index.html
index 997b9c5d3c..aaa80a41ee 100644
--- a/index.html
+++ b/index.html
@@ -55,7 +55,8 @@
 
   <h3>Changes in this release</h3>
 
-  <p>This release includes <b><i><span style="background-color: #FFFF00">??? new libraries</span></i></b>&nbsp; and
+  <p>This release includes new libraries&nbsp;<b><i>flyweight</i></b> and <b><i>
+  swap</i></b>, as well as
   updates to many existing libraries. See
   <a href="http://www.boost.org/users/history/version_1_38_0">Release
   History</a> for more information.</p>
diff --git a/libs/libraries.htm b/libs/libraries.htm
index 73cab84351..8fbcd792e3 100644
--- a/libs/libraries.htm
+++ b/libs/libraries.htm
@@ -124,9 +124,9 @@ how to download, build, and install the libraries.</p>
     <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="flyweight/doc/index.html">flyweight</a> - Design pattern 
- 	  to manage larque quantities of highly redundant objects, 
- 	  from Joaqu&iacute;n M L&oacute;pez Mu&ntilde;oz.</li>
+    <li><a href="flyweight/doc/index.html">flyweight</a> - Design pattern
+    to manage large quantities of highly redundant objects,
+    from Joaqu&iacute;n M L&oacute;pez Mu&ntilde;oz.</li>
     <li><a href="foreach/index.html">foreach</a> - BOOST_FOREACH macro for easily
     iterating over the elements of a sequence, from Eric Niebler.</li>
     <li><a href="format/index.html">format</a> - Type-safe 'printf-like' format
@@ -218,7 +218,7 @@ how to download, build, and install the libraries.</p>
     <li><a href="property_map/property_map.html">property map</a>
         - Concepts defining interfaces which map key objects to
         value objects, from Jeremy Siek.</li>
-    <li><a href="proto/index.html">proto</a> - Expression template library and compiler 
+    <li><a href="proto/index.html">proto</a> - Expression template library and compiler
         construction toolkit for domain-specific embedded languages, from Eric Niebler.</li>
     <li><a href="python/doc/index.html">python</a> - Reflects C++
         classes and functions into <a
@@ -449,8 +449,6 @@ how to download, build, and install the libraries.</p>
     <li><a href="property_map/property_map.html">property map</a>
         - Concepts defining interfaces which map key objects to
         value objects, from Jeremy Siek.</li>
-    <li><a href="proto/index.html">proto</a> - Expression template library and compiler 
-        construction toolkit for domain-specific embedded languages, from Eric Niebler.</li>
     <li><a href="static_assert/static_assert.htm">static_assert</a>
         - Static assertions (compile time assertions), from John
         Maddock.</li>
@@ -470,6 +468,8 @@ how to download, build, and install the libraries.</p>
     <li><a href="mpl/doc/index.html">mpl</a> - Template metaprogramming
     framework of compile-time algorithms, sequences and metafunction classes,
     from Aleksey Gurtovoy.</li>
+    <li><a href="proto/index.html">proto</a> - Expression template library and compiler
+        construction toolkit for domain-specific embedded languages, from Eric Niebler.</li>
     <li><a href="static_assert/static_assert.htm">static_assert</a>
         - Static assertions (compile time assertions), from John
         Maddock.</li>
@@ -504,7 +504,6 @@ how to download, build, and install the libraries.</p>
 <ul>
     <li><a href="accumulators/index.html">accumulators</a> - Framework for incremental
         calculation, and collection of statistical accumulators, from Eric Niebler.</li>
-    <li>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
@@ -664,9 +663,9 @@ of arbitrary data for persistence and marshalling, from Robert Ramey</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="flyweight/doc/index.html">flyweight</a> - Design pattern 
- 	  to manage larque quantities of highly redundant objects, 
- 	  from Joaqu&iacute;n M L&oacute;pez Mu&ntilde;oz.</li>
+    <li><a href="flyweight/doc/index.html">flyweight</a> - Design pattern
+    to manage large quantities of highly redundant objects,
+    from Joaqu&iacute;n M L&oacute;pez Mu&ntilde;oz.</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
@@ -676,6 +675,8 @@ of arbitrary data for persistence and marshalling, from Robert Ramey</li>
     <li><a href="statechart/doc/index.html">statechart</a> - Arbitrarily
     complex finite state machines can be implemented in easily readable and
     maintainable C++ code, from Andreas Huber.</li>
+    <li><a href="utility/swap.html">swap</a> -
+    Enhanced generic swap function, from Joseph Gauterin.</li>
     <li><a href="system/doc/index.html">system</a> - Operating 
     system support, including the diagnostics support that will be part of the 
     C++0x standard library, from Beman Dawes.</li>
@@ -726,7 +727,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 -->19 Mar 2008<!--webbot bot="Timestamp" endspan i-checksum="14923" --></p>
+s-format="%d %b %Y" startspan -->27 Jan 2009<!--webbot bot="Timestamp" endspan i-checksum="14772" --></p>
 
 <p>&copy; Copyright Beman Dawes 2000-2004</p>
 <p>Distributed under the Boost Software License, Version 1.0.
@@ -735,4 +736,4 @@ or <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt<
 </p>
 
 </body>
-</html>
+</html>
\ No newline at end of file