Update CMakeLists.txt

Add "cxxstd" json field. The "cxxstd" json field is being added to each Boost library's meta json information for libraries whose minumum C++ standard compilation level is C++11 on up. The value of this field matches one of the values for 'cxxstd' in Boost.Build. The purpose of doing this is to provide information for the Boost website documentation for each library which will specify the minimum C++ standard compilation that an end-user must employ in order to use the particular library. This will aid end-users who want to know if they can successfully use a Boost library based on their C++ compiler's compilation level, without having to search the library's documentation to find this out.
VC++ 10 and VC++ 11 are only supported for 32 bits in Appveyor
2021-06-10 01:02:01 +03:00 · 2021-01-11 11:26:46 -05:00 · 2020-11-24 16:00:31 -05:00 · 2020-04-17 11:09:22 -04:00 · 2020-04-17 09:51:46 -04:00 · 2020-03-30 16:55:12 -04:00
47 changed files with 966 additions and 826 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,42 @@
+# Copyright 2016 Edward Diener
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+language: cpp
+
+sudo: false
+
+python: "2.7"
+
+os:
+  - linux
+  - osx
+
+branches:
+  only:
+    - master
+    - develop
+
+install:
+  - cd ..
+  - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+  - cd boost-root
+  - git submodule update --init tools/build
+  - git submodule update --init libs/config
+  - git submodule update --init tools/boostdep
+  - git submodule update --init tools/boost_install
+  - git submodule update --init libs/headers
+  - cp -r $TRAVIS_BUILD_DIR/* libs/function_types
+  - python tools/boostdep/depinst/depinst.py -I example function_types
+  - ./bootstrap.sh
+  - ./b2 headers
+
+script:
+  - TOOLSET=gcc,clang
+  - if [ $TRAVIS_OS_NAME == osx ]; then TOOLSET=clang; fi
+  - ./b2 --verbose-test libs/config/test//config_info toolset=$TOOLSET || true
+  - ./b2 libs/function_types/test toolset=$TOOLSET
+
+notifications:
+  email:
+    on_success: always
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -0,0 +1,21 @@
+# Copyright 2019 Mike Dev
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt
+
+cmake_minimum_required( VERSION 3.5...3.20 )
+project( boost_function_types VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX )
+
+add_library( boost_function_types INTERFACE )
+add_library( Boost::function_types ALIAS boost_function_types )
+
+target_include_directories( boost_function_types INTERFACE include )
+
+target_link_libraries( boost_function_types
+    INTERFACE
+        Boost::config
+        Boost::core
+        Boost::detail
+        Boost::mpl
+        Boost::preprocessor
+        Boost::type_traits
+)
--- a/appveyor.yml
+++ b/appveyor.yml
@ -0,0 +1,48 @@
+# Copyright 2017 Edward Diener
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+version: 1.0.{build}-{branch}
+
+shallow_clone: true
+
+branches:
+  only:
+    - master
+    - develop
+
+environment:
+  matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-10.0,msvc-11.0
+      ADDRMD: 32
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-12.0,msvc-14.0
+      ADDRESS_MODEL: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      TOOLSET: msvc-14.1
+      CXXSTD: 14,17
+      ADDRESS_MODEL: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: msvc-14.2
+      CXXSTD: 14,17
+      ADDRESS_MODEL: 32,64
+
+install:
+  - cd ..
+  - git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost-root
+  - cd boost-root
+  - git submodule update --init tools/build
+  - git submodule update --init libs/config
+  - git submodule update --init tools/boostdep
+  - git submodule update --init tools/boost_install
+  - git submodule update --init libs/headers
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\function_types
+  - python tools/boostdep/depinst/depinst.py -I example function_types
+  - bootstrap
+  - b2 headers
+
+build: off
+
+test_script:
+  - b2 libs/function_types/test toolset=%TOOLSET%
--- a/build/Jamfile
+++ b/build/Jamfile
@ -6,31 +6,25 @@

 # Generates preprocessed files with wave.

-rule wave 
-{ 
-  Depends $1 : $2 ; 
-}
-
 actions wave
 {
-  ../../../dist/bin/wave -S../../.. $(>) -o $(<)
+  $(>[1]) -S../../.. $(>[2]) -o $(<)
 }

-make ../../../libs/function_types/build/timestamps/arity_loops
-  : preprocess_arity_loops.cpp : wave 
+W = ../../../tools/wave/build//wave ;
+
+make arity_loops
+  : preprocess_arity_loops.cpp $(W) : wave : <location>build/timestamps
  ;

-explicit ../../../libs/function_types/build/timestamps/arity_loops ; 
-
-make ../../../libs/function_types/build/timestamps/encoding
-  : preprocess_encoding.cpp : wave 
+make encoding
+  : preprocess_encoding.cpp $(W) : wave : <location>build/timestamps
  ;

-explicit ../../../libs/function_types/build/timestamps/encoding ;

-make ../../../libs/function_types/build/timestamps/cc_names
-  : preprocess_cc_names.cpp : wave
+make cc_names
+  : preprocess_cc_names.cpp $(W) : wave : <location>build/timestamps
  ;
-
-explicit ../../../libs/function_types/build/timestamps/cc_names ;
+  
+explicit arity_loops encoding cc_names ;

--- a/doc/Jamfile
+++ b/doc/Jamfile
@ -12,8 +12,6 @@ boostbook standalone
        function_types
    :
        <xsl:param>boost.root=../../../..
-        <xsl:param>boost.libraries=../../../libraries.htm
-        <xsl:param>html.stylesheet=../../../../doc/html/boostbook.css
        <xsl:param>chunk.first.sections=1
        <xsl:param>chunk.section.depth=2
        <xsl:param>generate.section.toc.level=2
@ -21,3 +19,9 @@ boostbook standalone
        <xsl:param>toc.max.depth=1
    ;

+
+###############################################################################
+alias boostdoc ;
+explicit boostdoc ;
+alias boostrelease : standalone ;
+explicit boostrelease ;
--- a/doc/function_types.qbk
+++ b/doc/function_types.qbk
@ -837,6 +837,43 @@ values for the same property the value of the rightmost argument is used.

 [endsect]

+[section:has_property_tag has_property_tag]
+
+  template<class Tag, class PropertyTag> 
+  struct has_property_tag;
+
+[*Header]
+
+  #include <boost/function_types/property_tags.hpp>
+
+[variablelist
+  [[[^Tag]][Possibly compound property tag]]
+  [[[^PropertyTag]][Single property tag]]
+  [[[^has_property_tag<Tag,PropertyTag>]][Test (possibly) compound property tag for single property tag]]
+]
+
+A metafunction for testing that a compound property tag has a particular single
+property tag in its composition. Returns a boolean value of true if the particular single
+property tag is part of the compound property tag, otherwise false.
+
+For convenience there are also individual metafunctions for the built-in property tags of the form
+
+  template<class Tag> 
+  struct has_'name'_property_tag;
+
+which works exactly the same as `has_property_tag`, where name can be
+[^variadic],[^default_cc],[^const],[^volatile],[^cv],or [^null].
+In these individual metafunctions [^const] is short for [^const_qualified],
+[^volatile] is short for [^volatile_qualified],
+[^cv] is short for [^cv_qualified], and [^null] is short for [^null_tag].
+
+[note Testing for the [^null_tag], with either `has_property_tag<Tag,null_tag>`
+or `has_null_property_tag<Tag>`, always tests whether the [^Tag] is the single
+[^null_tag] property_tag.
+]
+
+[endsect]
+
 [endsect] [/ Tag Types]

 [/ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ]
--- a/doc/html/boost_functiontypes/about_tag_types.html
+++ b/doc/html/boost_functiontypes/about_tag_types.html
@ -1,11 +1,11 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>About Tag Types</title>
-<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
-<link rel="up" href="../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
+<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="prev" href="use_cases.html" title="Use Cases">
 <link rel="next" href="reference.html" title="Reference">
 </head>
@ -13,18 +13,18 @@
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
 <td align="center"><a href="../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
-<td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
+<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
 <td align="center"><a href="../../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="use_cases.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="reference.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="use_cases.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="reference.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functiontypes.about_tag_types"></a><a class="link" href="about_tag_types.html" title="About Tag Types"> About Tag Types</a>
+<a name="boost_functiontypes.about_tag_types"></a><a class="link" href="about_tag_types.html" title="About Tag Types">About Tag Types</a>
 </h2></div></div></div>
 <p>
      Boost.FunctionTypes uses tag types to encode properties that are not types
@ -35,8 +35,7 @@
      These tags can be used to determine whether one property of a type has a particular
      value.
    </p>
-<pre class="programlisting">
-<span class="identifier">is_function</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">(...),</span> <span class="identifier">variadic</span><span class="special">&gt;::</span><span class="identifier">value</span> <span class="comment">// == true
+<pre class="programlisting"><span class="identifier">is_function</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">(...),</span> <span class="identifier">variadic</span><span class="special">&gt;::</span><span class="identifier">value</span> <span class="comment">// == true
 </span><span class="identifier">is_function</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">()</span>   <span class="special">,</span> <span class="identifier">variadic</span><span class="special">&gt;::</span><span class="identifier">value</span> <span class="comment">// == false
 </span></pre>
 <p>
@ -45,22 +44,19 @@
      is a callable builtin type, is a compound property tag that describes <code class="literal">F</code>.
      The <code class="literal">tag</code> class template can be used to combine property tags.
    </p>
-<pre class="programlisting">
-<span class="identifier">tag</span><span class="special">&lt;</span><span class="identifier">non_const</span><span class="special">,</span><span class="identifier">default_cc</span><span class="special">&gt;</span> <span class="comment">// combination of two properties
+<pre class="programlisting"><span class="identifier">tag</span><span class="special">&lt;</span><span class="identifier">non_const</span><span class="special">,</span><span class="identifier">default_cc</span><span class="special">&gt;</span> <span class="comment">// combination of two properties
 </span></pre>
 <p>
      When several values for the same property are specified in <code class="literal">tag</code>'s
      argument list, only the rightmost one is used; others are ignored.
    </p>
-<pre class="programlisting">
-<span class="identifier">tag</span><span class="special">&lt;</span><span class="identifier">components</span><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;,</span> <span class="identifier">default_cc</span><span class="special">&gt;</span> <span class="comment">// overrides F's calling convention property
+<pre class="programlisting"><span class="identifier">tag</span><span class="special">&lt;</span><span class="identifier">components</span><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;,</span> <span class="identifier">default_cc</span><span class="special">&gt;</span> <span class="comment">// overrides F's calling convention property
 </span></pre>
 <p>
      When compound property tag is specified to analyse a type, all of its component
      properties must match.
    </p>
-<pre class="programlisting">
-<span class="identifier">is_member_function_pointer</span><span class="special">&lt;</span> <span class="identifier">F</span><span class="special">,</span> <span class="identifier">tag</span><span class="special">&lt;</span><span class="identifier">const_qualified</span><span class="special">,</span><span class="identifier">default_cc</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">value</span>
+<pre class="programlisting"><span class="identifier">is_member_function_pointer</span><span class="special">&lt;</span> <span class="identifier">F</span><span class="special">,</span> <span class="identifier">tag</span><span class="special">&lt;</span><span class="identifier">const_qualified</span><span class="special">,</span><span class="identifier">default_cc</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">value</span>
 <span class="comment">// true for 
 </span><span class="comment">//   F = void(a_class::*)() const
 </span><span class="comment">// false for
@ -71,8 +67,7 @@
      Default values are selected for properties not specified by the tag in the
      context of type synthesis.
    </p>
-<pre class="programlisting">
-<span class="comment">// given S = mpl::vector&lt;int,a_class const &amp;&gt;
+<pre class="programlisting"><span class="comment">// given S = mpl::vector&lt;int,a_class const &amp;&gt;
 </span>
 <span class="identifier">member_function_pointer</span><span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="comment">// is int (a_class::*)() const
 </span><span class="comment">// note: the cv-qualification is picked based on the class type,
@ -85,7 +80,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright <EFBFBD> 2004 -2007 Tobias Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
+      Schwinger<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>
@ -93,7 +89,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="use_cases.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="reference.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="use_cases.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="reference.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/html/boost_functiontypes/acknowledgements.html
+++ b/doc/html/boost_functiontypes/acknowledgements.html
@ -1,85 +1,86 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Acknowledgements</title>
-<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
-<link rel="up" href="../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
+<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="prev" href="rationale.html" title="Rationale">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
 <td align="center"><a href="../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
-<td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
+<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
 <td align="center"><a href="../../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="rationale.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a>
+<a accesskey="p" href="rationale.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functiontypes.acknowledgements"></a><a class="link" href="acknowledgements.html" title="Acknowledgements"> Acknowledgements</a>
+<a name="boost_functiontypes.acknowledgements"></a><a class="link" href="acknowledgements.html" title="Acknowledgements">Acknowledgements</a>
 </h2></div></div></div>
 <p>
      Thanks go to the following people for supporting the development of this library
      in one or the other way:
    </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-        David Abrahams
-      </li>
-<li>
-        Tom Brinkman
-      </li>
-<li>
-        Aleksey Gurtovoy
-      </li>
-<li>
-        Jody Hagins
-      </li>
-<li>
-        Hartmut Kaiser
-      </li>
-<li>
-        Andy Little
-      </li>
-<li>
-        John Maddock
-      </li>
-<li>
-        Paul Mensonides
-      </li>
-<li>
-        Alexander Nasonov
-      </li>
-<li>
-        Richard Smith
-      </li>
-<li>
-        Rob Stewart
-      </li>
-<li>
-        Jonathan Turkanis
-      </li>
-<li>
-        Pavel Vozenilek
-      </li>
-<li>
-        Steven Watanabe
-      </li>
-<li>
-        K. Noel Belcourt
-      </li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+          David Abrahams
+        </li>
+<li class="listitem">
+          Tom Brinkman
+        </li>
+<li class="listitem">
+          Aleksey Gurtovoy
+        </li>
+<li class="listitem">
+          Jody Hagins
+        </li>
+<li class="listitem">
+          Hartmut Kaiser
+        </li>
+<li class="listitem">
+          Andy Little
+        </li>
+<li class="listitem">
+          John Maddock
+        </li>
+<li class="listitem">
+          Paul Mensonides
+        </li>
+<li class="listitem">
+          Alexander Nasonov
+        </li>
+<li class="listitem">
+          Richard Smith
+        </li>
+<li class="listitem">
+          Rob Stewart
+        </li>
+<li class="listitem">
+          Jonathan Turkanis
+        </li>
+<li class="listitem">
+          Pavel Vozenilek
+        </li>
+<li class="listitem">
+          Steven Watanabe
+        </li>
+<li class="listitem">
+          K. Noel Belcourt
+        </li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright <EFBFBD> 2004 -2007 Tobias Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
+      Schwinger<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>
@ -87,7 +88,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="rationale.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a>
+<a accesskey="p" href="rationale.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a>
 </div>
 </body>
 </html>
--- a/doc/html/boost_functiontypes/introduction.html
+++ b/doc/html/boost_functiontypes/introduction.html
@ -1,30 +1,30 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Introduction</title>
-<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
-<link rel="up" href="../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
-<link rel="prev" href="../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
+<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
+<link rel="prev" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="next" href="use_cases.html" title="Use Cases">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
 <td align="center"><a href="../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
-<td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
+<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
 <td align="center"><a href="../../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../index.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="use_cases.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../index.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="use_cases.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functiontypes.introduction"></a><a class="link" href="introduction.html" title="Introduction"> Introduction</a>
+<a name="boost_functiontypes.introduction"></a><a class="link" href="introduction.html" title="Introduction">Introduction</a>
 </h2></div></div></div>
 <p>
      Boost.FunctionTypes provides functionality to classify, decompose and synthesize
@ -37,16 +37,16 @@
 <p>
      In particular, the library can be used to:
    </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-        test whether a type is a specific callable, builtin type,
-      </li>
-<li>
-        extract all component properties from callable, builtin types, and
-      </li>
-<li>
-        create callable, builtin types from specified properties.
-      </li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+          test whether a type is a specific callable, builtin type,
+        </li>
+<li class="listitem">
+          extract all component properties from callable, builtin types, and
+        </li>
+<li class="listitem">
+          create callable, builtin types from specified properties.
+        </li>
 </ul></div>
 <p>
      The library is designed to work well with other Boost libraries and uses well-accepted
@ -56,8 +56,7 @@
      Templates that encapsulate boolean or numeric properties define a static member
      constant called <code class="literal">value</code>.
    </p>
-<pre class="programlisting">
-<a class="link" href="reference/classification.html#boost_functiontypes.reference.classification.is_function_pointer" title="is_function_pointer">is_function_pointer</a><span class="special">&lt;</span> <span class="keyword">bool</span><span class="special">(*)(</span><span class="keyword">int</span><span class="special">)</span> <span class="special">&gt;::</span><span class="identifier">value</span> <span class="comment">// == true 
+<pre class="programlisting"><a class="link" href="reference/classification.html#boost_functiontypes.reference.classification.is_function_pointer" title="is_function_pointer">is_function_pointer</a><span class="special">&lt;</span> <span class="keyword">bool</span><span class="special">(*)(</span><span class="keyword">int</span><span class="special">)</span> <span class="special">&gt;::</span><span class="identifier">value</span> <span class="comment">// == true 
 </span>
 <a class="link" href="reference/decomposition.html#boost_functiontypes.reference.decomposition.function_arity" title="function_arity">function_arity</a><span class="special">&lt;</span> <span class="keyword">bool</span><span class="special">(*)(</span><span class="keyword">int</span><span class="special">)</span> <span class="special">&gt;::</span><span class="identifier">value</span> <span class="comment">// == 1
 </span></pre>
@ -65,8 +64,7 @@
      Templates that encapsulate properties that are single types contain a type
      member called <code class="literal">type</code>.
    </p>
-<pre class="programlisting">
-<a class="link" href="reference/synthesis.html#boost_functiontypes.reference.synthesis.function_type" title="function_type">function_type</a><span class="special">&lt;</span> <span class="identifier">mpl</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">bool</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="comment">// is bool(int)
+<pre class="programlisting"><a class="link" href="reference/synthesis.html#boost_functiontypes.reference.synthesis.function_type" title="function_type">function_type</a><span class="special">&lt;</span> <span class="identifier">mpl</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">bool</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="comment">// is bool(int)
 </span>
 <a class="link" href="reference/decomposition.html#boost_functiontypes.reference.decomposition.result_type" title="result_type">result_type</a><span class="special">&lt;</span> <span class="keyword">bool</span><span class="special">(&amp;)(</span><span class="keyword">int</span><span class="special">)</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="comment">// is bool
 </span></pre>
@ -74,13 +72,13 @@
      Templates that encapsulate properties that are type lists model an MPL-compatible
      type sequence.
    </p>
-<pre class="programlisting">
-<a class="link" href="reference/decomposition.html#boost_functiontypes.reference.decomposition.parameter_types" title="parameter_types">parameter_types</a><span class="special">&lt;</span> <span class="keyword">bool</span><span class="special">(</span><span class="keyword">int</span><span class="special">)</span> <span class="special">&gt;</span> <span class="comment">// models an MPL sequence
+<pre class="programlisting"><a class="link" href="reference/decomposition.html#boost_functiontypes.reference.decomposition.parameter_types" title="parameter_types">parameter_types</a><span class="special">&lt;</span> <span class="keyword">bool</span><span class="special">(</span><span class="keyword">int</span><span class="special">)</span> <span class="special">&gt;</span> <span class="comment">// models an MPL sequence
 </span></pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright <EFBFBD> 2004 -2007 Tobias Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
+      Schwinger<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>
@ -88,7 +86,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../index.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="use_cases.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../index.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="use_cases.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/html/boost_functiontypes/rationale.html
+++ b/doc/html/boost_functiontypes/rationale.html
@ -1,11 +1,11 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Rationale</title>
-<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
-<link rel="up" href="../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
+<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="prev" href="reference/macros.html" title="Macros">
 <link rel="next" href="acknowledgements.html" title="Acknowledgements">
 </head>
@ -13,21 +13,21 @@
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
 <td align="center"><a href="../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
-<td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
+<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
 <td align="center"><a href="../../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="reference/macros.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="acknowledgements.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="reference/macros.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="acknowledgements.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functiontypes.rationale"></a><a class="link" href="rationale.html" title="Rationale"> Rationale</a>
+<a name="boost_functiontypes.rationale"></a><a class="link" href="rationale.html" title="Rationale">Rationale</a>
 </h2></div></div></div>
 <a name="boost_functiontypes.rationale.error_handling_rationale"></a><h4>
-<a name="id2644279"></a>
+<a name="boost_functiontypes.rationale.error_handling_rationale-heading"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.error_handling_rationale">Error
      handling rationale</a>
    </h4>
@ -42,7 +42,7 @@
      can be spotted easily.
    </p>
 <a name="boost_functiontypes.rationale.why_mpl_sequences_"></a><h4>
-<a name="id2644312"></a>
+<a name="boost_functiontypes.rationale.why_mpl_sequences_-heading"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.why_mpl_sequences_">Why MPL Sequences?</a>
    </h4>
 <p>
@ -55,7 +55,7 @@
      so another reason is interoperability.
    </p>
 <a name="boost_functiontypes.rationale.pointer_to_member_object_types"></a><h4>
-<a name="id2644363"></a>
+<a name="boost_functiontypes.rationale.pointer_to_member_object_types-heading"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.pointer_to_member_object_types">Pointer
      to member object types</a>
    </h4>
@ -64,7 +64,7 @@
      functionals.
    </p>
 <a name="boost_functiontypes.rationale.the_classtransform_template_parameter"></a><h4>
-<a name="id2644388"></a>
+<a name="boost_functiontypes.rationale.the_classtransform_template_parameter-heading"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.the_classtransform_template_parameter">The
      ClassTransform template parameter</a>
    </h4>
@ -81,7 +81,7 @@
      all parameters uniformly.
    </p>
 <a name="boost_functiontypes.rationale.why_tag_types_"></a><h4>
-<a name="id2644439"></a>
+<a name="boost_functiontypes.rationale.why_tag_types_-heading"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.why_tag_types_">Why tag types?</a>
    </h4>
 <p>
@ -100,7 +100,7 @@
      with older compilers.
    </p>
 <a name="boost_functiontypes.rationale.is_it_safe_to_have_the_synthesis_templates_take_a_callable__builtin_type_or_an_mpl_sequence_as_the_first_template_argument_"></a><h4>
-<a name="id2644479"></a>
+<a name="boost_functiontypes.rationale.is_it_safe_to_have_the_synthesis_templates_take_a_callable__builtin_type_or_an_mpl_sequence_as_the_first_template_argument_-heading"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.is_it_safe_to_have_the_synthesis_templates_take_a_callable__builtin_type_or_an_mpl_sequence_as_the_first_template_argument_">Is
      it safe to have the synthesis templates take a callable builtin type or an
      MPL sequence as the first template argument?</a>
@ -115,7 +115,7 @@
      type a sequence have been included, which can easily violate the ODR.
    </p>
 <a name="boost_functiontypes.rationale.why_does_the_hidden__literal_this__literal__parameter_count_for_the__function_arity_of_member_functions_"></a><h4>
-<a name="id2644521"></a>
+<a name="boost_functiontypes.rationale.why_does_the_hidden__literal_this__literal__parameter_count_for_the__function_arity_of_member_functions_-heading"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.why_does_the_hidden__literal_this__literal__parameter_count_for_the__function_arity_of_member_functions_">Why
      does the hidden <code class="literal">this</code> parameter count for the function arity
      of member functions?</a>
@ -123,11 +123,10 @@
 <p>
      It was found preferable that the following condition holds:
    </p>
-<pre class="programlisting">
-<span class="identifier">mpl</span><span class="special">::</span><span class="identifier">size</span><span class="special">&lt;</span> <a class="link" href="reference/decomposition.html#boost_functiontypes.reference.decomposition.parameter_types" title="parameter_types">parameter_types</a><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">value</span> <span class="special">==</span> <a class="link" href="reference/decomposition.html#boost_functiontypes.reference.decomposition.function_arity" title="function_arity">function_arity</a><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">value</span>
+<pre class="programlisting"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">size</span><span class="special">&lt;</span> <a class="link" href="reference/decomposition.html#boost_functiontypes.reference.decomposition.parameter_types" title="parameter_types">parameter_types</a><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">value</span> <span class="special">==</span> <a class="link" href="reference/decomposition.html#boost_functiontypes.reference.decomposition.function_arity" title="function_arity">function_arity</a><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">value</span>
 </pre>
 <a name="boost_functiontypes.rationale.why_ignore_top_level_cv_qualifiers_on_pointers_"></a><h4>
-<a name="id2644638"></a>
+<a name="boost_functiontypes.rationale.why_ignore_top_level_cv_qualifiers_on_pointers_-heading"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.why_ignore_top_level_cv_qualifiers_on_pointers_">Why
      ignore top-level cv-qualifiers on pointers?</a>
    </h4>
@ -138,7 +137,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright <EFBFBD> 2004 -2007 Tobias Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
+      Schwinger<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>
@ -146,7 +146,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="reference/macros.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="acknowledgements.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="reference/macros.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="acknowledgements.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/html/boost_functiontypes/reference.html
+++ b/doc/html/boost_functiontypes/reference.html
@ -1,11 +1,11 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Reference</title>
-<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
-<link rel="up" href="../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
+<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="prev" href="about_tag_types.html" title="About Tag Types">
 <link rel="next" href="reference/classification.html" title="Class templates for type classification">
 </head>
@ -13,33 +13,34 @@
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
 <td align="center"><a href="../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
-<td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
+<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
 <td align="center"><a href="../../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="about_tag_types.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="reference/classification.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="about_tag_types.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="reference/classification.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functiontypes.reference"></a><a class="link" href="reference.html" title="Reference"> Reference</a>
+<a name="boost_functiontypes.reference"></a><a class="link" href="reference.html" title="Reference">Reference</a>
 </h2></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="reference/classification.html"> Class
-      templates for type classification</a></span></dt>
-<dt><span class="section"><a href="reference/decomposition.html"> Class templates
+<dt><span class="section"><a href="reference/classification.html">Class templates
+      for type classification</a></span></dt>
+<dt><span class="section"><a href="reference/decomposition.html">Class templates
      for type decomposition</a></span></dt>
-<dt><span class="section"><a href="reference/synthesis.html"> Class templates
+<dt><span class="section"><a href="reference/synthesis.html">Class templates
      for type synthesis</a></span></dt>
-<dt><span class="section"><a href="reference/tag_types.html"> Tag Types</a></span></dt>
-<dt><span class="section"><a href="reference/macros.html"> Macros</a></span></dt>
+<dt><span class="section"><a href="reference/tag_types.html">Tag Types</a></span></dt>
+<dt><span class="section"><a href="reference/macros.html">Macros</a></span></dt>
 </dl></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright <EFBFBD> 2004 -2007 Tobias Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
+      Schwinger<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>
@ -47,7 +48,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="about_tag_types.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="reference/classification.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="about_tag_types.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="reference/classification.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/html/boost_functiontypes/reference/classification.html
+++ b/doc/html/boost_functiontypes/reference/classification.html
@ -1,10 +1,10 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class templates for type classification</title>
-<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
+<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="../reference.html" title="Reference">
 <link rel="next" href="decomposition.html" title="Class templates for type decomposition">
@ -13,74 +13,63 @@
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
 <td align="center"><a href="../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
-<td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
+<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
 <td align="center"><a href="../../../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../reference.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="decomposition.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../reference.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="decomposition.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functiontypes.reference.classification"></a><a class="link" href="classification.html" title="Class templates for type classification"> Class
-      templates for type classification</a>
+<a name="boost_functiontypes.reference.classification"></a><a class="link" href="classification.html" title="Class templates for type classification">Class templates
+      for type classification</a>
 </h3></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_function">
-        is_function</a></span></dt>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_function_pointer">
-        is_function_pointer</a></span></dt>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_function_reference">
-        is_function_reference</a></span></dt>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_member_pointer">
-        is_member_pointer</a></span></dt>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_member_object_pointer">
-        is_member_object_pointer</a></span></dt>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_member_function_pointer">
-        is_member_function_pointer</a></span></dt>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_callable_builtin">
-        is_callable_builtin</a></span></dt>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_nonmember_callable_builtin">
-        is_nonmember_callable_builtin</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_function">is_function</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_function_pointer">is_function_pointer</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_function_reference">is_function_reference</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_member_pointer">is_member_pointer</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_member_object_pointer">is_member_object_pointer</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_member_function_pointer">is_member_function_pointer</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_callable_builtin">is_callable_builtin</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_nonmember_callable_builtin">is_nonmember_callable_builtin</a></span></dt>
 </dl></div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_function"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_function" title="is_function">
-        is_function</a>
+<a name="boost_functiontypes.reference.classification.is_function"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_function" title="is_function">is_function</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_function</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_function</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_function</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">T</code></span></dt>
 <dd><p>
-              Type to analyze
-            </p></dd>
+                Type to analyze
+              </p></dd>
 <dt><span class="term"><code class="literal">Tag</code></span></dt>
 <dd><p>
-              Further properties required for a positive result
-            </p></dd>
+                Further properties required for a positive result
+              </p></dd>
 <dt><span class="term"><code class="literal">is_function&lt;T,Tag&gt;</code></span></dt>
 <dd><p>
-              Predicate value as <a href="../../../../../mpl/index.html" target="_top">MPL</a>
-              - <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
-              Constant</a>
-            </p></dd>
+                Predicate value as <a href="../../../../../mpl/index.html" target="_top">MPL</a>
+                - <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
+                Constant</a>
+              </p></dd>
 <dt><span class="term"><code class="literal">is_function&lt;T,Tag&gt;::value</code></span></dt>
 <dd><p>
-              Constant boolean value
-            </p></dd>
+                Constant boolean value
+              </p></dd>
 </dl>
 </div>
 <p>
@ -88,42 +77,39 @@
          properties as specified by a property tag.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_function_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_function_pointer" title="is_function_pointer">
-        is_function_pointer</a>
+<a name="boost_functiontypes.reference.classification.is_function_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_function_pointer" title="is_function_pointer">is_function_pointer</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_function_pointer</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_function_pointer</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_function_pointer</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">T</code></span></dt>
 <dd><p>
-              Type to analyze
-            </p></dd>
+                Type to analyze
+              </p></dd>
 <dt><span class="term"><code class="literal">Tag</code></span></dt>
 <dd><p>
-              Further properties required for a positive result
-            </p></dd>
+                Further properties required for a positive result
+              </p></dd>
 <dt><span class="term"><code class="literal">is_function_pointer&lt;T,Tag&gt;</code></span></dt>
 <dd><p>
-              Predicate value <a href="../../../../../mpl/index.html" target="_top">MPL</a> -
-              <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
-              Constant</a>
-            </p></dd>
+                Predicate value <a href="../../../../../mpl/index.html" target="_top">MPL</a>
+                - <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
+                Constant</a>
+              </p></dd>
 <dt><span class="term"><code class="literal">is_function_pointer&lt;T,Tag&gt;::value</code></span></dt>
 <dd><p>
-              Constant boolean value
-            </p></dd>
+                Constant boolean value
+              </p></dd>
 </dl>
 </div>
 <p>
@ -131,42 +117,39 @@
          properties as specified by a property tag.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_function_reference"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_function_reference" title="is_function_reference">
-        is_function_reference</a>
+<a name="boost_functiontypes.reference.classification.is_function_reference"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_function_reference" title="is_function_reference">is_function_reference</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_function_reference</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_function_reference</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_function_reference</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">T</code></span></dt>
 <dd><p>
-              Type to analyze
-            </p></dd>
+                Type to analyze
+              </p></dd>
 <dt><span class="term"><code class="literal">Tag</code></span></dt>
 <dd><p>
-              Further properties required for a positive result
-            </p></dd>
+                Further properties required for a positive result
+              </p></dd>
 <dt><span class="term"><code class="literal">is_function_reference&lt;T,Tag&gt;</code></span></dt>
 <dd><p>
-              Predicate value <a href="../../../../../mpl/index.html" target="_top">MPL</a> -
-              <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
-              Constant</a>
-            </p></dd>
+                Predicate value <a href="../../../../../mpl/index.html" target="_top">MPL</a>
+                - <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
+                Constant</a>
+              </p></dd>
 <dt><span class="term"><code class="literal">is_function_reference&lt;T,Tag&gt;::value</code></span></dt>
 <dd><p>
-              Constant boolean value
-            </p></dd>
+                Constant boolean value
+              </p></dd>
 </dl>
 </div>
 <p>
@ -174,42 +157,39 @@
          additional properties as specified by a property tag.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_member_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_member_pointer" title="is_member_pointer">
-        is_member_pointer</a>
+<a name="boost_functiontypes.reference.classification.is_member_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_member_pointer" title="is_member_pointer">is_member_pointer</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_member_pointer</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_member_pointer</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_member_pointer</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">T</code></span></dt>
 <dd><p>
-              Type to analyze
-            </p></dd>
+                Type to analyze
+              </p></dd>
 <dt><span class="term"><code class="literal">Tag</code></span></dt>
 <dd><p>
-              Further properties required for a positive result
-            </p></dd>
+                Further properties required for a positive result
+              </p></dd>
 <dt><span class="term"><code class="literal">is_member_pointer&lt;T,Tag&gt;</code></span></dt>
 <dd><p>
-              Predicate value <a href="../../../../../mpl/index.html" target="_top">MPL</a> -
-              <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
-              Constant</a>
-            </p></dd>
+                Predicate value <a href="../../../../../mpl/index.html" target="_top">MPL</a>
+                - <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
+                Constant</a>
+              </p></dd>
 <dt><span class="term"><code class="literal">is_member_pointer&lt;T,Tag&gt;::value</code></span></dt>
 <dd><p>
-              Constant boolean value
-            </p></dd>
+                Constant boolean value
+              </p></dd>
 </dl>
 </div>
 <p>
@ -217,80 +197,74 @@
          type, possibly with additional properties as specified by a property tag.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_member_object_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_member_object_pointer" title="is_member_object_pointer">
-        is_member_object_pointer</a>
+<a name="boost_functiontypes.reference.classification.is_member_object_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_member_object_pointer" title="is_member_object_pointer">is_member_object_pointer</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_member_object_pointer</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_member_object_pointer</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_member_object_pointer</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">T</code></span></dt>
 <dd><p>
-              Type to analyze
-            </p></dd>
+                Type to analyze
+              </p></dd>
 <dt><span class="term"><code class="literal">is_member_object_pointer&lt;T&gt;</code></span></dt>
 <dd><p>
-              Predicate value <a href="../../../../../mpl/index.html" target="_top">MPL</a> -
-              <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
-              Constant</a>
-            </p></dd>
+                Predicate value <a href="../../../../../mpl/index.html" target="_top">MPL</a>
+                - <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
+                Constant</a>
+              </p></dd>
 <dt><span class="term"><code class="literal">is_member_object_pointer&lt;T&gt;::value</code></span></dt>
 <dd><p>
-              Constant boolean value
-            </p></dd>
+                Constant boolean value
+              </p></dd>
 </dl>
 </div>
 <p>
          Determines whether a given type is a pointer to member object type.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_member_function_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_member_function_pointer" title="is_member_function_pointer">
-        is_member_function_pointer</a>
+<a name="boost_functiontypes.reference.classification.is_member_function_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_member_function_pointer" title="is_member_function_pointer">is_member_function_pointer</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_member_function_pointer</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_member_function_pointer</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_member_function_pointer</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">T</code></span></dt>
 <dd><p>
-              Type to analyze
-            </p></dd>
+                Type to analyze
+              </p></dd>
 <dt><span class="term"><code class="literal">Tag</code></span></dt>
 <dd><p>
-              Further properties required for a positive result
-            </p></dd>
+                Further properties required for a positive result
+              </p></dd>
 <dt><span class="term"><code class="literal">is_member_function_pointer&lt;T,Tag&gt;</code></span></dt>
 <dd><p>
-              Predicate value <a href="../../../../../mpl/index.html" target="_top">MPL</a> -
-              <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
-              Constant</a>
-            </p></dd>
+                Predicate value <a href="../../../../../mpl/index.html" target="_top">MPL</a>
+                - <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
+                Constant</a>
+              </p></dd>
 <dt><span class="term"><code class="literal">is_member_function_pointer&lt;T,Tag&gt;::value</code></span></dt>
 <dd><p>
-              Constant boolean value
-            </p></dd>
+                Constant boolean value
+              </p></dd>
 </dl>
 </div>
 <p>
@ -298,42 +272,39 @@
          with additional properties as specified by a property tag.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_callable_builtin"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_callable_builtin" title="is_callable_builtin">
-        is_callable_builtin</a>
+<a name="boost_functiontypes.reference.classification.is_callable_builtin"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_callable_builtin" title="is_callable_builtin">is_callable_builtin</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_callable_builtin</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_callable_builtin</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_callable_builtin</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">T</code></span></dt>
 <dd><p>
-              Type to analyze
-            </p></dd>
+                Type to analyze
+              </p></dd>
 <dt><span class="term"><code class="literal">Tag</code></span></dt>
 <dd><p>
-              Further properties required for a positive result
-            </p></dd>
+                Further properties required for a positive result
+              </p></dd>
 <dt><span class="term"><code class="literal">is_callable_builtin&lt;T,Tag&gt;</code></span></dt>
 <dd><p>
-              Predicate value as <a href="../../../../../mpl/index.html" target="_top">MPL</a>
-              - <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
-              Constant</a>
-            </p></dd>
+                Predicate value as <a href="../../../../../mpl/index.html" target="_top">MPL</a>
+                - <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
+                Constant</a>
+              </p></dd>
 <dt><span class="term"><code class="literal">is_callable_builtin&lt;T,Tag&gt;::value</code></span></dt>
 <dd><p>
-              Constant boolean value
-            </p></dd>
+                Constant boolean value
+              </p></dd>
 </dl>
 </div>
 <p>
@ -341,42 +312,39 @@
          properties as specified by a property tag.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_nonmember_callable_builtin"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_nonmember_callable_builtin" title="is_nonmember_callable_builtin">
-        is_nonmember_callable_builtin</a>
+<a name="boost_functiontypes.reference.classification.is_nonmember_callable_builtin"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_nonmember_callable_builtin" title="is_nonmember_callable_builtin">is_nonmember_callable_builtin</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_nonmember_callable_builtin</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_nonmember_callable_builtin</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">is_nonmember_callable_builtin</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">T</code></span></dt>
 <dd><p>
-              Type to analyze
-            </p></dd>
+                Type to analyze
+              </p></dd>
 <dt><span class="term"><code class="literal">Tag</code></span></dt>
 <dd><p>
-              Further properties required for a positive result
-            </p></dd>
+                Further properties required for a positive result
+              </p></dd>
 <dt><span class="term"><code class="literal">is_nonmember_callable_builtin&lt;T,Tag&gt;</code></span></dt>
 <dd><p>
-              Predicate value as <a href="../../../../../mpl/index.html" target="_top">MPL</a>
-              - <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
-              Constant</a>
-            </p></dd>
+                Predicate value as <a href="../../../../../mpl/index.html" target="_top">MPL</a>
+                - <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
+                Constant</a>
+              </p></dd>
 <dt><span class="term"><code class="literal">is_nonmember_callable_builtin&lt;T,Tag&gt;::value</code></span></dt>
 <dd><p>
-              Constant boolean value
-            </p></dd>
+                Constant boolean value
+              </p></dd>
 </dl>
 </div>
 <p>
@ -388,7 +356,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright <EFBFBD> 2004 -2007 Tobias Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
+      Schwinger<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>
@ -396,7 +365,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../reference.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="decomposition.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="../reference.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="decomposition.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/html/boost_functiontypes/reference/decomposition.html
+++ b/doc/html/boost_functiontypes/reference/decomposition.html
@ -1,10 +1,10 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class templates for type decomposition</title>
-<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
+<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="classification.html" title="Class templates for type classification">
 <link rel="next" href="synthesis.html" title="Class templates for type synthesis">
@ -13,56 +13,49 @@
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
 <td align="center"><a href="../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
-<td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
+<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
 <td align="center"><a href="../../../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="classification.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="synthesis.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="classification.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="synthesis.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functiontypes.reference.decomposition"></a><a class="link" href="decomposition.html" title="Class templates for type decomposition"> Class templates
+<a name="boost_functiontypes.reference.decomposition"></a><a class="link" href="decomposition.html" title="Class templates for type decomposition">Class templates
      for type decomposition</a>
 </h3></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.result_type">
-        result_type</a></span></dt>
-<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.parameter_types">
-        parameter_types</a></span></dt>
-<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.function_arity">
-        function_arity</a></span></dt>
-<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.components">
-        components</a></span></dt>
+<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.result_type">result_type</a></span></dt>
+<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.parameter_types">parameter_types</a></span></dt>
+<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.function_arity">function_arity</a></span></dt>
+<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.components">components</a></span></dt>
 </dl></div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.decomposition.result_type"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.result_type" title="result_type">
-        result_type</a>
+<a name="boost_functiontypes.reference.decomposition.result_type"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.result_type" title="result_type">result_type</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">result_type</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">result_type</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">result_type</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">F</code></span></dt>
 <dd><p>
-              Type to analyze
-            </p></dd>
+                Type to analyze
+              </p></dd>
 <dt><span class="term"><code class="literal">result_type&lt;F&gt;::type</code></span></dt>
 <dd><p>
-              Result type of <code class="literal">F</code>
-            </p></dd>
+                Result type of <code class="literal">F</code>
+              </p></dd>
 </dl>
 </div>
 <p>
@ -73,42 +66,39 @@
          the <code class="literal">type</code> member results in a compile error.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.decomposition.parameter_types"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.parameter_types" title="parameter_types">
-        parameter_types</a>
+<a name="boost_functiontypes.reference.decomposition.parameter_types"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.parameter_types" title="parameter_types">parameter_types</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ClassTransform</span> <span class="special">=</span> <span class="identifier">add_reference</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ClassTransform</span> <span class="special">=</span> <span class="identifier">add_reference</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">parameter_types</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">parameter_types</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">parameter_types</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">F</code></span></dt>
 <dd><p>
-              Type to analyze
-            </p></dd>
+                Type to analyze
+              </p></dd>
 <dt><span class="term"><code class="literal">ClassTransform</code></span></dt>
 <dd><p>
-              <a href="../../../../../mpl/index.html" target="_top">MPL</a> - <a href="../../../../../mpl/doc/refmanual/lambda-expression.html" target="_top">Lambda
-              Expression</a> to transform the class type if <code class="literal">F</code>
-              is a member function pointer
-            </p></dd>
+                <a href="../../../../../mpl/index.html" target="_top">MPL</a> - <a href="../../../../../mpl/doc/refmanual/lambda-expression.html" target="_top">Lambda
+                Expression</a> to transform the class type if <code class="literal">F</code>
+                is a member function pointer
+              </p></dd>
 <dt><span class="term"><code class="literal">parameter_types&lt;F,ClassTransform&gt;</code></span></dt>
 <dd><p>
-              <a href="../../../../../mpl/index.html" target="_top">MPL</a> - <a href="../../../../../mpl/doc/refmanual/front-extensible-sequence.html" target="_top">Front</a>
-              / <a href="../../../../../mpl/doc/refmanual/back-extensible-sequence.html" target="_top">Back
-              </a><a href="../../../../../mpl/doc/refmanual/extensible-sequence.html" target="_top">Extensible
-              </a><a href="../../../../../mpl/doc/refmanual/random-access-sequence.html" target="_top">Random
-              Access Sequence</a> of parameter types
-            </p></dd>
+                <a href="../../../../../mpl/index.html" target="_top">MPL</a> - <a href="../../../../../mpl/doc/refmanual/front-extensible-sequence.html" target="_top">Front</a>
+                / <a href="../../../../../mpl/doc/refmanual/back-extensible-sequence.html" target="_top">Back
+                </a><a href="../../../../../mpl/doc/refmanual/extensible-sequence.html" target="_top">Extensible
+                </a><a href="../../../../../mpl/doc/refmanual/random-access-sequence.html" target="_top">Random
+                Access Sequence</a> of parameter types
+              </p></dd>
 </dl>
 </div>
 <p>
@ -119,38 +109,35 @@
          the sequence results in a compile error.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.decomposition.function_arity"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.function_arity" title="function_arity">
-        function_arity</a>
+<a name="boost_functiontypes.reference.decomposition.function_arity"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.function_arity" title="function_arity">function_arity</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">function_arity</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">function_arity</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">function_arity</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">F</code></span></dt>
 <dd><p>
-              Callable builtin type
-            </p></dd>
+                Callable builtin type
+              </p></dd>
 <dt><span class="term"><code class="literal">function_arity&lt;F&gt;</code></span></dt>
 <dd><p>
-              Function arity as <a href="../../../../../mpl/index.html" target="_top">MPL</a>
-              - <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
-              Constant</a>
-            </p></dd>
+                Function arity as <a href="../../../../../mpl/index.html" target="_top">MPL</a>
+                - <a href="../../../../../mpl/doc/refmanual/integral-constant.html" target="_top">Integral
+                Constant</a>
+              </p></dd>
 <dt><span class="term"><code class="literal">function_arity&lt;F&gt;::value</code></span></dt>
 <dd><p>
-              Constant value of the function arity
-            </p></dd>
+                Constant value of the function arity
+              </p></dd>
 </dl>
 </div>
 <p>
@ -164,46 +151,43 @@
          the value results in a compile error.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.decomposition.components"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.components" title="components">
-        components</a>
+<a name="boost_functiontypes.reference.decomposition.components"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.components" title="components">components</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ClassTransform</span> <span class="special">=</span> <span class="identifier">add_reference</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ClassTransform</span> <span class="special">=</span> <span class="identifier">add_reference</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">components</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">components</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">components</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">T</code></span></dt>
 <dd><p>
-              Type to analyze
-            </p></dd>
+                Type to analyze
+              </p></dd>
 <dt><span class="term"><code class="literal">ClassTransform</code></span></dt>
 <dd><p>
-              <a href="../../../../../mpl/index.html" target="_top">MPL</a> - <a href="../../../../../mpl/doc/refmanual/lambda-expression.html" target="_top">Lambda
-              Expression</a> to transform the class type if <code class="literal">T</code>
-              is a member function pointer
-            </p></dd>
+                <a href="../../../../../mpl/index.html" target="_top">MPL</a> - <a href="../../../../../mpl/doc/refmanual/lambda-expression.html" target="_top">Lambda
+                Expression</a> to transform the class type if <code class="literal">T</code>
+                is a member function pointer
+              </p></dd>
 <dt><span class="term"><code class="literal">components&lt;T,ClassTransform&gt;</code></span></dt>
 <dd><p>
-              <a href="../../../../../mpl/index.html" target="_top">MPL</a> - <a href="../../../../../mpl/doc/refmanual/front-extensible-sequence.html" target="_top">Front</a>
-              / <a href="../../../../../mpl/doc/refmanual/back-extensible-sequence.html" target="_top">Back
-              </a><a href="../../../../../mpl/doc/refmanual/extensible-sequence.html" target="_top">Extensible
-              </a><a href="../../../../../mpl/doc/refmanual/random-access-sequence.html" target="_top">Random
-              Access Sequence</a> of all component types and property tag
-            </p></dd>
+                <a href="../../../../../mpl/index.html" target="_top">MPL</a> - <a href="../../../../../mpl/doc/refmanual/front-extensible-sequence.html" target="_top">Front</a>
+                / <a href="../../../../../mpl/doc/refmanual/back-extensible-sequence.html" target="_top">Back
+                </a><a href="../../../../../mpl/doc/refmanual/extensible-sequence.html" target="_top">Extensible
+                </a><a href="../../../../../mpl/doc/refmanual/random-access-sequence.html" target="_top">Random
+                Access Sequence</a> of all component types and property tag
+              </p></dd>
 <dt><span class="term"><code class="literal">components&lt;T,ClassTransform&gt;::types</code></span></dt>
 <dd><p>
-              Decorated MPL Sequence, exposed for optimization
-            </p></dd>
+                Decorated MPL Sequence, exposed for optimization
+              </p></dd>
 </dl>
 </div>
 <p>
@ -219,7 +203,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright <EFBFBD> 2004 -2007 Tobias Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
+      Schwinger<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>
@ -227,7 +212,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="classification.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="synthesis.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="classification.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="synthesis.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/html/boost_functiontypes/reference/macros.html
+++ b/doc/html/boost_functiontypes/reference/macros.html
@ -1,10 +1,10 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Macros</title>
-<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
+<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="tag_types.html" title="Tag Types">
 <link rel="next" href="../rationale.html" title="Rationale">
@ -13,43 +13,33 @@
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
 <td align="center"><a href="../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
-<td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
+<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
 <td align="center"><a href="../../../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="tag_types.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../rationale.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="tag_types.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../rationale.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functiontypes.reference.macros"></a><a class="link" href="macros.html" title="Macros"> Macros</a>
+<a name="boost_functiontypes.reference.macros"></a><a class="link" href="macros.html" title="Macros">Macros</a>
 </h3></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_MAX_ARITY">
-        BOOST_FT_MAX_ARITY</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_NAMES">
-        BOOST_FT_CC_NAMES</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC">
-        BOOST_FT_CC_*</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_COMMON_X86_CCs">
-        BOOST_FT_COMMON_X86_CCs</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_SYNTAX">
-        BOOST_FT_SYNTAX</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NULLARY_PARAM">
-        BOOST_FT_NULLARY_PARAM</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NO_CV_FUNC_SUPPORT">
-        BOOST_FT_NO_CV_FUNC_SUPPORT</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_PREPROCESSING_MODE">
-        BOOST_FT_PREPROCESSING_MODE</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_PREPROCESSING">
-        BOOST_FT_CC_PREPROCESSING</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_MAX_ARITY">BOOST_FT_MAX_ARITY</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_NAMES">BOOST_FT_CC_NAMES</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC">BOOST_FT_CC_*</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_COMMON_X86_CCs">BOOST_FT_COMMON_X86_CCs</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_SYNTAX">BOOST_FT_SYNTAX</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NULLARY_PARAM">BOOST_FT_NULLARY_PARAM</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NO_CV_FUNC_SUPPORT">BOOST_FT_NO_CV_FUNC_SUPPORT</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_PREPROCESSING_MODE">BOOST_FT_PREPROCESSING_MODE</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_PREPROCESSING">BOOST_FT_CC_PREPROCESSING</a></span></dt>
 </dl></div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_MAX_ARITY"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_MAX_ARITY" title="BOOST_FT_MAX_ARITY">
-        BOOST_FT_MAX_ARITY</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_MAX_ARITY"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_MAX_ARITY" title="BOOST_FT_MAX_ARITY">BOOST_FT_MAX_ARITY</a>
 </h4></div></div></div>
 <p>
          Expands to a numeric value that describes the maximum function arity supported
@ -65,10 +55,9 @@
        to configure the library to work with a compiler and/or calling convention
        not covered by the auto-detection mechanism in <code class="literal">boost/function_types/config/compiler.hpp</code>.</strong></span>
      </p>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_CC_NAMES"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_NAMES" title="BOOST_FT_CC_NAMES">
-        BOOST_FT_CC_NAMES</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_CC_NAMES"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_NAMES" title="BOOST_FT_CC_NAMES">BOOST_FT_CC_NAMES</a>
 </h4></div></div></div>
 <p>
          Expands to a <a href="../../../../../preprocessor/doc/data/sequences.html" target="_top">sequence</a>
@ -90,8 +79,7 @@
          The following names are predefined by the library and must not occur in
          the definition of <code class="literal">BOOST_FT_CC_NAMES</code>:
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#define</span> <span class="identifier">BOOST_FT_BUILTIN_CC_NAMES</span> <span class="special">\</span>
+<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_FT_BUILTIN_CC_NAMES</span> <span class="special">\</span>
  <span class="special">((</span> <span class="identifier">IMPLICIT</span>           <span class="special">,</span> <span class="identifier">implicit_cc</span> <span class="special">,</span> <span class="identifier">BOOST_PP_EMPTY</span>                <span class="special">))\</span>
  <span class="special">((</span> <span class="identifier">CDECL</span>              <span class="special">,</span> <span class="identifier">cdecl_cc</span>    <span class="special">,</span> <span class="identifier">BOOST_PP_IDENTITY</span><span class="special">(</span><span class="identifier">__cdecl</span>   <span class="special">)</span> <span class="special">))\</span>
  <span class="special">((</span> <span class="identifier">STDCALL</span>            <span class="special">,</span> <span class="identifier">stdcall_cc</span>  <span class="special">,</span> <span class="identifier">BOOST_PP_IDENTITY</span><span class="special">(</span><span class="identifier">__stdcall</span> <span class="special">)</span> <span class="special">))\</span>
@ -104,10 +92,9 @@
 </span><span class="comment">// explicitly prior to MSVC 8).
 </span></pre>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_CC"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC" title="BOOST_FT_CC_*">
-        BOOST_FT_CC_*</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_CC"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC" title="BOOST_FT_CC_*">BOOST_FT_CC_*</a>
 </h4></div></div></div>
 <p>
          Enables a specific calling convention. * denotes the macro suffix, as defined
@ -118,52 +105,48 @@
          The macro expands to a list of restrictions, separated by the <code class="literal">|</code>
          character. Possible items are:
        </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-            callable_builtin
-          </li>
-<li>
-            member
-          </li>
-<li>
-            non_member
-          </li>
-<li>
-            variadic
-          </li>
-<li>
-            non_variadic
-          </li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+              callable_builtin
+            </li>
+<li class="listitem">
+              member
+            </li>
+<li class="listitem">
+              non_member
+            </li>
+<li class="listitem">
+              variadic
+            </li>
+<li class="listitem">
+              non_variadic
+            </li>
 </ul></div>
 <p>
          If no such macro is defined for a particular calling convention, it is
          disabled. Example:
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#define</span> <span class="identifier">BOOST_FT_CC_STDCALL</span> <span class="identifier">non_variadic</span><span class="special">|</span><span class="identifier">callable_builtin</span>
+<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_FT_CC_STDCALL</span> <span class="identifier">non_variadic</span><span class="special">|</span><span class="identifier">callable_builtin</span>
 <span class="comment">// enables stdcall calling convention for all non-variadic, 
 </span><span class="comment">// callable, builtin types
 </span></pre>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_COMMON_X86_CCs"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_COMMON_X86_CCs" title="BOOST_FT_COMMON_X86_CCs">
-        BOOST_FT_COMMON_X86_CCs</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_COMMON_X86_CCs"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_COMMON_X86_CCs" title="BOOST_FT_COMMON_X86_CCs">BOOST_FT_COMMON_X86_CCs</a>
 </h4></div></div></div>
 <p>
          Defining this macro causes the following macros to be defined, if not defined
          already:
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#define</span> <span class="identifier">BOOST_FT_CC_CDECL</span> <span class="identifier">BOOST_FT_COMMON_X86_CCs</span>
+<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_FT_CC_CDECL</span> <span class="identifier">BOOST_FT_COMMON_X86_CCs</span>
 <span class="preprocessor">#define</span> <span class="identifier">BOOST_FT_CC_STDCALL</span> <span class="identifier">non_variadic</span><span class="special">|</span><span class="identifier">BOOST_FT_COMMON_X86_CCs</span>
 <span class="preprocessor">#define</span> <span class="identifier">BOOST_FT_CC_FASTCALL</span> <span class="identifier">non_variadic</span><span class="special">|</span><span class="identifier">BOOST_FT_COMMON_X86_CCs</span>
 </pre>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_SYNTAX"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_SYNTAX" title="BOOST_FT_SYNTAX">
-        BOOST_FT_SYNTAX</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_SYNTAX"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_SYNTAX" title="BOOST_FT_SYNTAX">BOOST_FT_SYNTAX</a>
 </h4></div></div></div>
 <p>
          This macro allows to change the syntax of callable builtin types. It is
@ -173,25 +156,22 @@
 <p>
          The default definition is as follows:
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#define</span> <span class="identifier">BOOST_FT_SYNTAX</span><span class="special">(</span><span class="identifier">result</span><span class="special">,</span><span class="identifier">lparen</span><span class="special">,</span><span class="identifier">cc_spec</span><span class="special">,</span><span class="identifier">type_mod</span><span class="special">,</span><span class="identifier">name</span><span class="special">,</span><span class="identifier">rparen</span><span class="special">)</span> <span class="special">\</span>
+<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_FT_SYNTAX</span><span class="special">(</span><span class="identifier">result</span><span class="special">,</span><span class="identifier">lparen</span><span class="special">,</span><span class="identifier">cc_spec</span><span class="special">,</span><span class="identifier">type_mod</span><span class="special">,</span><span class="identifier">name</span><span class="special">,</span><span class="identifier">rparen</span><span class="special">)</span> <span class="special">\</span>
          <span class="identifier">result</span><span class="special">()</span> <span class="identifier">lparen</span><span class="special">()</span> <span class="identifier">cc_spec</span><span class="special">()</span> <span class="identifier">type_mod</span><span class="special">()</span> <span class="identifier">name</span><span class="special">()</span> <span class="identifier">rparen</span><span class="special">()</span>
 </pre>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_NULLARY_PARAM"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NULLARY_PARAM" title="BOOST_FT_NULLARY_PARAM">
-        BOOST_FT_NULLARY_PARAM</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_NULLARY_PARAM"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NULLARY_PARAM" title="BOOST_FT_NULLARY_PARAM">BOOST_FT_NULLARY_PARAM</a>
 </h4></div></div></div>
 <p>
          Set to <code class="literal">void</code> for compilers that insist on a <code class="literal">void</code>
          parameter for nullary function types, empty by default.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_NO_CV_FUNC_SUPPORT"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NO_CV_FUNC_SUPPORT" title="BOOST_FT_NO_CV_FUNC_SUPPORT">
-        BOOST_FT_NO_CV_FUNC_SUPPORT</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_NO_CV_FUNC_SUPPORT"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NO_CV_FUNC_SUPPORT" title="BOOST_FT_NO_CV_FUNC_SUPPORT">BOOST_FT_NO_CV_FUNC_SUPPORT</a>
 </h4></div></div></div>
 <p>
          Disables support for cv-qualified function types. Cv-qualified function
@ -205,20 +185,18 @@
        <span class="bold"><strong>The following macros are useful for testing when changing
        the source code of the library.</strong></span>
      </p>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_PREPROCESSING_MODE"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_PREPROCESSING_MODE" title="BOOST_FT_PREPROCESSING_MODE">
-        BOOST_FT_PREPROCESSING_MODE</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_PREPROCESSING_MODE"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_PREPROCESSING_MODE" title="BOOST_FT_PREPROCESSING_MODE">BOOST_FT_PREPROCESSING_MODE</a>
 </h4></div></div></div>
 <p>
          Makes the compiler preprocess as much as possible of the library code (rather
          than loading already-preprocessed header files) if defined.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_CC_PREPROCESSING"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_PREPROCESSING" title="BOOST_FT_CC_PREPROCESSING">
-        BOOST_FT_CC_PREPROCESSING</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_CC_PREPROCESSING"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_PREPROCESSING" title="BOOST_FT_CC_PREPROCESSING">BOOST_FT_CC_PREPROCESSING</a>
 </h4></div></div></div>
 <p>
          Makes the compiler preprocess the loop over possible names for custom calling
@ -233,7 +211,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright <EFBFBD> 2004 -2007 Tobias Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
+      Schwinger<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>
@ -241,7 +220,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="tag_types.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../rationale.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="tag_types.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="../rationale.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/html/boost_functiontypes/reference/synthesis.html
+++ b/doc/html/boost_functiontypes/reference/synthesis.html
@ -1,10 +1,10 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class templates for type synthesis</title>
-<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
+<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="decomposition.html" title="Class templates for type decomposition">
 <link rel="next" href="tag_types.html" title="Tag Types">
@ -13,62 +13,55 @@
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
 <td align="center"><a href="../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
-<td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
+<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
 <td align="center"><a href="../../../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="decomposition.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="tag_types.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="decomposition.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="tag_types.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functiontypes.reference.synthesis"></a><a class="link" href="synthesis.html" title="Class templates for type synthesis"> Class templates
+<a name="boost_functiontypes.reference.synthesis"></a><a class="link" href="synthesis.html" title="Class templates for type synthesis">Class templates
      for type synthesis</a>
 </h3></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.function_type">
-        function_type</a></span></dt>
-<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.function_pointer">
-        function_pointer</a></span></dt>
-<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.function_reference">
-        function_reference</a></span></dt>
-<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.member_function_pointer">
-        member_function_pointer</a></span></dt>
+<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.function_type">function_type</a></span></dt>
+<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.function_pointer">function_pointer</a></span></dt>
+<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.function_reference">function_reference</a></span></dt>
+<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.member_function_pointer">member_function_pointer</a></span></dt>
 </dl></div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.synthesis.function_type"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.function_type" title="function_type">
-        function_type</a>
+<a name="boost_functiontypes.reference.synthesis.function_type"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.function_type" title="function_type">function_type</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Types</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span> 
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Types</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span> 
 <span class="keyword">struct</span> <span class="identifier">function_type</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">function_type</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">function_type</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">Types</code></span></dt>
 <dd><p>
-              Component types in form of an <a href="../../../../../mpl/index.html" target="_top">MPL</a>
-              - <a href="../../../../../mpl/doc/refmanual/forward-sequence.html" target="_top">Forward
-              Sequence</a> or another callable, builtin type
-            </p></dd>
+                Component types in form of an <a href="../../../../../mpl/index.html" target="_top">MPL</a>
+                - <a href="../../../../../mpl/doc/refmanual/forward-sequence.html" target="_top">Forward
+                Sequence</a> or another callable, builtin type
+              </p></dd>
 <dt><span class="term"><code class="literal">Tag</code></span></dt>
 <dd><p>
-              Further properties
-            </p></dd>
+                Further properties
+              </p></dd>
 <dt><span class="term"><code class="literal">function_type&lt;Types,Tag&gt;::type</code></span></dt>
 <dd><p>
-              Synthesized type
-            </p></dd>
+                Synthesized type
+              </p></dd>
 </dl>
 </div>
 <p>
@ -79,38 +72,35 @@
          access the <code class="literal">type</code> member will result in a compile error.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.synthesis.function_pointer"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.function_pointer" title="function_pointer">
-        function_pointer</a>
+<a name="boost_functiontypes.reference.synthesis.function_pointer"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.function_pointer" title="function_pointer">function_pointer</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Types</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span> 
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Types</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span> 
 <span class="keyword">struct</span> <span class="identifier">function_pointer</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">function_pointer</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">function_pointer</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">Types</code></span></dt>
 <dd><p>
-              Component types in form of an <a href="../../../../../mpl/index.html" target="_top">MPL</a>
-              - <a href="../../../../../mpl/doc/refmanual/forward-sequence.html" target="_top">Forward
-              Sequence</a> or another callable, builtin type
-            </p></dd>
+                Component types in form of an <a href="../../../../../mpl/index.html" target="_top">MPL</a>
+                - <a href="../../../../../mpl/doc/refmanual/forward-sequence.html" target="_top">Forward
+                Sequence</a> or another callable, builtin type
+              </p></dd>
 <dt><span class="term"><code class="literal">Tag</code></span></dt>
 <dd><p>
-              Further properties
-            </p></dd>
+                Further properties
+              </p></dd>
 <dt><span class="term"><code class="literal">function_pointer&lt;Types,Tag&gt;::type</code></span></dt>
 <dd><p>
-              Synthesized type
-            </p></dd>
+                Synthesized type
+              </p></dd>
 </dl>
 </div>
 <p>
@ -121,38 +111,35 @@
          access the <code class="literal">type</code> member will result in a compile error.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.synthesis.function_reference"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.function_reference" title="function_reference">
-        function_reference</a>
+<a name="boost_functiontypes.reference.synthesis.function_reference"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.function_reference" title="function_reference">function_reference</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Types</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span> 
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Types</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span> 
 <span class="keyword">struct</span> <span class="identifier">function_reference</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">function_reference</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">function_reference</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">Types</code></span></dt>
 <dd><p>
-              Component types in form of an <a href="../../../../../mpl/index.html" target="_top">MPL</a>
-              - <a href="../../../../../mpl/doc/refmanual/forward-sequence.html" target="_top">Forward
-              Sequence</a> or another callable, builtin type
-            </p></dd>
+                Component types in form of an <a href="../../../../../mpl/index.html" target="_top">MPL</a>
+                - <a href="../../../../../mpl/doc/refmanual/forward-sequence.html" target="_top">Forward
+                Sequence</a> or another callable, builtin type
+              </p></dd>
 <dt><span class="term"><code class="literal">Tag</code></span></dt>
 <dd><p>
-              Further properties
-            </p></dd>
+                Further properties
+              </p></dd>
 <dt><span class="term"><code class="literal">function_reference&lt;Types,Tag&gt;::type</code></span></dt>
 <dd><p>
-              Synthesized type
-            </p></dd>
+                Synthesized type
+              </p></dd>
 </dl>
 </div>
 <p>
@ -163,38 +150,35 @@
          access the <code class="literal">type</code> member will result in a compile error.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.synthesis.member_function_pointer"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.member_function_pointer" title="member_function_pointer">
-        member_function_pointer</a>
+<a name="boost_functiontypes.reference.synthesis.member_function_pointer"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.member_function_pointer" title="member_function_pointer">member_function_pointer</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Types</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span> 
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Types</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span> 
 <span class="keyword">struct</span> <span class="identifier">member_function_pointer</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">member_function_pointer</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">member_function_pointer</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">Types</code></span></dt>
 <dd><p>
-              Component types in form of an <a href="../../../../../mpl/index.html" target="_top">MPL</a>
-              - <a href="../../../../../mpl/doc/refmanual/forward-sequence.html" target="_top">Forward
-              Sequence</a> or another callable, builtin type
-            </p></dd>
+                Component types in form of an <a href="../../../../../mpl/index.html" target="_top">MPL</a>
+                - <a href="../../../../../mpl/doc/refmanual/forward-sequence.html" target="_top">Forward
+                Sequence</a> or another callable, builtin type
+              </p></dd>
 <dt><span class="term"><code class="literal">Tag</code></span></dt>
 <dd><p>
-              Further properties
-            </p></dd>
+                Further properties
+              </p></dd>
 <dt><span class="term"><code class="literal">member_function_pointer&lt;Types,Tag&gt;::type</code></span></dt>
 <dd><p>
-              Synthesized type
-            </p></dd>
+                Synthesized type
+              </p></dd>
 </dl>
 </div>
 <p>
@ -214,7 +198,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright <EFBFBD> 2004 -2007 Tobias Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
+      Schwinger<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>
@ -222,7 +207,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="decomposition.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="tag_types.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="decomposition.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="tag_types.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/html/boost_functiontypes/reference/tag_types.html
+++ b/doc/html/boost_functiontypes/reference/tag_types.html
@ -1,10 +1,10 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Tag Types</title>
-<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
+<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="synthesis.html" title="Class templates for type synthesis">
 <link rel="next" href="macros.html" title="Macros">
@ -13,184 +13,150 @@
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
 <td align="center"><a href="../../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../../libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
-<td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
+<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
 <td align="center"><a href="../../../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="synthesis.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="macros.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="synthesis.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="macros.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functiontypes.reference.tag_types"></a><a class="link" href="tag_types.html" title="Tag Types"> Tag Types</a>
+<a name="boost_functiontypes.reference.tag_types"></a><a class="link" href="tag_types.html" title="Tag Types">Tag Types</a>
 </h3></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.variadic">
-        variadic</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_variadic">
-        non_variadic</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.default_cc">
-        default_cc</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.const_qualified">
-        const_qualified</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_const">
-        non_const</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_qualified">
-        volatile_qualified</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_volatile">
-        non_volatile</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_cv"> non_cv</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.const_non_volatile">
-        const_non_volatile</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_non_const">
-        volatile_non_const</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.cv_qualfied">
-        cv_qualfied</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag">
-        null_tag</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.tag"> tag</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.variadic">variadic</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_variadic">non_variadic</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.default_cc">default_cc</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.const_qualified">const_qualified</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_const">non_const</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_qualified">volatile_qualified</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_volatile">non_volatile</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_cv">non_cv</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.const_non_volatile">const_non_volatile</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_non_const">volatile_non_const</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.cv_qualfied">cv_qualfied</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag">null_tag</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.tag">tag</a></span></dt>
 </dl></div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.variadic"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.variadic" title="variadic">
-        variadic</a>
+<a name="boost_functiontypes.reference.tag_types.variadic"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.variadic" title="variadic">variadic</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">variadic</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">variadic</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
          States that a function type takes a variable number of arguments through
          an ellipsis parameter (such as <code class="literal">printf</code>).
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.non_variadic"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_variadic" title="non_variadic">
-        non_variadic</a>
+<a name="boost_functiontypes.reference.tag_types.non_variadic"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_variadic" title="non_variadic">non_variadic</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">non_variadic</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">non_variadic</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
          States that a function type does not have an ellipsis parameter.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.default_cc"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.default_cc" title="default_cc">
-        default_cc</a>
+<a name="boost_functiontypes.reference.tag_types.default_cc"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.default_cc" title="default_cc">default_cc</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">default_cc</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">default_cc</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
          States that a function type encodes the default calling convention.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.const_qualified"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.const_qualified" title="const_qualified">
-        const_qualified</a>
+<a name="boost_functiontypes.reference.tag_types.const_qualified"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.const_qualified" title="const_qualified">const_qualified</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">const_qualified</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">const_qualified</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
          States that a function type is const qualified.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.non_const"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_const" title="non_const">
-        non_const</a>
+<a name="boost_functiontypes.reference.tag_types.non_const"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_const" title="non_const">non_const</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">non_const</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">non_const</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
          States that a function type is not const qualified.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.volatile_qualified"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_qualified" title="volatile_qualified">
-        volatile_qualified</a>
+<a name="boost_functiontypes.reference.tag_types.volatile_qualified"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_qualified" title="volatile_qualified">volatile_qualified</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">volatile_qualified</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">volatile_qualified</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
          States that a function type is volatile qualified.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.non_volatile"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_volatile" title="non_volatile">
-        non_volatile</a>
+<a name="boost_functiontypes.reference.tag_types.non_volatile"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_volatile" title="non_volatile">non_volatile</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">non_volatile</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">non_volatile</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
          States that a function type is not volatile qualified.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.non_cv"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_cv" title="non_cv"> non_cv</a>
+<a name="boost_functiontypes.reference.tag_types.non_cv"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_cv" title="non_cv">non_cv</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">non_cv</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">non_cv</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
          States that a function type is neither const nor volatile qualified. Equivalent
@ -198,19 +164,16 @@
          but involves fewer template instantiations when evaluated.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.const_non_volatile"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.const_non_volatile" title="const_non_volatile">
-        const_non_volatile</a>
+<a name="boost_functiontypes.reference.tag_types.const_non_volatile"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.const_non_volatile" title="const_non_volatile">const_non_volatile</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">const_non_volatile</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">const_non_volatile</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
          States that a function type is const but not volatile qualified. Equivalent
@ -218,19 +181,16 @@
          but involves fewer template instantiations when evaluated.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.volatile_non_const"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_non_const" title="volatile_non_const">
-        volatile_non_const</a>
+<a name="boost_functiontypes.reference.tag_types.volatile_non_const"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_non_const" title="volatile_non_const">volatile_non_const</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">volatile_non_const</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">volatile_non_const</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
          States that a function type is volatile but not const qualified. Equivalent
@ -238,19 +198,16 @@
          but involves fewer template instantiations when evaluated.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.cv_qualfied"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.cv_qualfied" title="cv_qualfied">
-        cv_qualfied</a>
+<a name="boost_functiontypes.reference.tag_types.cv_qualfied"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.cv_qualfied" title="cv_qualfied">cv_qualfied</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">cv_qualified</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">cv_qualified</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
          States that a function type is both const and volatile qualified. Equivalent
@ -258,50 +215,45 @@
          but involves fewer template instantiations when evaluated.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.null_tag"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">
-        null_tag</a>
+<a name="boost_functiontypes.reference.tag_types.null_tag"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">null_tag</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">null_tag</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
          States nothing.
        </p>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.tag"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.tag" title="tag"> tag</a>
+<a name="boost_functiontypes.reference.tag_types.tag"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.tag" title="tag">tag</a>
 </h4></div></div></div>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Tag1</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Tag2</span><span class="special">,</span> 
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Tag1</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Tag2</span><span class="special">,</span> 
    <span class="keyword">class</span> <span class="identifier">Tag3</span> <span class="special">=</span> <span class="identifier">null_tag</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Tag4</span> <span class="special">=</span> <span class="identifier">null_tag</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">tag</span><span class="special">;</span>
 </pre>
 <p>
          <span class="bold"><strong>Header</strong></span>
        </p>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">function_types</span><span class="special">/</span><span class="identifier">property_tags</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="variablelist">
 <p class="title"><b></b></p>
 <dl>
 <dt><span class="term"><code class="literal">Tag<span class="emphasis"><em>N</em></span></code></span></dt>
 <dd><p>
-              Property tag
-            </p></dd>
+                Property tag
+              </p></dd>
 <dt><span class="term"><code class="literal">tag&lt;Tag1,Tag2...&gt;</code></span></dt>
 <dd><p>
-              Compound property tag
-            </p></dd>
+                Compound property tag
+              </p></dd>
 </dl>
 </div>
 <p>
@ -312,7 +264,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright <EFBFBD> 2004 -2007 Tobias Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
+      Schwinger<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>
@ -320,7 +273,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="synthesis.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="macros.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="synthesis.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="macros.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/html/boost_functiontypes/use_cases.html
+++ b/doc/html/boost_functiontypes/use_cases.html
@ -1,11 +1,11 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Use Cases</title>
-<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
-<link rel="up" href="../index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
+<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="prev" href="introduction.html" title="Introduction">
 <link rel="next" href="about_tag_types.html" title="About Tag Types">
 </head>
@ -13,18 +13,18 @@
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
 <td align="center"><a href="../../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../../libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
-<td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
+<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
 <td align="center"><a href="../../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="introduction.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="about_tag_types.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="introduction.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="about_tag_types.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functiontypes.use_cases"></a><a class="link" href="use_cases.html" title="Use Cases"> Use Cases</a>
+<a name="boost_functiontypes.use_cases"></a><a class="link" href="use_cases.html" title="Use Cases">Use Cases</a>
 </h2></div></div></div>
 <p>
      Generic libraries that accept callable arguments are common in C++. Accepting
@ -36,8 +36,7 @@
      a calling convention with each function's type to allow calls across language
      or (sub-)system boundaries.
    </p>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">R</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">R</span><span class="special">&gt;</span>
 <span class="keyword">void</span> <span class="identifier">accept_function</span><span class="special">(</span><span class="identifier">R</span><span class="special">(*</span> <span class="identifier">func</span><span class="special">)());</span>

 <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">R</span><span class="special">&gt;</span>
@ -90,8 +89,7 @@
      Using Boost.FunctionTypes it is possible to write a single function template
      instead:
    </p>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
 <span class="keyword">void</span> <span class="identifier">accept_function</span><span class="special">(</span><span class="identifier">F</span> <span class="identifier">f</span><span class="special">)</span>
 <span class="special">{</span>
  <span class="comment">// ... use Boost.FunctionTypes to analyse F
@ -110,8 +108,7 @@
      in. The code below shows three examples for choosing the <code class="literal">float(float)</code>
      overload of <code class="literal">std::abs</code>.
    </p>
-<pre class="programlisting">
-<span class="keyword">float</span> <span class="special">(*</span><span class="identifier">ptr_absf</span><span class="special">)(</span><span class="keyword">float</span><span class="special">)</span> <span class="special">=</span> <span class="special">&amp;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">abs</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">float</span> <span class="special">(*</span><span class="identifier">ptr_absf</span><span class="special">)(</span><span class="keyword">float</span><span class="special">)</span> <span class="special">=</span> <span class="special">&amp;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">abs</span><span class="special">;</span>


 <span class="keyword">void</span> <span class="identifier">foo</span><span class="special">(</span><span class="keyword">float</span><span class="special">(*</span><span class="identifier">func</span><span class="special">)(</span><span class="keyword">float</span><span class="special">));</span>
@ -129,8 +126,7 @@
      selection and instantiation of function templates. Given an overloaded function
      template
    </p>
-<pre class="programlisting">
-<span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">R</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">&gt;</span>
+<pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">R</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">&gt;</span>
 <span class="identifier">R</span> <span class="identifier">overloaded</span><span class="special">(</span><span class="identifier">T0</span><span class="special">);</span>

 <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">R</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">&gt;</span>
@ -143,8 +139,7 @@
      we can pick any of the three overloads and instantiate the template with template
      arguments from a type sequence in a single expression:
    </p>
-<pre class="programlisting">
-<span class="keyword">static_cast</span><span class="special">&lt;</span><a class="link" href="reference/synthesis.html#boost_functiontypes.reference.synthesis.function_pointer" title="function_pointer">function_pointer</a><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;(&amp;</span> <span class="identifier">overloaded</span><span class="special">)</span>
+<pre class="programlisting"><span class="keyword">static_cast</span><span class="special">&lt;</span><a class="link" href="reference/synthesis.html#boost_functiontypes.reference.synthesis.function_pointer" title="function_pointer">function_pointer</a><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;(&amp;</span> <span class="identifier">overloaded</span><span class="special">)</span>
 </pre>
 <p>
      This technique can be occasionally more flexible than template argument deduction
@ -165,7 +160,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright <EFBFBD> 2004 -2007 Tobias Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
+      Schwinger<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>
@ -173,7 +169,7 @@
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="introduction.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="about_tag_types.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="introduction.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="about_tag_types.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/html/index.html
+++ b/doc/html/index.html
@ -1,33 +1,34 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5</title>
-<link rel="stylesheet" href="../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="index.html" title="Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Chapter&#160;1.&#160;Boost.FunctionTypes 2.5</title>
+<link rel="stylesheet" href="../../../../doc/src/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="next" href="boost_functiontypes/introduction.html" title="Introduction">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../boost.png"></td>
 <td align="center"><a href="../../../../index.html">Home</a></td>
-<td align="center"><a href="../../../libraries.htm">Libraries</a></td>
-<td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
-<td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
+<td align="center"><a href="../../../../libs/libraries.htm">Libraries</a></td>
+<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
+<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
 <td align="center"><a href="../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
-<div class="spirit-nav"><a accesskey="n" href="boost_functiontypes/introduction.html"><img src="../../../../doc/html/images/next.png" alt="Next"></a></div>
-<div class="chapter" lang="en">
+<div class="spirit-nav"><a accesskey="n" href="boost_functiontypes/introduction.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a></div>
+<div class="chapter">
 <div class="titlepage"><div>
 <div><h2 class="title">
-<a name="boost_functiontypes"></a>Chapter<EFBFBD>1.<2E>Boost.FunctionTypes 2.5</h2></div>
+<a name="boost_functiontypes"></a>Chapter&#160;1.&#160;Boost.FunctionTypes 2.5</h2></div>
 <div><div class="author"><h3 class="author">
 <span class="firstname">Tobias</span> <span class="surname">Schwinger</span>
 </h3></div></div>
-<div><p class="copyright">Copyright <EFBFBD> 2004 -2007 Tobias Schwinger</p></div>
+<div><p class="copyright">Copyright &#169; 2004-2007 Tobias
+      Schwinger</p></div>
 <div><div class="legalnotice">
-<a name="id2626484"></a><p>
+<a name="id768638"></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>
@ -36,20 +37,20 @@
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>
-<dt><span class="section"><a href="boost_functiontypes/introduction.html"> Introduction</a></span></dt>
-<dt><span class="section"><a href="boost_functiontypes/use_cases.html"> Use Cases</a></span></dt>
-<dt><span class="section"><a href="boost_functiontypes/about_tag_types.html"> About Tag Types</a></span></dt>
-<dt><span class="section"><a href="boost_functiontypes/reference.html"> Reference</a></span></dt>
-<dt><span class="section"><a href="boost_functiontypes/rationale.html"> Rationale</a></span></dt>
-<dt><span class="section"><a href="boost_functiontypes/acknowledgements.html"> Acknowledgements</a></span></dt>
+<dt><span class="section"><a href="boost_functiontypes/introduction.html">Introduction</a></span></dt>
+<dt><span class="section"><a href="boost_functiontypes/use_cases.html">Use Cases</a></span></dt>
+<dt><span class="section"><a href="boost_functiontypes/about_tag_types.html">About Tag Types</a></span></dt>
+<dt><span class="section"><a href="boost_functiontypes/reference.html">Reference</a></span></dt>
+<dt><span class="section"><a href="boost_functiontypes/rationale.html">Rationale</a></span></dt>
+<dt><span class="section"><a href="boost_functiontypes/acknowledgements.html">Acknowledgements</a></span></dt>
 </dl>
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: March 14, 2008 at 18:36:46 +0000</small></p></td>
+<td align="left"><p><small>Last revised: April 09, 2008 at 18:26:31 +0100</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
-<div class="spirit-nav"><a accesskey="n" href="boost_functiontypes/introduction.html"><img src="../../../../doc/html/images/next.png" alt="Next"></a></div>
+<div class="spirit-nav"><a accesskey="n" href="boost_functiontypes/introduction.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a></div>
 </body>
 </html>
--- a/example/fast_mem_fn.hpp
+++ b/example/fast_mem_fn.hpp
@ -62,7 +62,7 @@
 // ============
 //
 // [Dimov1] Dimov, P., Hinnant H., Abrahams, D. The Forwarding Problem
-//          http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1385.htm
+//          http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm
 //
 // [Dimov2] Dimov, P. Documentation of boost::mem_fn
 //          http://www.boost.org/libs/bind/mem_fn.html
--- a/example/result_of.hpp
+++ b/example/result_of.hpp
@ -26,7 +26,7 @@
 //
 // [Gregor02] Gregor, D. A uniform method for computing function object return
 //            types (revision 1)
-//            http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1454.html
+//            http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2003/n1454.html

 #include <boost/function_types/result_type.hpp>
 #include <boost/function_types/is_callable_builtin.hpp>
@ -57,7 +57,7 @@ namespace example
      typedef typename F::template result<Desc>::type type;
    };

-#if !BOOST_WORKAROUND(__BORLANDC__,BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC,BOOST_TESTED_AT(0x564))
    template<typename F> 
    struct result_member_template< F, F(void) > 
    { 
--- a/include/boost/function_types/components.hpp
+++ b/include/boost/function_types/components.hpp
@ -15,7 +15,6 @@

 #include <boost/detail/workaround.hpp>
 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/type_traits/integral_constant.hpp>

@ -23,7 +22,7 @@
 #include <boost/mpl/integral_c.hpp>
 #include <boost/mpl/vector/vector0.hpp>

-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x656))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x565)
 #   include <boost/type_traits/remove_cv.hpp>

 #   include <boost/mpl/identity.hpp>
@ -47,7 +46,6 @@

 #include <boost/function_types/config/config.hpp>

-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 #   if   BOOST_FT_MAX_ARITY < 10
 #     include <boost/mpl/vector/vector10.hpp>
 #   elif BOOST_FT_MAX_ARITY < 20
@ -59,9 +57,6 @@
 #   elif BOOST_FT_MAX_ARITY < 50
 #     include <boost/mpl/vector/vector50.hpp>
 #   endif
-#else
-#   include <boost/function_types/detail/classifier.hpp>
-#endif

 #include <boost/function_types/detail/class_transform.hpp>
 #include <boost/function_types/property_tags.hpp>
@ -81,14 +76,14 @@ namespace boost
    namespace detail 
    {
      template<typename T, typename L> struct components_impl;
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x565))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x565)
      template<typename T, typename OrigT, typename L> struct components_bcc;
 #endif
    }

    template<typename T, typename ClassTypeTransform> 
    struct components
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x565))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x565)
      : detail::components_impl<T, ClassTypeTransform>
 #else
      : detail::components_bcc<typename remove_cv<T>::type,T,
@ -260,7 +255,7 @@ namespace boost
          typename detail::class_transform<C,L>::type > types;
    };

-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x565))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x565)
 #   define BOOST_FT_variations BOOST_FT_pointer|BOOST_FT_member_pointer

    template<typename T, class C, typename L>
@ -420,8 +415,6 @@ namespace boost

  } } // namespace function_types::detail

-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::components)
-
 } // namespace ::boost

 #include <boost/function_types/detail/components_as_mpl_sequence.hpp>
--- a/include/boost/function_types/config/compiler.hpp
+++ b/include/boost/function_types/config/compiler.hpp
@ -91,11 +91,11 @@
 #     define __fastcall __attribute__((__fastcall__))
 #   endif

-#elif defined(__BORLANDC__)
+#elif defined(BOOST_BORLANDC)

-#   if __BORLANDC__ < 0x550
+#   if BOOST_BORLANDC < 0x550
 #     error "unsupported compiler version"
-#   elif __BORLANDC__ > 0x565
+#   elif BOOST_BORLANDC > 0x565
 #     pragma message("WARNING: library untested with this compiler version")
 #   endif

--- a/include/boost/function_types/detail/class_transform.hpp
+++ b/include/boost/function_types/detail/class_transform.hpp
@ -28,7 +28,6 @@ struct class_transform
 { typedef typename mpl::apply1<L,T>::type type; };


-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 // We can short-circuit the mechanism implemented in the primary template for 
 // the most common lambda expression and save both the "un-lambdaing" and the
 // type traits invocation (we know that T can only be a class type).
@ -53,7 +52,6 @@ template<typename T> struct class_transform< T, add_pointer< remove_cv<_> > >

 template<typename T, typename U> struct class_transform< T, mpl::always<U> >
 { typedef U type; };
-#endif


 } } } // namespace ::boost::function_types::detail
--- a/include/boost/function_types/detail/classifier.hpp
+++ b/include/boost/function_types/detail/classifier.hpp
@ -11,7 +11,6 @@

 #include <boost/type.hpp>
 #include <boost/config.hpp>
-#include <boost/type_traits/config.hpp>
 #include <boost/type_traits/is_reference.hpp>
 #include <boost/type_traits/add_reference.hpp>

@ -31,7 +30,13 @@ template<bits_t Flags, bits_t CCID, std::size_t Arity> struct encode_charr
  >::type type;
 };

-char BOOST_TT_DECL classifier_impl(...);
+#if defined(BOOST_MSVC) || (defined(BOOST_BORLANDC) && !defined(BOOST_DISABLE_WIN32))
+#   define BOOST_FT_DECL __cdecl
+#else
+#   define BOOST_FT_DECL /**/
+#endif
+
+char BOOST_FT_DECL classifier_impl(...);

 #define BOOST_FT_variations BOOST_FT_function|BOOST_FT_pointer|\
                            BOOST_FT_member_pointer
