diff --git a/doc/conditional.qbk b/doc/conditional.qbk
index a4b867e..edb7645 100644
--- a/doc/conditional.qbk
+++ b/doc/conditional.qbk
@@ -16,7 +16,7 @@ __header ` #include <boost/type_traits/conditional.hpp>` or ` #include <boost/ty
       template <bool B, class T, class U>  struct __conditional;
     }
 
-If B is true, the member typedef type shall equal T. If B is false, the member typedef type shall equal F.
+If B is true, the member typedef type shall equal T. If B is false, the member typedef type shall equal U.
 
 This trait is really just an alias for `boost::mpl::if_c`.
 
diff --git a/doc/html/boost_typetraits/reference/conditional.html b/doc/html/boost_typetraits/reference/conditional.html
index 3977fc6..9780917 100644
--- a/doc/html/boost_typetraits/reference/conditional.html
+++ b/doc/html/boost_typetraits/reference/conditional.html
@@ -37,7 +37,7 @@
 </pre>
 <p>
         If B is true, the member typedef type shall equal T. If B is false, the member
-        typedef type shall equal F.
+        typedef type shall equal U.
       </p>
 <p>
         This trait is really just an alias for <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">if_c</span></code>.
diff --git a/doc/html/index.html b/doc/html/index.html
index b66fff8..54193c1 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -30,7 +30,7 @@
       Marcus, Itay Maman, John Maddock, Alexander Nasonov, Thorsten Ottosen, Robert
       Ramey and Jeremy Siek</p></div>
 <div><div class="legalnotice">
-<a name="id880058"></a><p>
+<a name="id1003484"></a><p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>
diff --git a/doc/html/index/s11.html b/doc/html/index/s11.html
index ecde8ba..75d22d0 100644
--- a/doc/html/index/s11.html
+++ b/doc/html/index/s11.html
@@ -24,7 +24,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id952889"></a>Class Index</h2></div></div></div>
+<a name="id1076316"></a>Class Index</h2></div></div></div>
 <p><a class="link" href="s11.html#idx_id_0">A</a> <a class="link" href="s11.html#idx_id_2">C</a> <a class="link" href="s11.html#idx_id_3">D</a> <a class="link" href="s11.html#idx_id_4">E</a> <a class="link" href="s11.html#idx_id_5">F</a> <a class="link" href="s11.html#idx_id_6">H</a> <a class="link" href="s11.html#idx_id_7">I</a> <a class="link" href="s11.html#idx_id_8">M</a> <a class="link" href="s11.html#idx_id_9">P</a> <a class="link" href="s11.html#idx_id_10">R</a> <a class="link" href="s11.html#idx_id_11">T</a></p>
 <div class="variablelist"><dl>
 <dt>
diff --git a/doc/html/index/s12.html b/doc/html/index/s12.html
index 70a434f..c097111 100644
--- a/doc/html/index/s12.html
+++ b/doc/html/index/s12.html
@@ -24,7 +24,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id953930"></a>Typedef Index</h2></div></div></div>
+<a name="id1077356"></a>Typedef Index</h2></div></div></div>
 <p><a class="link" href="s12.html#idx_id_18">F</a> <a class="link" href="s12.html#idx_id_23">R</a> <a class="link" href="s12.html#idx_id_24">T</a></p>
 <div class="variablelist"><dl>
 <dt>
diff --git a/doc/html/index/s13.html b/doc/html/index/s13.html
index 8b867cd..57efc89 100644
--- a/doc/html/index/s13.html
+++ b/doc/html/index/s13.html
@@ -24,7 +24,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id954040"></a>Macro Index</h2></div></div></div>
+<a name="id1077466"></a>Macro Index</h2></div></div></div>
 <p><a class="link" href="s13.html#idx_id_27">B</a></p>
 <div class="variablelist"><dl>
 <dt>
diff --git a/doc/html/index/s14.html b/doc/html/index/s14.html
index ac4bd3b..22a6d6e 100644
--- a/doc/html/index/s14.html
+++ b/doc/html/index/s14.html
@@ -23,7 +23,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id954581"></a>Index</h2></div></div></div>
+<a name="id1078008"></a>Index</h2></div></div></div>
 <p><a class="link" href="s14.html#idx_id_39">A</a> <a class="link" href="s14.html#idx_id_40">B</a> <a class="link" href="s14.html#idx_id_41">C</a> <a class="link" href="s14.html#idx_id_42">D</a> <a class="link" href="s14.html#idx_id_43">E</a> <a class="link" href="s14.html#idx_id_44">F</a> <a class="link" href="s14.html#idx_id_45">H</a> <a class="link" href="s14.html#idx_id_46">I</a> <a class="link" href="s14.html#idx_id_47">M</a> <a class="link" href="s14.html#idx_id_48">P</a> <a class="link" href="s14.html#idx_id_49">R</a> <a class="link" href="s14.html#idx_id_50">T</a> <a class="link" href="s14.html#idx_id_51">U</a></p>
 <div class="variablelist"><dl>
 <dt>