--- a/include/boost/function_types/detail/cv_traits.hpp
+++ b/include/boost/function_types/detail/cv_traits.hpp
@ -12,8 +12,7 @@
 #include <cstddef>
 #include <boost/detail/workaround.hpp>

-#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
-    || BOOST_WORKAROUND(__BORLANDC__, <= 0x582)
+#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x582)
 #   include <boost/type_traits/remove_cv.hpp>
 #   include <boost/type_traits/remove_pointer.hpp>
 #   include <boost/type_traits/remove_reference.hpp>
@ -23,8 +22,7 @@

 namespace boost { namespace function_types { namespace detail {

-#if ! (defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
-    || BOOST_WORKAROUND(__BORLANDC__, <= 0x582))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x582)

 template<typename T> struct cv_traits 
 { typedef non_cv tag; typedef T type; };
--- a/include/boost/function_types/detail/to_sequence.hpp
+++ b/include/boost/function_types/detail/to_sequence.hpp
@ -32,14 +32,12 @@ struct to_sequence
  type;
 };

-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 // reduce template instantiations, if possible
 template<typename T, typename U>
 struct to_sequence< components<T,U> > 
 {
  typedef typename components<T,U>::types type;
 };
-#endif

 } } } // namespace ::boost::function_types::detail

--- a/include/boost/function_types/function_arity.hpp
+++ b/include/boost/function_types/function_arity.hpp
@ -13,7 +13,6 @@
 #include <boost/mpl/if.hpp>

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/is_callable_builtin.hpp>
 #include <boost/function_types/components.hpp>
@ -31,7 +30,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(1,function_arity,(T)) 
    };
  }
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,function_types::function_arity)
 }

 #endif
--- a/include/boost/function_types/function_pointer.hpp
+++ b/include/boost/function_types/function_pointer.hpp
@ -10,7 +10,6 @@
 #define BOOST_FT_FUNCTION_POINTER_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/function_type.hpp>

@ -25,7 +24,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,function_pointer,(Types,Tag))
    };
  } 
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::function_pointer)
 } 

 #endif
--- a/include/boost/function_types/function_reference.hpp
+++ b/include/boost/function_types/function_reference.hpp
@ -10,7 +10,6 @@
 #define BOOST_FT_FUNCTION_REFERENCE_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/function_type.hpp>

@ -25,7 +24,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,function_reference,(Types,Tag))
    };
  } 
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::function_reference)
 } 

 #endif
--- a/include/boost/function_types/function_type.hpp
+++ b/include/boost/function_types/function_type.hpp
@ -22,7 +22,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,function_type,(Types,Tag))
    };
  }
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::function_type)
 }

 #endif
--- a/include/boost/function_types/is_callable_builtin.hpp
+++ b/include/boost/function_types/is_callable_builtin.hpp
@ -10,7 +10,6 @@
 #define BOOST_FT_IS_CALLABLE_BUILTIN_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -28,7 +27,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_callable_builtin,(T,Tag))
    };
  }
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_callable_builtin)
 }

 #endif
--- a/include/boost/function_types/is_function.hpp
+++ b/include/boost/function_types/is_function.hpp
@ -9,7 +9,6 @@
 #define BOOST_FT_IS_FUNCTION_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -27,7 +26,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_function,(T,Tag))
    };
  }
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_function)
 } 

 #endif
--- a/include/boost/function_types/is_function_pointer.hpp
+++ b/include/boost/function_types/is_function_pointer.hpp
@ -10,7 +10,6 @@
 #define BOOST_FT_IS_FUNCTION_POINTER_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -28,7 +27,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_function_pointer,(T,Tag))
    };
  }
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_function_pointer)
 }

 #endif
--- a/include/boost/function_types/is_function_reference.hpp
+++ b/include/boost/function_types/is_function_reference.hpp
@ -10,7 +10,6 @@
 #define BOOST_FT_IS_FUNCTION_REFERENCE_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -27,7 +26,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_function_reference,(T,Tag))
    };
  }
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_function_reference)
 } 

 #endif
--- a/include/boost/function_types/is_member_function_pointer.hpp
+++ b/include/boost/function_types/is_member_function_pointer.hpp
@ -10,7 +10,6 @@
 #define BOOST_FT_IS_MEMBER_FUNCTION_POINTER_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -27,7 +26,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_member_function_pointer,(T,Tag))
    };
  }
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_member_function_pointer)
 } 
 #endif 

--- a/include/boost/function_types/is_member_object_pointer.hpp
+++ b/include/boost/function_types/is_member_object_pointer.hpp
@ -10,7 +10,6 @@
 #define BOOST_FT_IS_MEMBER_OBJECT_POINTER_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -27,7 +26,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_member_object_pointer,(T))
    };
  }
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,function_types::is_member_object_pointer)
 } 

 #endif 
--- a/include/boost/function_types/is_member_pointer.hpp
+++ b/include/boost/function_types/is_member_pointer.hpp
@ -9,7 +9,6 @@
 #define BOOST_FT_IS_MEMBER_POINTER_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -27,7 +26,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_member_pointer,(T,Tag))
    };
  } 
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_member_pointer)
 } 

 #endif
--- a/include/boost/function_types/is_nonmember_callable_builtin.hpp
+++ b/include/boost/function_types/is_nonmember_callable_builtin.hpp
@ -10,7 +10,6 @@
 #define BOOST_FT_IS_NONMEMBER_CALLABLE_BUILTIN_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -28,7 +27,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_nonmember_callable_builtin,(T,Tag))
    };
  }
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_nonmember_callable_builtin)
 } 

 #endif 
--- a/include/boost/function_types/member_function_pointer.hpp
+++ b/include/boost/function_types/member_function_pointer.hpp
@ -10,7 +10,6 @@
 #define BOOST_FT_MEMBER_FUNCTION_POINTER_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/detail/synthesize.hpp>
 #include <boost/function_types/detail/to_sequence.hpp>
@ -26,7 +25,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,member_function_pointer,(Types,Tag))
    };
  } 
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::member_function_pointer)
 } 

 #endif
--- a/include/boost/function_types/member_object_pointer.hpp
+++ b/include/boost/function_types/member_object_pointer.hpp
@ -10,7 +10,6 @@
 #define BOOST_FT_MEMBER_OBJECT_POINTER_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/detail/synthesize.hpp>
 #include <boost/function_types/detail/to_sequence.hpp>
@ -26,7 +25,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(1,member_object_pointer,(Types))
    };
  } 
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,function_types::member_object_pointer)
 } 

 #endif
--- a/include/boost/function_types/parameter_types.hpp
+++ b/include/boost/function_types/parameter_types.hpp
@ -13,7 +13,6 @@
 #include <boost/mpl/if.hpp>

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/mpl/pop_front.hpp>

@ -48,7 +47,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,parameter_types,(T,ClassTypeTransform)) 
    };
  }
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::parameter_types)
 }

 #endif
--- a/include/boost/function_types/property_tags.hpp
+++ b/include/boost/function_types/property_tags.hpp
@ -12,6 +12,7 @@
 #include <cstddef>

 #include <boost/type_traits/integral_constant.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <boost/mpl/bitxor.hpp>


@ -102,7 +103,6 @@ struct tag
        detail::compound_tag<Tag3,Tag4> >
 { };

-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 template<class Tag1, class Tag2, class Tag3> struct tag<Tag1,Tag2,Tag3,null_tag>
  : detail::compound_tag<detail::compound_tag<Tag1,Tag2>,Tag3>
 { };
@ -112,7 +112,6 @@ template<class Tag1, class Tag2> struct tag<Tag1,Tag2,null_tag,null_tag>
 template<class Tag1> struct tag<Tag1,null_tag,null_tag,null_tag>
  : Tag1
 { };
-#endif


 template<class Tag, class QueryTag> struct represents
@ -136,6 +135,20 @@ template<class Tag, class QueryTag> struct extract
  > mask; 
 };

+/*
+
+  The following is a metafunction which checks whether a
+  property tag is in a possibly compounded tag type.
+  
+  Here both the possibly compounded tag type and a property tag
+  is given.
+  
+*/
+
+template<class Tag, class PropertyTag> struct has_property_tag
+  : detail::represents_impl<Tag,  PropertyTag>
+{ };
+
 } } // namespace ::boost::function_types

 #include <boost/function_types/detail/pp_tags/preprocessed.hpp>
@ -143,6 +156,43 @@ template<class Tag, class QueryTag> struct extract
 namespace boost { namespace function_types {
 #define BOOST_FT_cc_file <boost/function_types/detail/pp_tags/cc_tag.hpp>
 #include <boost/function_types/detail/pp_loop.hpp>
+
+/*
+
+  The following are metafunctions which check whether the
+  specific property tag is in a possibly compounded tag type.
+  Here only the possibly compounded tag type is given.
+  
+*/
+
+template<class Tag> struct has_property_tag<Tag,null_tag>
+  : ::boost::is_same<Tag, null_tag>
+{ };
+
+template<class Tag> struct has_variadic_property_tag
+  : has_property_tag<Tag,  variadic>
+{ };
+
+template<class Tag> struct has_default_cc_property_tag
+  : has_property_tag<Tag,  default_cc>
+{ };
+
+template<class Tag> struct has_const_property_tag
+  : has_property_tag<Tag,  const_qualified>
+{ };
+
+template<class Tag> struct has_volatile_property_tag
+  : has_property_tag<Tag,  volatile_qualified>
+{ };
+
+template<class Tag> struct has_cv_property_tag
+  : has_property_tag<Tag,  cv_qualified>
+{ };
+
+template<class Tag> struct has_null_property_tag
+  : has_property_tag<Tag,  null_tag>
+{ };
+
 } } // namespace boost::function_types

 #endif
--- a/include/boost/function_types/result_type.hpp
+++ b/include/boost/function_types/result_type.hpp
@ -13,7 +13,6 @@
 #include <boost/mpl/if.hpp>

 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/mpl/at.hpp>

@ -43,7 +42,6 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(1,result_type,(T)) 
    };
  }
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,function_types::result_type)
 }

 #endif
--- a/meta/libraries.json
+++ b/meta/libraries.json
@ -0,0 +1,16 @@
+{
+    "key": "function_types",
+    "name": "Function Types",
+    "authors": [
+        "Tobias Schwinger"
+    ],
+    "description": "Boost.FunctionTypes provides functionality to classify, decompose and synthesize function, function pointer, function reference and pointer to member types.",
+    "category": [
+        "Generic",
+        "Metaprogramming"
+    ],
+    "maintainers": [
+        "Tobias Schwinger <tschwinger -at- isonews2.com>"
+    ],
+    "cxxstd": "03"
+}
--- a/test/Jamfile
+++ b/test/Jamfile
@ -64,11 +64,15 @@ import testing ;

    # Custom calling conventions

-    [ compile custom_ccs/nonmember_ccs.cpp ]
-    [ compile custom_ccs/nonmember_ccs_exact.cpp ]
-    [ compile custom_ccs/member_ccs.cpp ]
-    [ compile custom_ccs/member_ccs_exact.cpp ]
+    [ compile custom_ccs/nonmember_ccs.cpp : <address-model>64:<build>no ]
+    [ compile custom_ccs/nonmember_ccs_exact.cpp : <address-model>64:<build>no ]
+    [ compile custom_ccs/member_ccs.cpp : <address-model>64:<build>no ]
+    [ compile custom_ccs/member_ccs_exact.cpp : <address-model>64:<build>no ]

+    # Property tag
+    
+    [ compile custom_ccs/property_tag.cpp ]
+    
    # Code from the examples

    [ compile ../example/interpreter_example.cpp ]
--- a/test/custom_ccs/property_tag.cpp
+++ b/test/custom_ccs/property_tag.cpp
@ -0,0 +1,64 @@
+
+//  (C) Copyright Edward Diener 2019
+//  Use, modification and distribution are subject to the Boost Software License,
+//  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt).
+
+//------------------------------------------------------------------------------
+
+#include <boost/mpl/assert.hpp>
+#include <boost/function_types/property_tags.hpp>
+
+namespace ft = boost::function_types;
+namespace mpl = boost::mpl;
+
+typedef ft::tag<ft::variadic,ft::non_volatile,ft::non_const,ft::default_cc> tag1;
+typedef ft::tag<ft::const_non_volatile,ft::const_qualified> tag2;
+typedef ft::tag<ft::cv_qualified,ft::variadic> tag3;
+typedef ft::null_tag tag4;
+typedef ft::tag<ft::variadic,ft::volatile_non_const> tag5;
+typedef ft::tag<ft::volatile_qualified,ft::non_const,ft::variadic> tag6;
+typedef ft::tag<ft::non_variadic,ft::const_non_volatile,ft::default_cc> tag7;
+typedef ft::tag<ft::non_cv,ft::default_cc> tag8;
+    
+BOOST_MPL_ASSERT((ft::has_property_tag<tag1, ft::variadic>));
+BOOST_MPL_ASSERT((ft::has_property_tag<tag2, ft::const_qualified>));
+BOOST_MPL_ASSERT((ft::has_property_tag<tag3, ft::cv_qualified>));
+BOOST_MPL_ASSERT((ft::has_property_tag<tag4, ft::null_tag>));
+BOOST_MPL_ASSERT((ft::has_property_tag<tag5, ft::volatile_qualified>));
+BOOST_MPL_ASSERT((ft::has_property_tag<tag6, ft::volatile_qualified>));
+BOOST_MPL_ASSERT((ft::has_property_tag<tag7, ft::const_qualified>));
+BOOST_MPL_ASSERT((ft::has_property_tag<tag8, ft::default_cc>));
+
+BOOST_MPL_ASSERT((ft::has_variadic_property_tag<tag1>));
+BOOST_MPL_ASSERT((ft::has_variadic_property_tag<tag3>));
+BOOST_MPL_ASSERT((ft::has_variadic_property_tag<tag5>));
+BOOST_MPL_ASSERT((ft::has_variadic_property_tag<tag6>));
+BOOST_MPL_ASSERT((ft::has_default_cc_property_tag<tag1>));
+BOOST_MPL_ASSERT((ft::has_default_cc_property_tag<tag7>));
+BOOST_MPL_ASSERT((ft::has_default_cc_property_tag<tag8>));
+BOOST_MPL_ASSERT((ft::has_const_property_tag<tag2>));
+BOOST_MPL_ASSERT((ft::has_const_property_tag<tag3>));
+BOOST_MPL_ASSERT((ft::has_const_property_tag<tag7>));
+BOOST_MPL_ASSERT((ft::has_volatile_property_tag<tag3>));
+BOOST_MPL_ASSERT((ft::has_volatile_property_tag<tag5>));
+BOOST_MPL_ASSERT((ft::has_volatile_property_tag<tag6>));
+BOOST_MPL_ASSERT((ft::has_cv_property_tag<tag3>));
+BOOST_MPL_ASSERT((ft::has_null_property_tag<tag4>));
+
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag1, ft::const_qualified>));
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag2, ft::cv_qualified>));
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag3, ft::null_tag>));
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag4, ft::volatile_qualified>));
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag5, ft::const_qualified>));
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag6, ft::default_cc>));
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag7, ft::variadic>));
+BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag8, ft::volatile_qualified>));
+
+BOOST_MPL_ASSERT_NOT((ft::has_variadic_property_tag<tag2>));
+BOOST_MPL_ASSERT_NOT((ft::has_default_cc_property_tag<tag6>));
+BOOST_MPL_ASSERT_NOT((ft::has_const_property_tag<tag4>));
+BOOST_MPL_ASSERT_NOT((ft::has_const_property_tag<tag5>));
+BOOST_MPL_ASSERT_NOT((ft::has_volatile_property_tag<tag7>));
+BOOST_MPL_ASSERT_NOT((ft::has_cv_property_tag<tag1>));
+BOOST_MPL_ASSERT_NOT((ft::has_null_property_tag<tag8>));
--- a/test/decomposition/result_type.cpp
+++ b/test/decomposition/result_type.cpp
@ -16,12 +16,19 @@ namespace ft = boost::function_types;

 class C; 
 typedef C func();
+typedef C const c_func();
 typedef C (*func_ptr)();
+typedef C const (*c_func_ptr)();
 typedef C (&func_ref)();
+typedef C const (&c_func_ref)();
 typedef C (C::*mem_func_ptr)();
-typedef C (C::*c_mem_func_ptr)() const;
-typedef C (C::*v_mem_func_ptr)() volatile;
-typedef C (C::*cv_mem_func_ptr)() const volatile;
+typedef C const (C::*c_mem_func_ptr)();
+typedef C (C::*mem_func_ptr_c)() const;
+typedef C const (C::*c_mem_func_ptr_c)() const;
+typedef C (C::*mem_func_ptr_v)() volatile;
+typedef C const (C::*c_mem_func_ptr_v)() volatile;
+typedef C (C::*mem_func_ptr_cv)() const volatile;
+typedef C const (C::*c_mem_func_ptr_cv)() const volatile;
 typedef int C::* mem_ptr;
 typedef int const C::* c_mem_ptr;

@ -29,28 +36,56 @@ BOOST_MPL_ASSERT((
  boost::is_same<ft::result_type<func>::type,C>
 ));

+BOOST_MPL_ASSERT((
+  boost::is_same<ft::result_type<c_func>::type,C const>
+));
+
 BOOST_MPL_ASSERT((
  boost::is_same<ft::result_type<func_ptr>::type,C>
 ));

+BOOST_MPL_ASSERT((
+  boost::is_same<ft::result_type<c_func_ptr>::type,C const>
+));
+
 BOOST_MPL_ASSERT((
  boost::is_same<ft::result_type<func_ref>::type,C>
 ));

+BOOST_MPL_ASSERT((
+  boost::is_same<ft::result_type<c_func_ref>::type,C const>
+));
+
 BOOST_MPL_ASSERT((
  boost::is_same<ft::result_type<mem_func_ptr>::type,C>
 ));

 BOOST_MPL_ASSERT((
-  boost::is_same<ft::result_type<c_mem_func_ptr>::type,C>
+  boost::is_same<ft::result_type<c_mem_func_ptr>::type,C const>
 ));

 BOOST_MPL_ASSERT((
-  boost::is_same<ft::result_type<v_mem_func_ptr>::type,C>
+  boost::is_same<ft::result_type<mem_func_ptr_c>::type,C>
 ));

 BOOST_MPL_ASSERT((
-  boost::is_same<ft::result_type<cv_mem_func_ptr>::type,C>
+  boost::is_same<ft::result_type<c_mem_func_ptr_c>::type,C const>
+));
+
+BOOST_MPL_ASSERT((
+  boost::is_same<ft::result_type<mem_func_ptr_v>::type,C>
+));
+
+BOOST_MPL_ASSERT((
+  boost::is_same<ft::result_type<c_mem_func_ptr_v>::type,C const>
+));
+
+BOOST_MPL_ASSERT((
+  boost::is_same<ft::result_type<mem_func_ptr_cv>::type,C>
+));
+
+BOOST_MPL_ASSERT((
+  boost::is_same<ft::result_type<c_mem_func_ptr_cv>::type,C const>
 ));

 BOOST_MPL_ASSERT((
Author	SHA1	Message	Date
Peter Dimov	895335874d	Update CMakeLists.txt	2021-06-10 01:02:01 +03:00
Edward Diener	f285a08088	Add "cxxstd" json field. The "cxxstd" json field is being added to each Boost library's meta json information for libraries whose minumum C++ standard compilation level is C++11 on up. The value of this field matches one of the values for 'cxxstd' in Boost.Build. The purpose of doing this is to provide information for the Boost website documentation for each library which will specify the minimum C++ standard compilation that an end-user must employ in order to use the particular library. This will aid end-users who want to know if they can successfully use a Boost library based on their C++ compiler's compilation level, without having to search the library's documentation to find this out.	2021-01-11 11:26:46 -05:00
Edward Diener	9dc87ec137	VC++ 10 and VC++ 11 are only supported for 32 bits in Appveyor	2020-11-24 16:00:31 -05:00
Edward Diener	95997705ed	Merge pull request #10 from eldiener/develop Changes for Embarcadero C++ clang-based compilers, targeting Boost 1.74. Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost conf…	2020-04-17 11:09:22 -04:00
Edward Diener	72ccfa3b96	Updated Appveyor configuration	2020-04-17 09:51:46 -04:00
Edward Diener	867588b91e	Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost config for the Embarcadero non-clang-based compilers.	2020-03-30 16:55:12 -04:00
Edward Diener	0f29b01478	Merge pull request #9 from eldiener/develop Added metafunction for testing a property tag	2020-01-25 03:03:31 -05:00
Edward Diener	fa90de2a36	Added documentation for the new metafunctions has_property_tag and its individual equivalents.	2020-01-18 11:40:22 -05:00
Edward Diener	669f083f33	Added functionality and tests that allow a possibly compound property tag to be queried to see if a given property tag is in it. This is useful if the end-user needs to know if, let's say, a const property has been set in the property tag. Since a property tag may be a compound property tag consisting of more than one property tag it is not possible to determine such a thing by just using boost::is_same to see if the two are equal.	2020-01-18 03:35:19 -05:00
Glen Fernandes	920574cb75	Merge pull request #8 from Mike-Devel/min_cmake [CMake] Add minimal cmake support	2019-03-04 16:47:14 -05:00
Mike-Devel	c448940ca6	[CMake] Remove dot from project name	2019-03-04 22:43:37 +01:00
Mike Dev	79620e3e60	[CMake] Add minimal cmake support - CMake file only supports add_subdirectory workflow. - Provides Boost::function_types target, but no installation and no unit tests.	2019-02-14 18:56:56 +01:00
Edward Diener	5f41eff589	Updated for b2 cmake support.	2018-12-19 22:17:18 -05:00
eldiener	ae4fde2e2a	Removed --depth 1	2017-10-29 21:41:25 -04:00
Edward Diener	4f247c06e4	Merge pull request #6 from boostorg/pr/depinst-include-example Add `-I example` to depinst invocation	2017-10-25 22:03:25 -04:00
Peter Dimov	78dabb2dd8	Add `-I example` to depinst invocation	2017-10-26 01:13:09 +03:00
Edward Diener	f542321082	Remove comments in appveyor and travis files.	2017-10-14 19:54:13 -04:00
Edward Diener	842b853351	Use boostdep to find dependencies in the example subdirectory.	2017-10-14 18:57:40 -04:00
Edward Diener	b7e56e1c35	More appveyor/travis dependencies.	2017-10-14 12:14:09 -04:00
Edward Diener	9699db7e6c	Added concept_check as a travis/appveyor dependency.	2017-10-14 11:16:57 -04:00
Edward Diener	4c250985a1	Merge branch 'develop' of https://github.com/boostorg/function_types into develop # Conflicts: # .travis.yml # appveyor.yml	2017-10-14 10:47:02 -04:00
Edward Diener	ed059784b9	Corrected numeric_conversion to numeric/conversion	2017-10-14 10:44:50 -04:00
Edward Diener	1e434eff75	Added more travis/appveyor dependencies.	2017-10-14 07:09:03 -04:00
Edward Diener	27aeab935b	Add timer and iterator dependencies for examples.	2017-10-13 22:10:49 -04:00
Edward Diener	fd39273e0d	Add tokenizer library manually since it is used when testing the examples.	2017-10-13 19:31:13 -04:00
Edward Diener	b3e185a544	Disable custom calling conventions test for 64-bit address model.	2017-10-13 16:14:25 -04:00
Edward Diener	85cf2ccd77	Better appveyor file setup.	2017-10-09 12:06:15 -04:00
Edward Diener	d81450d8ca	Added Appveyor file and Travis CI file.	2017-10-09 08:13:29 -04:00
Edward Diener	915d444667	Merge branch 'master' into develop	2017-04-24 12:20:28 -04:00
Rene Rivera	77dffdafff	Add, and update, documentation build targets.	2016-10-10 11:39:49 -05:00
Rene Rivera	e74cb4aa4a	Add, and update, documentation build targets.	2016-10-07 23:07:34 -05:00
Edward Diener	22c5c2ae4f	Merge branch 'develop'	2015-07-18 20:29:36 -04:00
Edward Diener	290a8e88e7	Merge pull request #4 from jzmaddock/patch-1 Stop Using type_traits details.	2015-05-21 15:16:28 -04:00
jzmaddock	26e800a52f	Stop Using type_traits details. Some of the type_traits internal details this header depends on will either go away or be moved. Either way, best not to rely on another libraries internal details. In the short term the old code will work but will generate a ton of warnings about using a deprecated header.	2015-05-21 19:08:40 +01:00
Edward Diener	fa1a0fec9c	Merge pull request #3 from eldiener/develop Remove reliance on deprecated type_traits headers.	2015-05-18 11:47:36 -04:00
Edward Diener	0c7bebd130	Remove reliance on deprecated type_traits headers.	2015-04-27 09:27:33 -04:00
Peter Dimov	f99be38d89	Merge branch 'develop'	2015-01-25 21:37:39 +02:00
Peter Dimov	c86381fb4c	Merge pull request #1 from danieljames/metadata Create metadata file.	2015-01-25 20:35:09 +02:00
Daniel James	222884c4f7	Add metadata file.	2014-08-18 14:59:16 +01:00
Daniel James	8af990ab6f	Create merge base for git.	2014-06-02 09:43:17 +01:00
Michel Morin	3ec0754b4f	Merge r86524 (Correct broken links to C++ standard papers); fixes #9212 [SVN r86673]	2013-11-13 03:22:55 +00:00
Michel Morin	caed0a6ee8	Correct broken links to C++ standard papers. Refs #9212 . [SVN r86524]	2013-10-30 12:51:24 +00:00
Stephen Kelly	2cc2141906	Fix workaround ifdef. [SVN r86280]	2013-10-13 08:15:49 +00:00
Stephen Kelly	46f56ef9ae	Remove remaining occurances of BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION These evaded scripting. [SVN r86249]	2013-10-11 23:22:36 +00:00
Stephen Kelly	e7fcc6818b	Remove BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION Process #ifndef...#else...#endif blocks. [SVN r86245]	2013-10-11 23:17:48 +00:00
Stephen Kelly	38cc207b23	Remove BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION Process #ifndef...#endif conditions. [SVN r86244]	2013-10-11 23:15:00 +00:00
Daniel James	1f2bc4d8d3	Function types: Merge from trunk. - [49980] adds tests with const result - [53619] Cleanup function_types Jamfile. Fixes #1653 (maybe). - [62827] Update Borland workarounds. Fixes #3162. - [70856] Rebuild documentation [SVN r70861]	2011-04-02 17:20:34 +00:00
Daniel James	1f51d9ba29	Function types: rebuild documentation. [SVN r70856]	2011-04-02 14:41:07 +00:00
Daniel James	7e239167da	Merge documentation update. [SVN r63517]	2010-07-02 08:27:42 +00:00
Daniel James	c73823068f	Rebuild function_types documentation. [SVN r63505]	2010-07-01 22:12:30 +00:00
Daniel James	a7f9fa0eda	Merge documentation fixes. * Use `doc/src/.css` instead of `doc/html/.css`. * Remove wiki and people directories. * Some documentation fixes. * Left out `minimal.css` changes and boostbook changes because of clashes. [SVN r63347]	2010-06-26 12:30:09 +00:00
Daniel James	6778206732	Update various libraries' documentation build. Mostly to use the images and css files under doc/src instead of doc/html, usually be deleting the settings in order to use the defaults. Also add 'boost.root' to some builds in order to fix links which rely on it. [SVN r63146]	2010-06-20 18:00:48 +00:00
Steven Watanabe	a05ddf58ef	Update Borland workarounds. Fixes #3162 [SVN r62827]	2010-06-12 00:28:54 +00:00
Troy D. Straszheim	e39914bddd	Undo r56305 [SVN r58129]	2009-12-03 22:20:47 +00:00
Daniel James	4e48421f9d	Merge [41554] Using central stylesheet now. [SVN r57811]	2009-11-20 10:17:49 +00:00
Daniel James	5f0d9dd0a8	Merge [44130],[44131] fix a typo in libs/function_types. [SVN r57810]	2009-11-20 10:13:51 +00:00
Troy D. Straszheim	64776ee43c	rm cmake from trunk. I'm not entirely sure this is necessary to satisfy the inspect script, but I'm not taking any chances, and it is easy to put back [SVN r56942]	2009-10-17 02:07:38 +00:00
Troy D. Straszheim	6ba2a45f5f	rm cmake from the release branch before it goes out broken. Policy dictates that you never commit to release, you commit to trunk and merge to release. [SVN r56941]	2009-10-17 01:10:45 +00:00
Stefan Seefeld	d3b53cbdf8	Merged 2009 GSoC work from sandbox-branches/bhy/py3k branch back into trunk. [SVN r56305]	2009-09-19 02:32:41 +00:00
Andrey Semashev	91f47b7bc6	Merged patchset 44631 from trunk. Resolves parenthesis warnings on GCC 4.3. Fixes #2321 . [SVN r55872]	2009-08-30 10:23:32 +00:00
Troy D. Straszheim	0bf0587f58	Copyrights on CMakeLists.txt to keep them from clogging up the inspect reports. This is essentially the same commit as r55095 on the release branch. [SVN r55159]	2009-07-26 00:49:56 +00:00
Troy D. Straszheim	f451e18ef2	Add basic copyright/license to keep cmake out of the inspection report [SVN r55095]	2009-07-22 21:51:01 +00:00
Vladimir Prus	1b4fdee6ff	Cleanup function_types Jamfile. Make it directly depends on Wave target. Simplify naming of targets. Addresses #1653 [SVN r53619]	2009-06-04 09:36:17 +00:00
Troy D. Straszheim	cde937faaa	merge of cmake build files from trunk per beman [SVN r50756]	2009-01-24 18:57:20 +00:00
Tobias Schwinger	b7da1bd1ab	adds tests with const result [SVN r49980]	2008-11-28 11:38:38 +00:00
Michael A. Jackson	8554f430fe	Updating dependency information for modularized libraries. [SVN r49628]	2008-11-07 17:05:27 +00:00
Michael A. Jackson	ee8ed76bc5	Updating CMake files to latest trunk. Added dependency information for regression tests and a few new macros for internal use. [SVN r49627]	2008-11-07 17:02:56 +00:00
Michael A. Jackson	e60e1b82aa	Continuing merge of CMake build system files into trunk with the encouragement of Doug Gregor [SVN r49510]	2008-11-01 13:15:41 +00:00
Tobias Schwinger	6f100429eb	stages trunk version for boost 1.35 [SVN r43684]	2008-03-17 21:42:41 +00:00
Daniel James	51aca6c98c	Rebuild a lot of documentation. [SVN r43650]	2008-03-16 11:38:32 +00:00
Beman Dawes	291304b704	Full merge from trunk at revision 41356 of entire boost-root tree. [SVN r41370]	2007-11-25 18:38:02 +00:00
Beman Dawes	e04f655cc7	Full merge from trunk at revision 41356 of entire boost-root tree. [SVN r41369]	2007-11-25 18:07:19 +00:00