Use root links in quickbook.

[SVN r45364]
Update 'more' links.
2026-01-19 16:32:16 +00:00 · 2008-05-14 20:38:29 +00:00 · 2008-05-01 21:34:42 +00:00 · 2008-04-19 15:38:29 +00:00 · 2008-04-19 15:37:39 +00:00 · 2008-04-19 14:48:18 +00:00
381 changed files with 4033 additions and 2980 deletions
--- a/build/Attic/python_v1.zip
+++ b/build/Attic/python_v1.zip
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -22,11 +22,12 @@ if ! [ python.configured ] && ! ( --without-python in  [ modules.peek : ARGV ] )
    }
 }

-if [ python.configured ] {
-
 project boost/python
-    : source-location ../src
-    ;
+  : source-location ../src
+  ;
+
+rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
+rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }

 lib boost_python
    : # sources
@@ -58,6 +59,7 @@ lib boost_python
    wrapper.cpp
    import.cpp
    exec.cpp
+    object/function_doc_signature.cpp
    :   # requirements
        <link>static:<define>BOOST_PYTHON_STATIC_LIB 
        <define>BOOST_PYTHON_SOURCE
@@ -74,19 +76,19 @@ lib boost_python
        # python_for_extensions is a target defined by Boost.Build to
        # provide the Python include paths, and on Windows, the Python
        # import library, as usage requirements.
-        <library>/python//python_for_extensions
-      
+        [ cond [ python.configured ] : <library>/python//python_for_extensions ]
+        
+        # we prevent building when there is no python available
+        # as it's not possible anyway, and to cause dependents to
+        # fail to build
+        [ unless [ python.configured ] : <build>no ]
+
        <python-debugging>on:<define>BOOST_DEBUG_PYTHON
-      
    :   # default build
        <link>shared
    :   # usage requirements
        <link>static:<define>BOOST_PYTHON_STATIC_LIB
        <python-debugging>on:<define>BOOST_DEBUG_PYTHON
    ;
-}
-else
-{
-    ECHO "warning: Python location is not configured" ;
-    ECHO "warning: the Boost.Python library won't be built" ;
-}
+
+boost-install boost_python ;
--- a/build/VisualStudio/boost_python.dsp
+++ b/build/VisualStudio/boost_python.dsp
@@ -1,902 +0,0 @@
-# Microsoft Developer Studio Project File - Name="boost_python" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=BOOST_PYTHON - WIN32 RELEASE
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "boost_python.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "boost_python.mak" CFG="BOOST_PYTHON - WIN32 RELEASE"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "boost_python - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "boost_python - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "boost_python - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../bin-stage"
-# PROP Intermediate_Dir "release-obj"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BPL_EXPORTS" /YX /FD /Zm800 /Zm800 /Zm800 /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BOOST_PYTHON_DYNAMIC_LIB" /D "BOOST_PYTHON_SOURCE" /FD /Zm800 /Zm800 /Zm800 /Zm800 /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x1409 /d "NDEBUG"
-# ADD RSC /l 0x1409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib /nologo /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "boost_python - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../bin-stage"
-# PROP Intermediate_Dir "debug-obj"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BPL_EXPORTS" /YX /FD /Zm800 /Zm800 /Zm800 /GZ /c
-# ADD CPP /nologo /MDd /W3 /GR /GX /Zi /Od /I "../../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BOOST_PYTHON_DYNAMIC_LIB" /D "BOOST_PYTHON_SOURCE" /FD /Zm800 /Zm800 /Zm800 /Zm800 /Zm800 /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x1409 /d "_DEBUG"
-# ADD RSC /l 0x1409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"../bin-stage/boost_python_debug.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "boost_python - Win32 Release"
-# Name "boost_python - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\src\converter\arg_to_python_base.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\converter\builtin_converters.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\class.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\dict.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\enum.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\errors.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\converter\from_python.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\function.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\inheritance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\iterator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\life_support.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\list.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\long.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\module.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\numeric.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object_operators.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object_protocol.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\pickle_support.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\converter\registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\slice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\stl_iterator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\str.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tuple.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\converter\type_id.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\wrapper.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\import.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\exec.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "detail"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\api_placeholder.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\arg_tuple_size.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\borrowed_ptr.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\call_object.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\caller.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\char_array.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\config.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\construct.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\convertible.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\cv_category.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\decorated_type_id.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\def_helper.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\defaults_def.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\defaults_gen.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\dependent.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\destroy.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\exception_handler.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\force_instantiate.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\if_else.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\indirect_traits.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\make_keyword_range_fn.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\make_tuple.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\map_entry.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\member_function_cast.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\module_base.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\module_init.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\msvc_typeinfo.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\none.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\not_specified.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\operator_id.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\overloads_fwd.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\pointee.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\preprocessor.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\python22_fixed.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\raw_pyobject.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\referent_storage.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\result.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\returning.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\scope.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\string_literal.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\target.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\translate_exception.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\type_list.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\type_list_impl.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\type_list_impl_no_pts.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\type_list_utils.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\unwind_type.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\void_ptr.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\void_return.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\wrap_python.hpp
-# End Source File
-# End Group
-# Begin Group "converter"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\arg_from_python.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\arg_to_python.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\arg_to_python_base.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\builtin_converters.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\constructor_function.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\convertible_function.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\from_python.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\implicit.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\obj_mgr_arg_from_python.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\object_manager.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\pointer_type_id.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\pyobject_traits.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\pyobject_type.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\pytype_arg_from_python.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\pytype_object_mgr_traits.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\registered.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\registered_pointee.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\registrations.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\registry.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\return_from_python.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\rvalue_from_python_data.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\to_python_function_type.hpp
-# End Source File
-# End Group
-# Begin Group "object"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\add_to_namespace.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\class.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\class_converters.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\class_detail.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\class_wrapper.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\construct.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\enum_base.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\find_instance.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\forward.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\function.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\function_handle.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\function_object.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\inheritance.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\instance.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\iterator.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\iterator_core.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\life_support.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\make_holder.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\make_instance.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\pickle_support.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\pointer_holder.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\py_function.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\select_holder.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\stl_iterator_core.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\value_holder.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\value_holder_fwd.hpp
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\arg_from_python.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\args.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\args_fwd.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\back_reference.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\base_type_traits.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\bases.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\borrowed.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\call.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\call_method.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\cast.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\class.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\class_fwd.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\copy_const_reference.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\copy_non_const_reference.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\data_members.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\def.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\default_call_policies.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\dict.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\enum.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\errors.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\exception_translator.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\extract.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\handle.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\handle_fwd.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\has_back_reference.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\implicit.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\init.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\instance_holder.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\iterator.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\list.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\long.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\lvalue_from_pytype.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\make_function.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\manage_new_object.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\module.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\module_init.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\numeric.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_attributes.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_call.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_core.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_fwd.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_items.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_operators.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_protocol.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_protocol_core.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_slices.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\operators.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\operators2.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\other.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\overloads.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\pointee.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\proxy.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\ptr.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\refcount.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\reference_existing_object.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\return_internal_reference.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\return_value_policy.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\scope.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\self.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\signature.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\slice_nil.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\stl_iterator.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\str.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\tag.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\to_python_converter.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\to_python_indirect.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\to_python_value.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\tuple.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\type_id.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\with_custodian_and_ward.hpp
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
--- a/build/VisualStudio/boost_python.dsw
+++ b/build/VisualStudio/boost_python.dsw
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "boost_python"=".\boost_python.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/doc/PyConDC_2003/bpl.html
+++ b/doc/PyConDC_2003/bpl.html
--- a/doc/PyConDC_2003/bpl.pdf
+++ b/doc/PyConDC_2003/bpl.pdf
--- a/doc/PyConDC_2003/python_cpp_mix.jpg
+++ b/doc/PyConDC_2003/python_cpp_mix.jpg
--- a/doc/PyConDC_2003/python_cpp_mix.png
+++ b/doc/PyConDC_2003/python_cpp_mix.png
--- a/doc/building.html
+++ b/doc/building.html
@@ -158,8 +158,8 @@ all the parts of your Python installation.  If it isn't, consider
 <p>If you're still having trouble, Someone on one of the following
 mailing lists may be able to help:</p>
 <ul class="simple">
-<li>The <a class="reference external" href="../../../more/mailing_lists.htm#jamboost">Boost.Build mailing list</a> for issues related to Boost.Build</li>
-<li>The Python <a class="reference external" href="../../../more/mailing_lists.htm#cplussig">C++ Sig</a> for issues specifically related to Boost.Python</li>
+<li>The <a class="reference external" href="http://www.boost.org/community/groups.html#jamboost">Boost.Build mailing list</a> for issues related to Boost.Build</li>
+<li>The Python <a class="reference external" href="http://www.boost.org/community/groups.html#cplussig">C++ Sig</a> for issues specifically related to Boost.Python</li>
 </ul>
 </div>
 <div class="section" id="in-case-everything-seemed-to-work">
@@ -620,7 +620,7 @@ python and associated libraries are built by adding
 Windows, the debugging version of Python is generated by
 the &quot;Win32 Debug&quot; target of the Visual Studio project in the
 PCBuild subdirectory of a full Python source code distribution.
-You may also find</td></tr>
+</td></tr>
 </tbody>
 </table>
 </div>
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -11,7 +11,7 @@
   :alt: Boost C++ Libraries:
   :class: boost-logo

-__ ../index.htm
+__ ../index.html


 .. section-numbering::
@@ -177,8 +177,8 @@ mailing lists may be able to help:
 * The `Boost.Build mailing list`__ for issues related to Boost.Build
 * The Python `C++ Sig`__ for issues specifically related to Boost.Python

-__ ../../../more/mailing_lists.htm#jamboost
-__ ../../../more/mailing_lists.htm#cplussig
+__ http://www.boost.org/community/groups.html#jamboost
+__ http://www.boost.org/community/groups.html#cplussig

 In Case Everything Seemed to Work
 ---------------------------------
@@ -678,4 +678,3 @@ __ http://www.python.org/doc/current/inst/index.html
   Windows, the debugging version of Python is generated by
   the "Win32 Debug" target of the Visual Studio project in the
   PCBuild subdirectory of a full Python source code distribution.
-   You may also find
--- a/doc/index.html
+++ b/doc/index.html
@@ -177,7 +177,7 @@
    <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
    </p>

-    <p><i>&copy; Copyright <a href="../../../people/dave_abrahams.htm">Dave
+    <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
    Abrahams</a> 2002-2003.</i></p>
  </body>
 </html>
--- a/doc/internals.html
+++ b/doc/internals.html
--- a/doc/internals.rst
+++ b/doc/internals.rst
--- a/doc/news.html
+++ b/doc/news.html
@@ -32,7 +32,43 @@
  <hr>

  <dl class="page-index">
-    <dt>Current CVS</dt>
+    <dt>Current SVN</dt>
+
+    <dd>
+      <ul>
+        <li>Pythonic signatures are now automatically appended to the
+        docstrings.
+
+        <li>Use <a href="v2/docstring_options.html"
+        ><code>docstring_options.hpp</code></a> header 
+        control the content of docstrings.
+	
+	<li>This new feature increases the size of the modules by about 14%.
+        If this is not acceptable it can be turned off by defining the macro
+        BOOST_PYTHON_NO_PY_SIGNATURES. Modules compiled with and without the macro
+        defined are compatible.
+        </li>
+	<li> If BOOST_PYTHON_NO_PY_SIGNATURES is undefined, this version defines the 
+        macro BOOST_PYTHON_SUPPORTS_PY_SIGNATURES. This allows writing code that will compile
+        with older version of Boost.Python (see <a href="v2/pytype_function.html#examples">here</a>).
+        </li>
+	<li>By defining BOOST_PYTHON_PY_SIGNATURES_PROPER_INIT_SELF_TYPE, and at a cost
+        of another 14% size increase, proper pythonic type is generated for the "self"
+        parameter of the __init__ methods.
+        </li>
+        
+        <li> To support this new feature changes were made to the 
+        <a href="v2/to_python_converter.html"><code>to_python_converter.hpp</code></a>, 
+        <a href="v2/default_call_policies.html"><code>default_call_policies</code></a>,
+        <a href="v2/ResultConverter.html"><code>ResultConverter</code></a>,
+        <a href="v2/CallPolicies.html"><code>CallPolicies</code></a> and some others.
+        Efforts were made not to have interface breaking changes. 
+        </li>
+
+      </ul>
+    </dd>
+
+    <dt>12 May 2007 - 1.34.0 release</dt>

    <dd>
      <ul>
@@ -293,7 +329,7 @@ BOOST_PYTHON_MODULE(test)
   19 November 2004 
  <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>

-  <p><i>&copy; Copyright <a href="../../../people/dave_abrahams.htm">Dave
+  <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
  Abrahams</a> 2002-2003.</i></p>
 </body>
 </html>
--- a/doc/projects.html
+++ b/doc/projects.html
@@ -439,7 +439,7 @@
  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
   15 July, 2003</p>

-  <p><i>&copy; Copyright <a href="../../../people/dave_abrahams.htm">Dave
+  <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
  Abrahams</a> 2002-2003.</i></p>
 </body>
 </html>
--- a/doc/support.html
+++ b/doc/support.html
@@ -47,7 +47,7 @@
       &nbsp;</dt>

      <dt><b><a href=
-      "http://www.boost.org/more/mailing_lists.htm#cplussig">The Python
+      "http://www.boost.org/community/groups.html#cplussig">The Python
      C++-sig</a></b> mailing list is a forum for discussing Python/C++
      interoperability, and Boost.Python in particular. Post your
      Boost.Python questions here.<br>
@@ -67,7 +67,7 @@
     12 Sept, 2003 <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
    </p>

-    <p><i>&copy; Copyright <a href="../../../people/dave_abrahams.htm">Dave
+    <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
    Abrahams</a> 2003.</i></p>
  </body>
 </html>
--- a/doc/tutorial/doc/Jamfile.v2
+++ b/doc/tutorial/doc/Jamfile.v2
@@ -12,4 +12,5 @@ boostbook tutorial
    :
        <xsl:param>boost.root=../../../../../..
        <xsl:param>boost.libraries=../../../../../../libs/libraries.htm
+        <xsl:param>html.stylesheet=../../../../../../doc/html/boostbook.css
    ;
--- a/doc/tutorial/doc/html/boostbook.css
+++ b/doc/tutorial/doc/html/boostbook.css
@@ -1,511 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2004 Joel de Guzman
-    http://spirit.sourceforge.net/
-
-    Use, modification and distribution is 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)
-=============================================================================*/
-
-/*=============================================================================
-    Body defaults
-=============================================================================*/
-
-    body 
-    {
-        margin: 1em;
-        font-family: sans-serif;
-    }
-
-/*=============================================================================
-    Paragraphs
-=============================================================================*/
-
-    p 
-    {
-        text-align: left;
-        font-size: 10pt; 
-        line-height: 1.15;
-    }
-
-/*=============================================================================
-    Program listings
-=============================================================================*/
-
-    /* Code on paragraphs */
-    p tt.computeroutput
-    {
-        font-size: 9pt;
-    }
-
-    pre.synopsis
-    {
-        font-size: 90%;
-        margin: 1pc 4% 0pc 4%;
-        padding: 0.5pc 0.5pc 0.5pc 0.5pc;
-    }
-
-    .programlisting, 
-    .screen
-    {
-        font-size: 9pt;
-        display: block;
-        margin: 1pc 4% 0pc 4%;
-        padding: 0.5pc 0.5pc 0.5pc 0.5pc;
-    }
-
-    /* Program listings in tables don't get borders */
-    td .programlisting, 
-    td .screen
-    {
-        margin: 0pc 0pc 0pc 0pc;
-        padding:  0pc 0pc 0pc 0pc;
-    }
-
-/*=============================================================================
-    Headings
-=============================================================================*/
-
-    h1, h2, h3, h4, h5, h6 
-    { 
-        text-align: left; 
-        margin: 1em 0em 0.5em 0em;
-        font-weight: bold;
-    }
-
-    h1 { font: 140% }
-    h2 { font: bold 140% }
-    h3 { font: bold 130% }
-    h4 { font: bold 120% }
-    h5 { font: italic 110% }
-    h6 { font: italic 100% }
-
-    /* Top page titles */
-    title, 
-    h1.title, 
-    h2.title
-    h3.title, 
-    h4.title, 
-    h5.title, 
-    h6.title, 
-    .refentrytitle
-    {
-        font-weight: bold;
-        margin-bottom: 1pc;
-    }
-
-    h1.title { font-size: 140% }
-    h2.title { font-size: 140% }
-    h3.title { font-size: 130% }
-    h4.title { font-size: 120% }
-    h5.title { font-size: 110% }
-    h6.title { font-size: 100% }
-
-    .section h1 
-    {
-        margin: 0em 0em 0.5em 0em;
-        font-size: 140%;
-    }
-
-    .section h2 { font-size: 140% }
-    .section h3 { font-size: 130% }
-    .section h4 { font-size: 120% }
-    .section h5 { font-size: 110% }
-    .section h6 { font-size: 100% }
-
-    /* Code on titles */
-    h1 tt.computeroutput { font-size: 140% }
-    h2 tt.computeroutput { font-size: 140% }
-    h3 tt.computeroutput { font-size: 130% }
-    h4 tt.computeroutput { font-size: 120% }
-    h5 tt.computeroutput { font-size: 110% }
-    h6 tt.computeroutput { font-size: 100% }
-
-/*=============================================================================
-    Author
-=============================================================================*/
-
-    h3.author 
-    { 
-        font-size: 100% 
-    }
-
-/*=============================================================================
-    Lists
-=============================================================================*/
-
-    li
-    {
-        font-size: 10pt;
-        line-height: 1.3;
-    }
-    
-    /* Unordered lists */
-    ul 
-    {
-        text-align: left;
-    }
-    
-    /* Ordered lists */
-    ol 
-    {
-        text-align: left;
-    }
-
-/*=============================================================================
-    Links
-=============================================================================*/
-
-    a
-    {
-        text-decoration: none; /* no underline */
-    }
-    
-    a:hover
-    {
-        text-decoration: underline;
-    }
-
-/*=============================================================================
-    Spirit style navigation
-=============================================================================*/
-
-    .spirit-nav
-    {
-        text-align: right;
-    }
-    
-    .spirit-nav a
-    {
-        color: white;
-        padding-left: 0.5em;
-    }
-    
-    .spirit-nav img
-    {
-        border-width: 0px;
-    }
-
-/*=============================================================================
-    Table of contents
-=============================================================================*/
-
-    .toc
-    {
-       margin: 1pc 4% 0pc 4%;
-       padding: 0.1pc 1pc 0.1pc 1pc;
-       font-size: 80%; 
-       line-height: 1.15;
-    }
-    
-    .boost-toc
-    {
-       float: right;
-       padding: 0.5pc;
-    }
-
-/*=============================================================================
-    Tables
-=============================================================================*/
-
-    .table-title, 
-    div.table p.title
-    {
-        margin-left: 4%;
-        padding-right: 0.5em; 
-        padding-left: 0.5em;
-    }
-    
-    .informaltable table, 
-    .table table
-    {
-        width: 92%;
-        margin-left: 4%;
-        margin-right: 4%;
-    }
-    
-    div.informaltable table, 
-    div.table table
-    {
-        padding: 4px;
-    }
-    
-    /* Table Cells */
-    div.informaltable table tr td, 
-    div.table table tr td
-    {
-        padding: 0.5em;
-        text-align: left;
-        font-size: 9pt;
-    }
-
-    div.informaltable table tr th, 
-    div.table table tr th
-    {
-        padding: 0.5em 0.5em 0.5em 0.5em;
-        border: 1pt solid white;
-        font-size: 80%;
-    }
-
-/*=============================================================================
-    Blurbs
-=============================================================================*/
-
-    div.note,
-    div.tip,
-    div.important,
-    div.caution,
-    div.warning,
-    p.blurb
-    {
-        font-size: 9pt; /* A little bit smaller than the main text */
-        line-height: 1.2;
-        display: block;
-        margin: 1pc 4% 0pc 4%;
-        padding: 0.5pc 0.5pc 0.5pc 0.5pc;
-    }
-    
-    p.blurb img
-    {
-        padding: 1pt;
-    }
-
-/*=============================================================================
-    Variable Lists
-=============================================================================*/
-
-    /* Make the terms in definition lists bold */
-    div.variablelist dl dt,
-    span.term
-    {
-        font-weight: bold;
-        font-size: 10pt;
-    }
-
-    div.variablelist table tbody tr td
-    {
-        text-align: left;
-        vertical-align: top;
-        padding: 0em 2em 0em 0em;
-        font-size: 10pt;
-        margin: 0em 0em 0.5em 0em;
-        line-height: 1;
-    }
-
-    div.variablelist dl dt
-    {
-        margin-bottom: 0.2em;
-    }
-
-    div.variablelist dl dd
-    {
-        margin: 0em 0em 0.5em 2em;
-        font-size: 10pt;
-    }
-
-    div.variablelist table tbody tr td p,
-    div.variablelist dl dd p
-    {
-        margin: 0em 0em 0.5em 0em;
-        line-height: 1;
-    }
-
-/*=============================================================================
-    Misc
-=============================================================================*/
-
-    /* Title of books and articles in bibliographies */
-    span.title
-    {
-        font-style: italic;
-    }
-
-    span.underline
-    {
-        text-decoration: underline;
-    }
-
-    span.strikethrough
-    {
-        text-decoration: line-through;
-    }
-
-    /* Copyright, Legal Notice */
-    div div.legalnotice p
-    {
-        text-align: left
-    }
-
-/*=============================================================================
-    Colors
-=============================================================================*/
-
-    @media screen
-    {
-    /* Links */
-        a
-        {
-            color: #005a9c;
-        }
-    
-        a:visited
-        {
-            color: #9c5a9c;
-        }
-
-        h1 a, h2 a, h3 a, h4 a, h5 a, h6 a,
-        h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover,
-        h1 a:visited, h2 a:visited, h3 a:visited, h4 a:visited, h5 a:visited, h6 a:visited
-        {
-            text-decoration: none; /* no underline */
-            color: #000000;
-        }
-    
-    /* Syntax Highlighting */
-        .keyword        { color: #0000AA; }
-        .identifier     { color: #000000; }
-        .special        { color: #707070; }
-        .preprocessor   { color: #402080; }
-        .char           { color: teal; }
-        .comment        { color: #800000; }
-        .string         { color: teal; }
-        .number         { color: teal; }
-        .white_bkd      { background-color: #FFFFFF; }
-        .dk_grey_bkd    { background-color: #999999; }
-    
-    /* Copyright, Legal Notice */
-        .copyright      
-        { 
-            color: #666666; 
-            font-size: small; 
-        }
-    
-        div div.legalnotice p
-        {
-            color: #666666;
-        }
-    
-    /* Program listing */
-        pre.synopsis
-        {
-            border: 1px solid #DCDCDC;
-        }
-    
-        .programlisting, 
-        .screen
-        {
-            border: 1px solid #DCDCDC;
-        }
-    
-        td .programlisting, 
-        td .screen
-        {
-            border: 0px solid #DCDCDC;
-        }
-    
-    /* Blurbs */
-        div.note,
-        div.tip,
-        div.important,
-        div.caution,
-        div.warning,
-        p.blurb
-        {
-            border: 1px solid #DCDCDC;
-        }
-    
-    /* Table of contents */
-        .toc
-        {
-            border: 1px solid #DCDCDC;
-        }
-    
-    /* Tables */
-        div.informaltable table tr td, 
-        div.table table tr td
-        {
-            border: 1px solid #DCDCDC;
-        }
-    
-        div.informaltable table tr th, 
-        div.table table tr th
-        {
-            background-color: #F0F0F0;
-            border: 1px solid #DCDCDC;
-        }
-    
-    /* Misc */
-        span.highlight
-        {
-            color: #00A000;
-        }
-    }
-    
-    @media print
-    {
-    /* Links */
-        a
-        {
-            color: black;
-        }
-    
-        a:visited
-        {
-            color: black;
-        }
-    
-        .spirit-nav
-        {
-            display: none;
-        }
-    
-    /* Program listing */
-        pre.synopsis
-        {
-            border: 1px solid gray;
-        }
-    
-        .programlisting, 
-        .screen
-        {
-            border: 1px solid gray;
-        }
-    
-        td .programlisting, 
-        td .screen
-        {
-            border: 0px solid #DCDCDC;
-        }
-    
-    /* Table of contents */
-        .toc
-        {
-            border: 1px solid gray;
-        }
-    
-        .informaltable table, 
-        .table table
-        {
-            border: 1px solid gray;
-            border-collapse: collapse;
-        }
-    
-    /* Tables */
-        div.informaltable table tr td, 
-        div.table table tr td
-        {
-            border: 1px solid gray;
-        }
-    
-        div.informaltable table tr th, 
-        div.table table tr th
-        {
-            border: 1px solid gray;
-        }
-    
-    /* Misc */
-        span.highlight
-        {
-            font-weight: bold;
-        }
-    }
--- a/doc/tutorial/doc/html/images/alert.png
+++ b/doc/tutorial/doc/html/images/alert.png
--- a/doc/tutorial/doc/html/images/home.png
+++ b/doc/tutorial/doc/html/images/home.png
--- a/doc/tutorial/doc/html/images/next.png
+++ b/doc/tutorial/doc/html/images/next.png
--- a/doc/tutorial/doc/html/images/note.png
+++ b/doc/tutorial/doc/html/images/note.png
--- a/doc/tutorial/doc/html/images/prev.png
+++ b/doc/tutorial/doc/html/images/prev.png
--- a/doc/tutorial/doc/html/images/tip.png
+++ b/doc/tutorial/doc/html/images/tip.png
--- a/doc/tutorial/doc/html/images/up.png
+++ b/doc/tutorial/doc/html/images/up.png
--- a/doc/tutorial/doc/html/index.html
+++ b/doc/tutorial/doc/html/index.html
@@ -2,22 +2,22 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Chapter 1. python 1.0</title>
-<link rel="stylesheet" href="boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="index.html" title="Chapter 1. python 1.0">
-<link rel="next" href="python/hello.html" title="Building Hello World">
+<link rel="next" href="python/hello.html" title=" Building Hello World">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%">
+<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.htm">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="../../../../../../people/people.htm">People</a></td>
 <td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
 <td align="center"><a href="../../../../../../more/index.htm">More</a></td>
-</table>
+</tr></table>
 <hr>
-<div class="spirit-nav"><a accesskey="n" href="python/hello.html"><img src="images/next.png" alt="Next"></a></div>
+<div class="spirit-nav"><a accesskey="n" href="python/hello.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a></div>
 <div class="chapter" lang="en">
 <div class="titlepage"><div>
 <div><h2 class="title">
@@ -31,7 +31,7 @@
 <div><p class="copyright">Copyright © 2002-2005 Joel
      de Guzman, David Abrahams</p></div>
 <div><div class="legalnotice">
-<a name="id3128483"></a><p>
+<a name="id455917"></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>)
@@ -93,10 +93,10 @@
      code takes on the look of a kind of declarative interface definition language
      (IDL).
    </p>
-<a name="quickstart.hello_world"></a><h3>
-<a name="id3090903"></a>
+<a name="quickstart.hello_world"></a><h2>
+<a name="id385257"></a>
      Hello World
-    </h3>
+    </h2>
 <p>
      Following C/C++ tradition, let's start with the "hello, world". A
      C++ Function:
@@ -112,10 +112,10 @@
    </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">python</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">python</span><span class="special">;</span>

-<span class="identifier">BOOST_PYTHON_MODULE</span><span class="special">(</span><span class="identifier">hello</span><span class="special">)</span>
+<span class="identifier">BOOST_PYTHON_MODULE</span><span class="special">(</span><span class="identifier">hello_ext</span><span class="special">)</span>
 <span class="special">{</span>
+    <span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">python</span><span class="special">;</span>
    <span class="identifier">def</span><span class="special">(</span><span class="string">"greet"</span><span class="special">,</span> <span class="identifier">greet</span><span class="special">);</span>
 <span class="special">}</span>
 </pre>
@@ -126,23 +126,29 @@
 <p>
    </p>
 <pre class="programlisting">
-<span class="special">&gt;&gt;&gt;</span> <span class="keyword">import</span> <span class="identifier">hello</span>
+<span class="special">&gt;&gt;&gt;</span> <span class="keyword">import</span> <span class="identifier">hello_ext</span>
 <span class="special">&gt;&gt;&gt;</span> <span class="keyword">print</span> <span class="identifier">hello</span><span class="special">.</span><span class="identifier">greet</span><span class="special">()</span>
 <span class="identifier">hello</span><span class="special">,</span> <span class="identifier">world</span>
 </pre>
 <p>
    </p>
-<div class="blockquote"><blockquote class="blockquote"><p>
-        <span class="emphasis"><em><span class="bold"><strong>Next stop... Building your Hello World module
-        from start to finish...</strong></span></em></span>
-      </p></blockquote></div>
+<div class="blockquote"><blockquote class="blockquote">
+<p>
+        </p>
+<p>
+          <span class="emphasis"><em><span class="bold"><b>Next stop... Building your Hello World
+          module from start to finish...</b></span></em></span>
+        </p>
+<p>
+      </p>
+</blockquote></div>
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><small><p>Last revised: May 18, 2007 at 15:45:45 GMT</p></small></td>
-<td align="right"><small></small></td>
+<td align="left"><p><small>Last revised: November 07, 2007 at 03:34:24 GMT</small></p></td>
+<td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
-<div class="spirit-nav"><a accesskey="n" href="python/hello.html"><img src="images/next.png" alt="Next"></a></div>
+<div class="spirit-nav"><a accesskey="n" href="python/hello.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a></div>
 </body>
 </html>
--- a/doc/tutorial/doc/html/python/embedding.html
+++ b/doc/tutorial/doc/html/python/embedding.html
@@ -2,25 +2,25 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Embedding</title>
-<link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Chapter 1. python 1.0">
 <link rel="up" href="../index.html" title="Chapter 1. python 1.0">
-<link rel="prev" href="object.html" title="Object Interface">
+<link rel="prev" href="object.html" title=" Object Interface">
 <link rel="next" href="iterators.html" title="Iterators">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%">
+<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.htm">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
 <td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
 <td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</table>
+</tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="object.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="iterators.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="object.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="iterators.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -39,28 +39,28 @@
      a lot easier and, in a future version, it may become unnecessary to touch the
      Python/C API at all. So stay tuned... <span class="inlinemediaobject"><img src="../images/smiley.png" alt="smiley"></span>
    </p>
-<a name="embedding.building_embedded_programs"></a><h3>
-<a name="id3150903"></a>
+<a name="embedding.building_embedded_programs"></a><h2>
+<a name="id471171"></a>
      Building embedded programs
-    </h3>
+    </h2>
 <p>
      To be able to embed python into your programs, you have to link to both Boost.Python's
      as well as Python's own runtime library.
    </p>
 <p>
      Boost.Python's library comes in two variants. Both are located in Boost's
-      <code class="literal">/libs/python/build/bin-stage</code> subdirectory. On Windows, the
-      variants are called <code class="literal">boost_python.lib</code> (for release builds)
-      and <code class="literal">boost_python_debug.lib</code> (for debugging). If you can't
+      <tt class="literal">/libs/python/build/bin-stage</tt> subdirectory. On Windows, the
+      variants are called <tt class="literal">boost_python.lib</tt> (for release builds)
+      and <tt class="literal">boost_python_debug.lib</tt> (for debugging). If you can't
      find the libraries, you probably haven't built Boost.Python yet. See <a href="../../../../building.html" target="_top">Building and Testing</a> on how to do this.
    </p>
 <p>
-      Python's library can be found in the <code class="literal">/libs</code> subdirectory
+      Python's library can be found in the <tt class="literal">/libs</tt> subdirectory
      of your Python directory. On Windows it is called pythonXY.lib where X.Y is
      your major Python version number.
    </p>
 <p>
-      Additionally, Python's <code class="literal">/include</code> subdirectory has to be added
+      Additionally, Python's <tt class="literal">/include</tt> subdirectory has to be added
      to your include path.
    </p>
 <p>
@@ -81,60 +81,67 @@ exe embedded_program # name of the executable
    &lt;library-path&gt;$(PYTHON_LIB_PATH)
    &lt;find-library&gt;$(PYTHON_EMBEDDED_LIBRARY) ;
 </pre>
-<a name="embedding.getting_started"></a><h3>
-<a name="id3150996"></a>
+<a name="embedding.getting_started"></a><h2>
+<a name="id471276"></a>
      Getting started
-    </h3>
+    </h2>
 <p>
      Being able to build is nice, but there is nothing to build yet. Embedding the
      Python interpreter into one of your C++ programs requires these 4 steps:
    </p>
 <div class="orderedlist"><ol type="1">
 <li>
-        
-#include
-         <code class="literal">&lt;boost/python.hpp&gt;</code><br><br>
+        #include <tt class="literal">&lt;boost/python.hpp&gt;</tt>
 </li>
 <li>
        Call <a href="http://www.python.org/doc/current/api/initialization.html#l2h-652" target="_top">Py_Initialize</a>()
-        to start the interpreter and create the <code class="literal"><span class="underline">_main</span>_</code>
-        module.<br><br>
-</li>
+        to start the interpreter and create the <tt class="literal"><span class="underline">_main</span>_</tt>
+        module.
+      </li>
 <li>
-        Call other Python C API routines to use the interpreter.<br><br>
-</li>
+        Call other Python C API routines to use the interpreter.
+      </li>
 </ol></div>
-<div class="informaltable"><table class="table">
-<colgroup><col></colgroup>
-<tbody><tr><td class="blurb"> <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> <span class="bold"><strong>Note that at this time
-            you must not call <a href="http://www.python.org/doc/current/api/initialization.html#l2h-656" target="_top">Py_Finalize</a>()
-            to stop the interpreter. This may be fixed in a future version of boost.python.</strong></span>
-            </td></tr></tbody>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/html/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top"><p>
+        <span class="bold"><b>Note that at this time you must not call <a href="http://www.python.org/doc/current/api/initialization.html#l2h-656" target="_top">Py_Finalize</a>()
+        to stop the interpreter. This may be fixed in a future version of boost.python.</b></span>
+      </p></td></tr>
 </table></div>
 <p>
      (Of course, there can be other C++ code between all of these steps.)
    </p>
-<div class="blockquote"><blockquote class="blockquote"><p>
-        <span class="emphasis"><em><span class="bold"><strong>Now that we can embed the interpreter in
-        our programs, lets see how to put it to use...</strong></span></em></span>
-      </p></blockquote></div>
+<div class="blockquote"><blockquote class="blockquote">
+<p>
+        </p>
+<p>
+          <span class="emphasis"><em><span class="bold"><b>Now that we can embed the interpreter in
+          our programs, lets see how to put it to use...</b></span></em></span>
+        </p>
+<p>
+      </p>
+</blockquote></div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="python.using_the_interpreter"></a>Using the interpreter</h3></div></div></div>
 <p>
        As you probably already know, objects in Python are reference-counted. Naturally,
-        the <code class="literal">PyObject</code>s of the Python/C API are also reference-counted.
+        the <tt class="literal">PyObject</tt>s of the Python/C API are also reference-counted.
        There is a difference however. While the reference-counting is fully automatic
-        in Python, the Python/C API requires you to do it <a href="http://www.python.org/doc/current/api/refcounts.html" target="_top">by
-        hand</a>. This is messy and especially hard to get right in the presence
+        in Python, the Python<span class="emphasis"><em>C API requires you to do it [@http:</em></span>/www.python.org/doc/current/api/refcounts.html
+        by hand]. This is messy and especially hard to get right in the presence
        of C++ exceptions. Fortunately Boost.Python provides the <a href="../../../../v2/handle.html" target="_top">handle</a>
        and <a href="../../../../v2/object.html" target="_top">object</a> class templates to
        automate the process.
      </p>
-<a name="using_the_interpreter.running_python_code"></a><h3>
-<a name="id3151190"></a>
+<a name="using_the_interpreter.running_python_code"></a><h2>
+<a name="id471439"></a>
        Running Python code
-      </h3>
+      </h2>
 <p>
        Boost.python provides three related functions to run Python code from C++.
      </p>
@@ -149,10 +156,10 @@ exe embedded_program # name of the executable
        and exec_file executes the code contained in the given file.
      </p>
 <p>
-        The <code class="literal">globals</code> and <code class="literal">locals</code> parameters are
+        The <tt class="literal">globals</tt> and <tt class="literal">locals</tt> parameters are
        Python dictionaries containing the globals and locals of the context in which
        to run the code. For most intents and purposes you can use the namespace
-        dictionary of the <code class="literal"><span class="underline">_main</span>_</code>
+        dictionary of the <tt class="literal"><span class="underline">_main</span>_</tt>
        module for both parameters.
      </p>
 <p>
@@ -166,7 +173,7 @@ exe embedded_program # name of the executable
        first), and returns it.
      </p>
 <p>
-        Let's import the <code class="literal"><span class="underline">_main</span>_</code>
+        Let's import the <tt class="literal"><span class="underline">_main</span>_</tt>
        module and run some Python code in its namespace:
      </p>
 <pre class="programlisting">
@@ -182,15 +189,15 @@ exe embedded_program # name of the executable
        This should create a file called 'hello.txt' in the current directory containing
        a phrase that is well-known in programming circles.
      </p>
-<a name="using_the_interpreter.manipulating_python_objects"></a><h3>
-<a name="id3151717"></a>
+<a name="using_the_interpreter.manipulating_python_objects"></a><h2>
+<a name="id472027"></a>
        Manipulating Python objects
-      </h3>
+      </h2>
 <p>
        Often we'd like to have a class to manipulate Python objects. But we have
        already seen such a class above, and in the <a href="object.html" target="_top">previous
-        section</a>: the aptly named <code class="literal">object</code> class and its
-        derivatives. We've already seen that they can be constructed from a <code class="literal">handle</code>.
+        section</a>: the aptly named <tt class="literal">object</tt> class and its
+        derivatives. We've already seen that they can be constructed from a <tt class="literal">handle</tt>.
        The following examples should further illustrate this fact:
      </p>
 <pre class="programlisting">
@@ -200,7 +207,7 @@ exe embedded_program # name of the executable
 <span class="keyword">int</span> <span class="identifier">five_squared</span> <span class="special">=</span> <span class="identifier">extract</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="identifier">main_namespace</span><span class="special">[</span><span class="string">"result"</span><span class="special">]);</span>
 </pre>
 <p>
-        Here we create a dictionary object for the <code class="literal"><span class="underline">_main</span>_</code>
+        Here we create a dictionary object for the <tt class="literal"><span class="underline">_main</span>_</tt>
        module's namespace. Then we assign 5 squared to the result variable and read
        this variable from the dictionary. Another way to achieve the same result
        is to use eval instead, which returns the result directly:
@@ -209,10 +216,10 @@ exe embedded_program # name of the executable
 <span class="identifier">object</span> <span class="identifier">result</span> <span class="special">=</span> <span class="identifier">eval</span><span class="special">(</span><span class="string">"5 ** 2"</span><span class="special">);</span>
 <span class="keyword">int</span> <span class="identifier">five_squared</span> <span class="special">=</span> <span class="identifier">extract</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="identifier">result</span><span class="special">);</span>
 </pre>
-<a name="using_the_interpreter.exception_handling"></a><h3>
-<a name="id3152050"></a>
+<a name="using_the_interpreter.exception_handling"></a><h2>
+<a name="id472399"></a>
        Exception handling
-      </h3>
+      </h2>
 <p>
        If an exception occurs in the evaluation of the python expression, <a href="../../../../v2/errors.html#error_already_set-spec" target="_top">error_already_set</a>
        is thrown:
@@ -230,13 +237,13 @@ exe embedded_program # name of the executable
 </span><span class="special">}</span>
 </pre>
 <p>
-        The <code class="literal">error_already_set</code> exception class doesn't carry any
+        The <tt class="literal">error_already_set</tt> exception class doesn't carry any
        information in itself. To find out more about the Python exception that occurred,
        you need to use the <a href="http://www.python.org/doc/api/exceptionHandling.html" target="_top">exception
-        handling functions</a> of the Python/C API in your catch-statement. This
-        can be as simple as calling <a href="http://www.python.org/doc/api/exceptionHandling.html#l2h-70" target="_top">PyErr_Print()</a>
-        to print the exception's traceback to the console, or comparing the type
-        of the exception with those of the <a href="http://www.python.org/doc/api/standardExceptions.html" target="_top">standard
+        handling functions</a> of the Python<span class="emphasis"><em>C API in your catch-statement.
+        This can be as simple as calling [@http:</em></span>/www.python.org/doc/api/exceptionHandling.html#l2h-70
+        PyErr_Print()] to print the exception's traceback to the console, or comparing
+        the type of the exception with those of the <a href="http://www.python.org/doc/api/standardExceptions.html" target="_top">standard
        exceptions</a>:
      </p>
 <pre class="programlisting">
@@ -261,12 +268,17 @@ exe embedded_program # name of the executable
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><small>Copyright © 2002-2005 Joel
-      de Guzman, David Abrahams</small></td>
+<td align="right"><div class="copyright-footer">Copyright © 2002-2005 Joel
+      de Guzman, David Abrahams<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>
+</div></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="object.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="iterators.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="object.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="iterators.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/tutorial/doc/html/python/exception.html
+++ b/doc/tutorial/doc/html/python/exception.html
@@ -1,26 +1,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Exception Translation</title>
-<link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<title> Exception Translation</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Chapter 1. python 1.0">
 <link rel="up" href="../index.html" title="Chapter 1. python 1.0">
 <link rel="prev" href="iterators.html" title="Iterators">
-<link rel="next" href="techniques.html" title="General Techniques">
+<link rel="next" href="techniques.html" title=" General Techniques">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%">
+<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.htm">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
 <td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
 <td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</table>
+</tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="iterators.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="techniques.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="iterators.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="techniques.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -49,12 +49,17 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><small>Copyright © 2002-2005 Joel
-      de Guzman, David Abrahams</small></td>
+<td align="right"><div class="copyright-footer">Copyright © 2002-2005 Joel
+      de Guzman, David Abrahams<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>
+</div></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="iterators.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="techniques.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="iterators.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="techniques.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/tutorial/doc/html/python/exposing.html
+++ b/doc/tutorial/doc/html/python/exposing.html
@@ -1,26 +1,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Exposing Classes</title>
-<link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<title> Exposing Classes</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Chapter 1. python 1.0">
 <link rel="up" href="../index.html" title="Chapter 1. python 1.0">
-<link rel="prev" href="hello.html" title="Building Hello World">
+<link rel="prev" href="hello.html" title=" Building Hello World">
 <link rel="next" href="functions.html" title="Functions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%">
+<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.htm">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
 <td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
 <td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</table>
+</tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="hello.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="functions.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="hello.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="functions.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -64,9 +64,9 @@
 <span class="special">}</span>
 </pre>
 <p>
-      Here, we wrote a C++ class wrapper that exposes the member functions <code class="literal">greet</code>
-      and <code class="literal">set</code>. Now, after building our module as a shared library,
-      we may use our class <code class="literal">World</code> in Python. Here's a sample Python
+      Here, we wrote a C++ class wrapper that exposes the member functions <tt class="literal">greet</tt>
+      and <tt class="literal">set</tt>. Now, after building our module as a shared library,
+      we may use our class <tt class="literal">World</tt> in Python. Here's a sample Python
      session:
    </p>
 <p>
@@ -82,7 +82,7 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="python.constructors"></a>Constructors</h3></div></div></div>
 <p>
-        Our previous example didn't have any explicit constructors. Since <code class="literal">World</code>
+        Our previous example didn't have any explicit constructors. Since <tt class="literal">World</tt>
        is declared as a plain struct, it has an implicit default constructor. Boost.Python
        exposes the default constructor by default, which is why we were able to
        write
@@ -106,9 +106,9 @@
 <span class="special">};</span>
 </pre>
 <p>
-        This time <code class="literal">World</code> has no default constructor; our previous
+        This time <tt class="literal">World</tt> has no default constructor; our previous
        wrapping code would fail to compile when the library tried to expose it.
-        We have to tell <code class="literal">class_&lt;World&gt;</code> about the constructor
+        We have to tell <tt class="literal">class_&lt;World&gt;</tt> about the constructor
        we want to expose instead.
      </p>
 <pre class="programlisting">
@@ -124,13 +124,13 @@
 <span class="special">}</span>
 </pre>
 <p>
-        <code class="literal">init&lt;std::string&gt;()</code> exposes the constructor taking
-        in a <code class="literal">std::string</code> (in Python, constructors are spelled
-        "<code class="literal">"<span class="underline">_init</span>_"</code>").
+        <tt class="literal">init&lt;std::string&gt;()</tt> exposes the constructor taking
+        in a <tt class="literal">std::string</tt> (in Python, constructors are spelled
+        "<tt class="literal">"<span class="underline">_init</span>_"</tt>").
      </p>
 <p>
-        We can expose additional constructors by passing more <code class="literal">init&lt;...&gt;</code>s
-        to the <code class="literal">def()</code> member function. Say for example we have
+        We can expose additional constructors by passing more <tt class="literal">init&lt;...&gt;</tt>s
+        to the <tt class="literal">def()</tt> member function. Say for example we have
        another World constructor taking in two doubles:
      </p>
 <pre class="programlisting">
@@ -142,13 +142,13 @@
 </pre>
 <p>
        On the other hand, if we do not wish to expose any constructors at all, we
-        may use <code class="literal">no_init</code> instead:
+        may use <tt class="literal">no_init</tt> instead:
      </p>
 <pre class="programlisting">
 <span class="identifier">class_</span><span class="special">&lt;</span><span class="identifier">Abstract</span><span class="special">&gt;(</span><span class="string">"Abstract"</span><span class="special">,</span> <span class="identifier">no_init</span><span class="special">)</span>
 </pre>
 <p>
-        This actually adds an <code class="literal"><span class="underline">_init</span>_</code>
+        This actually adds an <tt class="literal"><span class="underline">_init</span>_</tt>
        method which always raises a Python RuntimeError exception.
      </p>
 </div>
@@ -158,8 +158,8 @@
 <p>
        Data members may also be exposed to Python so that they can be accessed as
        attributes of the corresponding Python class. Each data member that we wish
-        to be exposed may be regarded as <span class="bold"><strong>read-only</strong></span>
-        or <span class="bold"><strong>read-write</strong></span>. Consider this class <code class="literal">Var</code>:
+        to be exposed may be regarded as <span class="bold"><b>read-only</b></span>
+        or <span class="bold"><b>read-write</b></span>. Consider this class <tt class="literal">Var</tt>:
      </p>
 <pre class="programlisting">
 <span class="keyword">struct</span> <span class="identifier">Var</span>
@@ -170,7 +170,7 @@
 <span class="special">};</span>
 </pre>
 <p>
-        Our C++ <code class="literal">Var</code> class and its data members can be exposed
+        Our C++ <tt class="literal">Var</tt> class and its data members can be exposed
        to Python:
      </p>
 <pre class="programlisting">
@@ -191,8 +191,8 @@
 <span class="identifier">pi</span> <span class="keyword">is</span> <span class="identifier">around</span> <span class="number">3.14</span>
 </pre>
 <p>
-        Note that <code class="literal">name</code> is exposed as <span class="bold"><strong>read-only</strong></span>
-        while <code class="literal">value</code> is exposed as <span class="bold"><strong>read-write</strong></span>.
+        Note that <tt class="literal">name</tt> is exposed as <span class="bold"><b>read-only</b></span>
+        while <tt class="literal">value</tt> is exposed as <span class="bold"><b>read-write</b></span>.
      </p>
 <pre class="programlisting">
 <span class="special">&gt;&gt;&gt;</span> <span class="identifier">x</span><span class="special">.</span><span class="identifier">name</span> <span class="special">=</span> <span class="string">'e'</span> <span class="comment"># can't change name
@@ -224,7 +224,7 @@
 <p>
        However, in Python attribute access is fine; it doesn't neccessarily break
        encapsulation to let users handle attributes directly, because the attributes
-        can just be a different syntax for a method call. Wrapping our <code class="literal">Num</code>
+        can just be a different syntax for a method call. Wrapping our <tt class="literal">Num</tt>
        class using Boost.Python:
      </p>
 <pre class="programlisting">
@@ -245,8 +245,8 @@
 <span class="special">&gt;&gt;&gt;</span> <span class="identifier">x</span><span class="special">.</span><span class="identifier">rovalue</span> <span class="special">=</span> <span class="number">2.17</span> <span class="comment"># error!
 </span></pre>
 <p>
-        Take note that the class property <code class="literal">rovalue</code> is exposed as
-        <span class="bold"><strong>read-only</strong></span> since the <code class="literal">rovalue</code>
+        Take note that the class property <tt class="literal">rovalue</tt> is exposed as
+        <span class="bold"><b>read-only</b></span> since the <tt class="literal">rovalue</tt>
        setter member function is not passed in:
      </p>
 <p>
@@ -273,7 +273,7 @@
 <span class="keyword">struct</span> <span class="identifier">Derived</span> <span class="special">:</span> <span class="identifier">Base</span> <span class="special">{};</span>
 </pre>
 <p>
-        And a set of C++ functions operating on <code class="literal">Base</code> and <code class="literal">Derived</code>
+        And a set of C++ functions operating on <tt class="literal">Base</tt> and <tt class="literal">Derived</tt>
        object instances:
      </p>
 <pre class="programlisting">
@@ -282,7 +282,7 @@
 <span class="identifier">Base</span><span class="special">*</span> <span class="identifier">factory</span><span class="special">()</span> <span class="special">{</span> <span class="keyword">return</span> <span class="keyword">new</span> <span class="identifier">Derived</span><span class="special">;</span> <span class="special">}</span>
 </pre>
 <p>
-        We've seen how we can wrap the base class <code class="literal">Base</code>:
+        We've seen how we can wrap the base class <tt class="literal">Base</tt>:
      </p>
 <pre class="programlisting">
 <span class="identifier">class_</span><span class="special">&lt;</span><span class="identifier">Base</span><span class="special">&gt;(</span><span class="string">"Base"</span><span class="special">)</span>
@@ -290,8 +290,8 @@
    <span class="special">;</span>
 </pre>
 <p>
-        Now we can inform Boost.Python of the inheritance relationship between <code class="literal">Derived</code>
-        and its base class <code class="literal">Base</code>. Thus:
+        Now we can inform Boost.Python of the inheritance relationship between <tt class="literal">Derived</tt>
+        and its base class <tt class="literal">Base</tt>. Thus:
      </p>
 <pre class="programlisting">
 <span class="identifier">class_</span><span class="special">&lt;</span><span class="identifier">Derived</span><span class="special">,</span> <span class="identifier">bases</span><span class="special">&lt;</span><span class="identifier">Base</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="string">"Derived"</span><span class="special">)</span>
@@ -307,15 +307,15 @@
          member functions)
        </li>
 <li>
-<span class="bold"><strong>If</strong></span> Base is polymorphic, <code class="literal">Derived</code>
+<span class="bold"><b>If</b></span> Base is polymorphic, <tt class="literal">Derived</tt>
          objects which have been passed to Python via a pointer or reference to
-          <code class="literal">Base</code> can be passed where a pointer or reference to
-          <code class="literal">Derived</code> is expected.
+          <tt class="literal">Base</tt> can be passed where a pointer or reference to
+          <tt class="literal">Derived</tt> is expected.
        </li>
 </ol></div>
 <p>
-        Now, we shall expose the C++ free functions <code class="literal">b</code> and <code class="literal">d</code>
-        and <code class="literal">factory</code>:
+        Now, we will expose the C++ free functions <tt class="literal">b</tt> and <tt class="literal">d</tt>
+        and <tt class="literal">factory</tt>:
      </p>
 <pre class="programlisting">
 <span class="identifier">def</span><span class="special">(</span><span class="string">"b"</span><span class="special">,</span> <span class="identifier">b</span><span class="special">);</span>
@@ -323,12 +323,12 @@
 <span class="identifier">def</span><span class="special">(</span><span class="string">"factory"</span><span class="special">,</span> <span class="identifier">factory</span><span class="special">);</span>
 </pre>
 <p>
-        Note that free function <code class="literal">factory</code> is being used to generate
-        new instances of class <code class="literal">Derived</code>. In such cases, we use
-        <code class="literal">return_value_policy&lt;manage_new_object&gt;</code> to instruct
-        Python to adopt the pointer to <code class="literal">Base</code> and hold the instance
-        in a new Python <code class="literal">Base</code> object until the the Python object
-        is destroyed. We shall see more of Boost.Python <a href="functions.html#python.call_policies" title="Call Policies">call
+        Note that free function <tt class="literal">factory</tt> is being used to generate
+        new instances of class <tt class="literal">Derived</tt>. In such cases, we use
+        <tt class="literal">return_value_policy&lt;manage_new_object&gt;</tt> to instruct
+        Python to adopt the pointer to <tt class="literal">Base</tt> and hold the instance
+        in a new Python <tt class="literal">Base</tt> object until the the Python object
+        is destroyed. We will see more of Boost.Python <a href="functions.html#python.call_policies" title="Call Policies">call
        policies</a> later.
      </p>
 <pre class="programlisting">
@@ -341,9 +341,9 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="python.class_virtual_functions"></a>Class Virtual Functions</h3></div></div></div>
 <p>
-        In this section, we shall learn how to make functions behave polymorphically
+        In this section, we will learn how to make functions behave polymorphically
        through virtual functions. Continuing our example, let us add a virtual function
-        to our <code class="literal">Base</code> class:
+        to our <tt class="literal">Base</tt> class:
      </p>
 <pre class="programlisting">
 <span class="keyword">struct</span> <span class="identifier">Base</span>
@@ -356,11 +356,11 @@
        One of the goals of Boost.Python is to be minimally intrusive on an existing
        C++ design. In principle, it should be possible to expose the interface for
        a 3rd party library without changing it. It is not ideal to add anything
-        to our class <code class="computeroutput"><span class="identifier">Base</span></code>. Yet, when
+        to our class <tt class="computeroutput"><span class="identifier">Base</span></tt>. Yet, when
        you have a virtual function that's going to be overridden in Python and called
-        polymorphically <span class="bold"><strong>from C++</strong></span>, we'll need to
+        polymorphically <span class="bold"><b>from C++</b></span>, we'll need to
        add some scaffoldings to make things work properly. What we'll do is write
-        a class wrapper that derives from <code class="computeroutput"><span class="identifier">Base</span></code>
+        a class wrapper that derives from <tt class="computeroutput"><span class="identifier">Base</span></tt>
        that will unintrusively hook into the virtual functions so that a Python
        override may be called:
      </p>
@@ -374,24 +374,28 @@
 <span class="special">};</span>
 </pre>
 <p>
-        Notice too that in addition to inheriting from <code class="computeroutput"><span class="identifier">Base</span></code>,
-        we also multiply- inherited <code class="computeroutput"><span class="identifier">wrapper</span><span class="special">&lt;</span><span class="identifier">Base</span><span class="special">&gt;</span></code> (See <a href="../../../../v2/wrapper.html" target="_top">Wrapper</a>).
-        The <code class="computeroutput"><span class="identifier">wrapper</span></code> template makes
+        Notice too that in addition to inheriting from <tt class="computeroutput"><span class="identifier">Base</span></tt>,
+        we also multiply- inherited <tt class="computeroutput"><span class="identifier">wrapper</span><span class="special">&lt;</span><span class="identifier">Base</span><span class="special">&gt;</span></tt> (See <a href="../../../../v2/wrapper.html" target="_top">Wrapper</a>).
+        The <tt class="computeroutput"><span class="identifier">wrapper</span></tt> template makes
        the job of wrapping classes that are meant to overridden in Python, easier.
      </p>
-<div class="informaltable"><table class="table">
-<colgroup><col></colgroup>
-<tbody><tr><td class="blurb"> <span class="inlinemediaobject"><img src="../images/alert.png" alt="alert"></span> <span class="bold"><strong>MSVC6/7 Workaround</strong></span><br>
-              <br> If you are using Microsoft Visual C++ 6 or 7, you have to write
-              <code class="computeroutput"><span class="identifier">f</span></code> as:<br> <br>
-              <code class="computeroutput"><span class="keyword">return</span> <span class="identifier">call</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="keyword">this</span><span class="special">-&gt;</span><span class="identifier">get_override</span><span class="special">(</span><span class="string">"f"</span><span class="special">).</span><span class="identifier">ptr</span><span class="special">());</span></code>.</td></tr></tbody>
-</table></div>
+<div class="sidebar">
 <p>
-        BaseWrap's overridden virtual member function <code class="computeroutput"><span class="identifier">f</span></code>
-        in effect calls the corresponding method of the Python object through <code class="computeroutput"><span class="identifier">get_override</span></code>.
+        <span class="inlinemediaobject"><img src="../images/alert.png" alt="alert"></span> <span class="bold"><b>MSVC6/7 Workaround</b></span>
      </p>
 <p>
-        Finally, exposing <code class="computeroutput"><span class="identifier">Base</span></code>:
+        If you are using Microsoft Visual C++ 6 or 7, you have to write <tt class="computeroutput"><span class="identifier">f</span></tt> as:
+      </p>
+<p>
+        <tt class="computeroutput"><span class="keyword">return</span> <span class="identifier">call</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="keyword">this</span><span class="special">-&gt;</span><span class="identifier">get_override</span><span class="special">(</span><span class="string">"f"</span><span class="special">).</span><span class="identifier">ptr</span><span class="special">());</span></tt>.
+      </p>
+</div>
+<p>
+        BaseWrap's overridden virtual member function <tt class="computeroutput"><span class="identifier">f</span></tt>
+        in effect calls the corresponding method of the Python object through <tt class="computeroutput"><span class="identifier">get_override</span></tt>.
+      </p>
+<p>
+        Finally, exposing <tt class="computeroutput"><span class="identifier">Base</span></tt>:
      </p>
 <pre class="programlisting">
 <span class="identifier">class_</span><span class="special">&lt;</span><span class="identifier">BaseWrap</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">noncopyable</span><span class="special">&gt;(</span><span class="string">"Base"</span><span class="special">)</span>
@@ -399,17 +403,24 @@
    <span class="special">;</span>
 </pre>
 <p>
-        <code class="computeroutput"><span class="identifier">pure_virtual</span></code> signals Boost.Python
-        that the function <code class="computeroutput"><span class="identifier">f</span></code> is a
+        <tt class="computeroutput"><span class="identifier">pure_virtual</span></tt> signals Boost.Python
+        that the function <tt class="computeroutput"><span class="identifier">f</span></tt> is a
        pure virtual function.
      </p>
-<div class="informaltable"><table class="table">
-<colgroup><col></colgroup>
-<tbody><tr><td class="blurb"> <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> <span class="bold"><strong>member function and
-              methods</strong></span><br> <br> Python, like many object oriented languages
-              uses the term <span class="bold"><strong>methods</strong></span>. Methods correspond
-              roughly to C++'s <span class="bold"><strong>member functions</strong></span>
-</td></tr></tbody>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/html/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top">
+<p>
+          <span class="bold"><b>member function and methods</b></span>
+        </p>
+<p>
+          Python, like many object oriented languages uses the term <span class="bold"><b>methods</b></span>.
+          Methods correspond roughly to C++'s <span class="bold"><b>member functions</b></span>
+        </p>
+</td></tr>
 </table></div>
 </div>
 <div class="section" lang="en">
@@ -418,7 +429,7 @@
 <p>
        We've seen in the previous section how classes with pure virtual functions
        are wrapped using Boost.Python's <a href="../../../../v2/wrapper.html" target="_top">class
-        wrapper</a> facilities. If we wish to wrap <span class="bold"><strong>non</strong></span>-pure-virtual
+        wrapper</a> facilities. If we wish to wrap <span class="bold"><b>non</b></span>-pure-virtual
        functions instead, the mechanism is a bit different.
      </p>
 <p>
@@ -433,8 +444,8 @@
 <span class="special">};</span>
 </pre>
 <p>
-        had a pure virtual function <code class="literal">f</code>. If, however, its member
-        function <code class="literal">f</code> was not declared as pure virtual:
+        had a pure virtual function <tt class="literal">f</tt>. If, however, its member
+        function <tt class="literal">f</tt> was not declared as pure virtual:
      </p>
 <pre class="programlisting">
 <span class="keyword">struct</span> <span class="identifier">Base</span>
@@ -460,16 +471,22 @@
 <span class="special">};</span>
 </pre>
 <p>
-        Notice how we implemented <code class="computeroutput"><span class="identifier">BaseWrap</span><span class="special">::</span><span class="identifier">f</span></code>. Now,
-        we have to check if there is an override for <code class="computeroutput"><span class="identifier">f</span></code>.
-        If none, then we call <code class="computeroutput"><span class="identifier">Base</span><span class="special">::</span><span class="identifier">f</span><span class="special">()</span></code>.
+        Notice how we implemented <tt class="computeroutput"><span class="identifier">BaseWrap</span><span class="special">::</span><span class="identifier">f</span></tt>. Now,
+        we have to check if there is an override for <tt class="computeroutput"><span class="identifier">f</span></tt>.
+        If none, then we call <tt class="computeroutput"><span class="identifier">Base</span><span class="special">::</span><span class="identifier">f</span><span class="special">()</span></tt>.
      </p>
-<div class="informaltable"><table class="table">
-<colgroup><col></colgroup>
-<tbody><tr><td class="blurb"> <span class="inlinemediaobject"><img src="../images/alert.png" alt="alert"></span> <span class="bold"><strong>MSVC6/7 Workaround</strong></span><br>
-              <br> If you are using Microsoft Visual C++ 6 or 7, you have to rewrite
-              the line with the <code class="computeroutput"><span class="special">*</span><span class="identifier">note</span><span class="special">*</span></code> as:<br> <br> <code class="computeroutput"><span class="keyword">return</span> <span class="identifier">call</span><span class="special">&lt;</span><span class="keyword">char</span> <span class="keyword">const</span><span class="special">*&gt;(</span><span class="identifier">f</span><span class="special">.</span><span class="identifier">ptr</span><span class="special">());</span></code>.</td></tr></tbody>
-</table></div>
+<div class="sidebar">
+<p>
+        <span class="inlinemediaobject"><img src="../images/alert.png" alt="alert"></span> <span class="bold"><b>MSVC6/7 Workaround</b></span>
+      </p>
+<p>
+        If you are using Microsoft Visual C++ 6 or 7, you have to rewrite the line
+        with the <tt class="computeroutput"><span class="special">*</span><span class="identifier">note</span><span class="special">*</span></tt> as:
+      </p>
+<p>
+        <tt class="computeroutput"><span class="keyword">return</span> <span class="identifier">call</span><span class="special">&lt;</span><span class="keyword">char</span> <span class="keyword">const</span><span class="special">*&gt;(</span><span class="identifier">f</span><span class="special">.</span><span class="identifier">ptr</span><span class="special">());</span></tt>.
+      </p>
+</div>
 <p>
        Finally, exposing:
      </p>
@@ -479,10 +496,10 @@
    <span class="special">;</span>
 </pre>
 <p>
-        Take note that we expose both <code class="computeroutput"><span class="special">&amp;</span><span class="identifier">Base</span><span class="special">::</span><span class="identifier">f</span></code> and <code class="computeroutput"><span class="special">&amp;</span><span class="identifier">BaseWrap</span><span class="special">::</span><span class="identifier">default_f</span></code>. Boost.Python needs to keep track
-        of 1) the dispatch function <code class="literal">f</code> and 2) the forwarding function
-        to its default implementation <code class="literal">default_f</code>. There's a special
-        <code class="literal">def</code> function for this purpose.
+        Take note that we expose both <tt class="computeroutput"><span class="special">&amp;</span><span class="identifier">Base</span><span class="special">::</span><span class="identifier">f</span></tt> and <tt class="computeroutput"><span class="special">&amp;</span><span class="identifier">BaseWrap</span><span class="special">::</span><span class="identifier">default_f</span></tt>. Boost.Python needs to keep track
+        of 1) the dispatch function <tt class="literal">f</tt> and 2) the forwarding function
+        to its default implementation <tt class="literal">default_f</tt>. There's a special
+        <tt class="literal">def</tt> function for this purpose.
      </p>
 <p>
        In Python, the results would be as expected:
@@ -498,14 +515,14 @@
 <span class="special">&gt;&gt;&gt;</span> <span class="identifier">derived</span> <span class="special">=</span> <span class="identifier">Derived</span><span class="special">()</span>
 </pre>
 <p>
-        Calling <code class="literal">base.f()</code>:
+        Calling <tt class="literal">base.f()</tt>:
      </p>
 <pre class="programlisting">
 <span class="special">&gt;&gt;&gt;</span> <span class="identifier">base</span><span class="special">.</span><span class="identifier">f</span><span class="special">()</span>
 <span class="number">0</span>
 </pre>
 <p>
-        Calling <code class="literal">derived.f()</code>:
+        Calling <tt class="literal">derived.f()</tt>:
      </p>
 <pre class="programlisting">
 <span class="special">&gt;&gt;&gt;</span> <span class="identifier">derived</span><span class="special">.</span><span class="identifier">f</span><span class="special">()</span>
@@ -515,17 +532,17 @@
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="python.class_operators_special_functions"></a>Class Operators/Special Functions</h3></div></div></div>
-<a name="class_operators_special_functions.python_operators"></a><h3>
-<a name="id3142031"></a>
+<a name="class_operators_special_functions.python_operators"></a><h2>
+<a name="id461460"></a>
        Python Operators
-      </h3>
+      </h2>
 <p>
        C is well known for the abundance of operators. C++ extends this to the extremes
        by allowing operator overloading. Boost.Python takes advantage of this and
        makes it easy to wrap C++ operator-powered classes.
      </p>
 <p>
-        Consider a file position class <code class="literal">FilePos</code> and a set of operators
+        Consider a file position class <tt class="literal">FilePos</tt> and a set of operators
        that take on FilePos instances:
      </p>
 <p>
@@ -558,16 +575,16 @@
 <p>
        The code snippet above is very clear and needs almost no explanation at all.
        It is virtually the same as the operators' signatures. Just take note that
-        <code class="literal">self</code> refers to FilePos object. Also, not every class
-        <code class="literal">T</code> that you might need to interact with in an operator
-        expression is (cheaply) default-constructible. You can use <code class="literal">other&lt;T&gt;()</code>
-        in place of an actual <code class="literal">T</code> instance when writing "self
+        <tt class="literal">self</tt> refers to FilePos object. Also, not every class
+        <tt class="literal">T</tt> that you might need to interact with in an operator
+        expression is (cheaply) default-constructible. You can use <tt class="literal">other&lt;T&gt;()</tt>
+        in place of an actual <tt class="literal">T</tt> instance when writing "self
        expressions".
      </p>
-<a name="class_operators_special_functions.special_methods"></a><h3>
-<a name="id3142715"></a>
+<a name="class_operators_special_functions.special_methods"></a><h2>
+<a name="id462216"></a>
        Special Methods
-      </h3>
+      </h2>
 <p>
        Python has a few more <span class="emphasis"><em>Special Methods</em></span>. Boost.Python
        supports all of the standard special method names supported by real Python
@@ -593,21 +610,31 @@
 <p>
        Need we say more?
      </p>
-<div class="informaltable"><table class="table">
-<colgroup><col></colgroup>
-<tbody><tr><td class="blurb"> <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> What is the business of <code class="computeroutput"><span class="keyword">operator</span><span class="special">&lt;&lt;</span></code>? Well, the method <code class="computeroutput"><span class="identifier">str</span></code> requires the <code class="computeroutput"><span class="keyword">operator</span><span class="special">&lt;&lt;</span></code> to do its work (i.e. <code class="computeroutput"><span class="keyword">operator</span><span class="special">&lt;&lt;</span></code>
-              is used by the method defined by <code class="computeroutput"><span class="identifier">def</span><span class="special">(</span><span class="identifier">str</span><span class="special">(</span><span class="identifier">self</span><span class="special">))</span></code>.</td></tr></tbody>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/html/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top"><p>
+          What is the business of <tt class="computeroutput"><span class="keyword">operator</span><span class="special">&lt;&lt;</span></tt>? Well, the method <tt class="computeroutput"><span class="identifier">str</span></tt> requires the <tt class="computeroutput"><span class="keyword">operator</span><span class="special">&lt;&lt;</span></tt> to do its work (i.e. <tt class="computeroutput"><span class="keyword">operator</span><span class="special">&lt;&lt;</span></tt>
+          is used by the method defined by <tt class="computeroutput"><span class="identifier">def</span><span class="special">(</span><span class="identifier">str</span><span class="special">(</span><span class="identifier">self</span><span class="special">))</span></tt>.
+        </p></td></tr>
 </table></div>
 </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"><small>Copyright © 2002-2005 Joel
-      de Guzman, David Abrahams</small></td>
+<td align="right"><div class="copyright-footer">Copyright © 2002-2005 Joel
+      de Guzman, David Abrahams<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>
+</div></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="hello.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="functions.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="hello.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="functions.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/tutorial/doc/html/python/functions.html
+++ b/doc/tutorial/doc/html/python/functions.html
@@ -2,25 +2,25 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Functions</title>
-<link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Chapter 1. python 1.0">
 <link rel="up" href="../index.html" title="Chapter 1. python 1.0">
-<link rel="prev" href="exposing.html" title="Exposing Classes">
-<link rel="next" href="object.html" title="Object Interface">
+<link rel="prev" href="exposing.html" title=" Exposing Classes">
+<link rel="next" href="object.html" title=" Object Interface">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%">
+<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.htm">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
 <td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
 <td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</table>
+</tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="exposing.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="object.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="exposing.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="object.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -33,17 +33,23 @@
 </dl></div>
 <p>
      In this chapter, we'll look at Boost.Python powered functions in closer detail.
-      We shall see some facilities to make exposing C++ functions to Python safe
-      from potential pifalls such as dangling pointers and references. We shall also
-      see facilities that will make it even easier for us to expose C++ functions
-      that take advantage of C++ features such as overloading and default arguments.
+      We will see some facilities to make exposing C++ functions to Python safe from
+      potential pifalls such as dangling pointers and references. We will also see
+      facilities that will make it even easier for us to expose C++ functions that
+      take advantage of C++ features such as overloading and default arguments.
    </p>
-<div class="blockquote"><blockquote class="blockquote"><p>
-        <span class="emphasis"><em>Read on...</em></span>
-      </p></blockquote></div>
+<div class="blockquote"><blockquote class="blockquote">
+<p>
+        </p>
+<p>
+          <span class="emphasis"><em>Read on...</em></span>
+        </p>
+<p>
+      </p>
+</blockquote></div>
 <p>
      But before you do, you might want to fire up Python 2.2 or later and type
-      <code class="literal">&gt;&gt;&gt; import this</code>.
+      <tt class="literal">&gt;&gt;&gt; import this</tt>.
    </p>
 <pre class="programlisting">&gt;&gt;&gt; import this
 The Zen of Python, by Tim Peters
@@ -62,7 +68,7 @@ In the face of ambiguity, refuse the temptation to guess.
 There should be one-- and preferably only one --obvious way to do it
 Although that way may not be obvious at first unless you're Dutch.
 Now is better than never.
-Although never is often better than <span class="bold"><strong>right</strong></span> now.
+Although never is often better than <span class="bold"><b>right</b></span> now.
 If the implementation is hard to explain, it's a bad idea.
 If the implementation is easy to explain, it may be a good idea.
 Namespaces are one honking great idea -- let's do more of those!
@@ -90,9 +96,9 @@ Namespaces are one honking great idea -- let's do more of those!
        Here's an example where it didn't
      </p>
 <pre class="programlisting">
-<span class="special">&gt;&gt;&gt;</span> <span class="identifier">x</span> <span class="special">=</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">y</span><span class="special">,</span> <span class="identifier">z</span><span class="special">)</span> # <span class="identifier">x</span> <span class="identifier">refers</span> <span class="identifier">to</span> <span class="identifier">some</span> <span class="identifier">C</span><span class="special">++</span> <span class="identifier">X</span>
+<span class="special">&gt;&gt;&gt;</span> <span class="identifier">x</span> <span class="special">=</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">y</span><span class="special">,</span> <span class="identifier">z</span><span class="special">)</span> <span class="preprocessor"># x</span> <span class="identifier">refers</span> <span class="identifier">to</span> <span class="identifier">some</span> <span class="identifier">C</span><span class="special">++</span> <span class="identifier">X</span>
 <span class="special">&gt;&gt;&gt;</span> <span class="identifier">del</span> <span class="identifier">y</span>
-<span class="special">&gt;&gt;&gt;</span> <span class="identifier">x</span><span class="special">.</span><span class="identifier">some_method</span><span class="special">()</span> # <span class="identifier">CRASH</span><span class="special">!</span>
+<span class="special">&gt;&gt;&gt;</span> <span class="identifier">x</span><span class="special">.</span><span class="identifier">some_method</span><span class="special">()</span> <span class="preprocessor"># CRASH</span><span class="special">!</span>
 </pre>
 <p>
        What's the problem?
@@ -120,19 +126,19 @@ Namespaces are one honking great idea -- let's do more of those!
      </p>
 <div class="orderedlist"><ol type="1">
 <li>
-<code class="literal">f</code> is called passing in a reference to <code class="literal">y</code>
-          and a pointer to <code class="literal">z</code>
+<tt class="literal">f</tt> is called passing in a reference to <tt class="literal">y</tt>
+          and a pointer to <tt class="literal">z</tt>
 </li>
 <li>
-          A reference to <code class="literal">y.x</code> is returned
+          A reference to <tt class="literal">y.x</tt> is returned
        </li>
 <li>
-<code class="literal">y</code> is deleted. <code class="literal">x</code> is a dangling reference
+<tt class="literal">y</tt> is deleted. <tt class="literal">x</tt> is a dangling reference
        </li>
 <li>
-<code class="literal">x.some_method()</code> is called
+<tt class="literal">x.some_method()</tt> is called
        </li>
-<li><span class="bold"><strong>BOOM!</strong></span></li>
+<li><span class="bold"><b>BOOM!</b></span></li>
 </ol></div>
 <p>
        We could copy result into a new object:
@@ -162,16 +168,16 @@ Namespaces are one honking great idea -- let's do more of those!
 <span class="special">};</span>
 </pre>
 <p>
-        Notice that the data member <code class="literal">z</code> is held by class Y using
+        Notice that the data member <tt class="literal">z</tt> is held by class Y using
        a raw pointer. Now we have a potential dangling pointer problem inside Y:
      </p>
 <pre class="programlisting">
-<span class="special">&gt;&gt;&gt;</span> <span class="identifier">x</span> <span class="special">=</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">y</span><span class="special">,</span> <span class="identifier">z</span><span class="special">)</span> # <span class="identifier">y</span> <span class="identifier">refers</span> <span class="identifier">to</span> <span class="identifier">z</span>
-<span class="special">&gt;&gt;&gt;</span> <span class="identifier">del</span> <span class="identifier">z</span>       # <span class="identifier">Kill</span> <span class="identifier">the</span> <span class="identifier">z</span> <span class="identifier">object</span>
-<span class="special">&gt;&gt;&gt;</span> <span class="identifier">y</span><span class="special">.</span><span class="identifier">z_value</span><span class="special">()</span> # <span class="identifier">CRASH</span><span class="special">!</span>
+<span class="special">&gt;&gt;&gt;</span> <span class="identifier">x</span> <span class="special">=</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">y</span><span class="special">,</span> <span class="identifier">z</span><span class="special">)</span> <span class="preprocessor"># y</span> <span class="identifier">refers</span> <span class="identifier">to</span> <span class="identifier">z</span>
+<span class="special">&gt;&gt;&gt;</span> <span class="identifier">del</span> <span class="identifier">z</span>       <span class="preprocessor"># Kill</span> <span class="identifier">the</span> <span class="identifier">z</span> <span class="identifier">object</span>
+<span class="special">&gt;&gt;&gt;</span> <span class="identifier">y</span><span class="special">.</span><span class="identifier">z_value</span><span class="special">()</span> <span class="preprocessor"># CRASH</span><span class="special">!</span>
 </pre>
 <p>
-        For reference, here's the implementation of <code class="literal">f</code> again:
+        For reference, here's the implementation of <tt class="literal">f</tt> again:
      </p>
 <pre class="programlisting">
 <span class="identifier">X</span><span class="special">&amp;</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">Y</span><span class="special">&amp;</span> <span class="identifier">y</span><span class="special">,</span> <span class="identifier">Z</span><span class="special">*</span> <span class="identifier">z</span><span class="special">)</span>
@@ -185,33 +191,33 @@ Namespaces are one honking great idea -- let's do more of those!
      </p>
 <div class="orderedlist"><ol type="1">
 <li>
-<code class="literal">f</code> is called passing in a reference to <code class="literal">y</code>
-          and a pointer to <code class="literal">z</code>
+<tt class="literal">f</tt> is called passing in a reference to <tt class="literal">y</tt>
+          and a pointer to <tt class="literal">z</tt>
 </li>
 <li>
-          A pointer to <code class="literal">z</code> is held by <code class="literal">y</code>
+          A pointer to <tt class="literal">z</tt> is held by <tt class="literal">y</tt>
 </li>
 <li>
-          A reference to <code class="literal">y.x</code> is returned
+          A reference to <tt class="literal">y.x</tt> is returned
        </li>
 <li>
-<code class="literal">z</code> is deleted. <code class="literal">y.z</code> is a dangling pointer
+<tt class="literal">z</tt> is deleted. <tt class="literal">y.z</tt> is a dangling pointer
        </li>
 <li>
-<code class="literal">y.z_value()</code> is called
+<tt class="literal">y.z_value()</tt> is called
        </li>
 <li>
-<code class="literal">z-&gt;value()</code> is called
+<tt class="literal">z-&gt;value()</tt> is called
        </li>
-<li><span class="bold"><strong>BOOM!</strong></span></li>
+<li><span class="bold"><b>BOOM!</b></span></li>
 </ol></div>
-<a name="call_policies.call_policies"></a><h3>
-<a name="id3144432"></a>
+<a name="call_policies.call_policies"></a><h2>
+<a name="id464076"></a>
        Call Policies
-      </h3>
+      </h2>
 <p>
        Call Policies may be used in situations such as the example detailed above.
-        In our example, <code class="literal">return_internal_reference</code> and <code class="literal">with_custodian_and_ward</code>
+        In our example, <tt class="literal">return_internal_reference</tt> and <tt class="literal">with_custodian_and_ward</tt>
        are our friends:
      </p>
 <pre class="programlisting">
@@ -220,27 +226,27 @@ Namespaces are one honking great idea -- let's do more of those!
        <span class="identifier">with_custodian_and_ward</span><span class="special">&lt;</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">&gt;</span> <span class="special">&gt;());</span>
 </pre>
 <p>
-        What are the <code class="literal">1</code> and <code class="literal">2</code> parameters, you
+        What are the <tt class="literal">1</tt> and <tt class="literal">2</tt> parameters, you
        ask?
      </p>
 <pre class="programlisting">
 <span class="identifier">return_internal_reference</span><span class="special">&lt;</span><span class="number">1</span>
 </pre>
 <p>
-        Informs Boost.Python that the first argument, in our case <code class="literal">Y&amp;
-        y</code>, is the owner of the returned reference: <code class="literal">X&amp;</code>.
-        The "<code class="literal">1</code>" simply specifies the first argument.
-        In short: "return an internal reference <code class="literal">X&amp;</code> owned
-        by the 1st argument <code class="literal">Y&amp; y</code>".
+        Informs Boost.Python that the first argument, in our case <tt class="literal">Y&amp;
+        y</tt>, is the owner of the returned reference: <tt class="literal">X&amp;</tt>.
+        The "<tt class="literal">1</tt>" simply specifies the first argument.
+        In short: "return an internal reference <tt class="literal">X&amp;</tt> owned
+        by the 1st argument <tt class="literal">Y&amp; y</tt>".
      </p>
 <pre class="programlisting">
 <span class="identifier">with_custodian_and_ward</span><span class="special">&lt;</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">&gt;</span>
 </pre>
 <p>
        Informs Boost.Python that the lifetime of the argument indicated by ward
-        (i.e. the 2nd argument: <code class="literal">Z* z</code>) is dependent on the lifetime
-        of the argument indicated by custodian (i.e. the 1st argument: <code class="literal">Y&amp;
-        y</code>).
+        (i.e. the 2nd argument: <tt class="literal">Z* z</tt>) is dependent on the lifetime
+        of the argument indicated by custodian (i.e. the 1st argument: <tt class="literal">Y&amp;
+        y</tt>).
      </p>
 <p>
        It is also important to note that we have defined two policies above. Two
@@ -257,43 +263,48 @@ Namespaces are one honking great idea -- let's do more of those!
      </p>
 <div class="itemizedlist"><ul type="disc">
 <li>
-<span class="bold"><strong>with_custodian_and_ward</strong></span><br> Ties lifetimes
+<span class="bold"><b>with_custodian_and_ward</b></span>: Ties lifetimes
          of the arguments
        </li>
 <li>
-<span class="bold"><strong>with_custodian_and_ward_postcall</strong></span><br>
-          Ties lifetimes of the arguments and results
+<span class="bold"><b>with_custodian_and_ward_postcall</b></span>: Ties
+          lifetimes of the arguments and results
        </li>
 <li>
-<span class="bold"><strong>return_internal_reference</strong></span><br> Ties lifetime
+<span class="bold"><b>return_internal_reference</b></span>: Ties lifetime
          of one argument to that of result
        </li>
 <li>
-<span class="bold"><strong>return_value_policy&lt;T&gt; with T one of:</strong></span><br>
-</li>
+<span class="bold"><b>return_value_policy&lt;T&gt; with T one of:</b></span><div class="itemizedlist"><ul type="circle">
 <li>
-<span class="bold"><strong>reference_existing_object</strong></span><br> naive
-          (dangerous) approach
-        </li>
+<span class="bold"><b>reference_existing_object</b></span>: naive (dangerous)
+              approach
+            </li>
 <li>
-<span class="bold"><strong>copy_const_reference</strong></span><br> Boost.Python
-          v1 approach
-        </li>
+<span class="bold"><b>copy_const_reference</b></span>: Boost.Python
+              v1 approach
+            </li>
 <li>
-<span class="bold"><strong>copy_non_const_reference</strong></span><br>
-</li>
+<span class="bold"><b>copy_non_const_reference</b></span>:
+            </li>
 <li>
-<span class="bold"><strong>manage_new_object</strong></span><br> Adopt a pointer
-          and hold the instance
-        </li>
+<span class="bold"><b>manage_new_object</b></span>: Adopt a pointer
+              and hold the instance
+            </li>
 </ul></div>
-<div class="informaltable"><table class="table">
-<colgroup><col></colgroup>
-<tbody><tr><td class="blurb"> <span class="inlinemediaobject"><img src="../images/smiley.png" alt="smiley"></span> <span class="bold"><strong>Remember the Zen, Luke:</strong></span><br>
-              <br> "Explicit is better than implicit"<br> "In
-              the face of ambiguity, refuse the temptation to guess"<br>
-              </td></tr></tbody>
-</table></div>
+</li>
+</ul></div>
+<div class="sidebar">
+<p>
+        <span class="inlinemediaobject"><img src="../images/smiley.png" alt="smiley"></span> <span class="bold"><b>Remember the Zen, Luke:</b></span>
+      </p>
+<p>
+        "Explicit is better than implicit"
+      </p>
+<p>
+        "In the face of ambiguity, refuse the temptation to guess"
+      </p>
+</div>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
@@ -331,7 +342,7 @@ Namespaces are one honking great idea -- let's do more of those!
 <span class="special">};</span>
 </pre>
 <p>
-        Class X has 4 overloaded functions. We shall start by introducing some member
+        Class X has 4 overloaded functions. We will start by introducing some member
        function pointer variables:
      </p>
 <pre class="programlisting">
@@ -355,21 +366,21 @@ Namespaces are one honking great idea -- let's do more of those!
 <a name="python.default_arguments"></a>Default Arguments</h3></div></div></div>
 <p>
        Boost.Python wraps (member) function pointers. Unfortunately, C++ function
-        pointers carry no default argument info. Take a function <code class="literal">f</code>
+        pointers carry no default argument info. Take a function <tt class="literal">f</tt>
        with default arguments:
      </p>
 <pre class="programlisting">
 <span class="keyword">int</span> <span class="identifier">f</span><span class="special">(</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">double</span> <span class="special">=</span> <span class="number">3.14</span><span class="special">,</span> <span class="keyword">char</span> <span class="keyword">const</span><span class="special">*</span> <span class="special">=</span> <span class="string">"hello"</span><span class="special">);</span>
 </pre>
 <p>
-        But the type of a pointer to the function <code class="literal">f</code> has no information
+        But the type of a pointer to the function <tt class="literal">f</tt> has no information
        about its default arguments:
      </p>
 <pre class="programlisting">
 <span class="keyword">int</span><span class="special">(*</span><span class="identifier">g</span><span class="special">)(</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">char</span> <span class="keyword">const</span><span class="special">*)</span> <span class="special">=</span> <span class="identifier">f</span><span class="special">;</span>    <span class="comment">// defaults lost!
 </span></pre>
 <p>
-        When we pass this function pointer to the <code class="literal">def</code> function,
+        When we pass this function pointer to the <tt class="literal">def</tt> function,
        there is no way to retrieve the default arguments:
      </p>
 <pre class="programlisting">
@@ -403,10 +414,10 @@ Namespaces are one honking great idea -- let's do more of those!
          are overloaded with a common sequence of initial arguments
        </li>
 </ul></div>
-<a name="default_arguments.boost_python_function_overloads"></a><h3>
-<a name="id3146300"></a>
+<a name="default_arguments.boost_python_function_overloads"></a><h2>
+<a name="id466117"></a>
        BOOST_PYTHON_FUNCTION_OVERLOADS
-      </h3>
+      </h2>
 <p>
        Boost.Python now has a way to make it easier. For instance, given a function:
      </p>
@@ -424,19 +435,19 @@ Namespaces are one honking great idea -- let's do more of those!
 </pre>
 <p>
        will automatically create the thin wrappers for us. This macro will create
-        a class <code class="literal">foo_overloads</code> that can be passed on to <code class="literal">def(...)</code>.
+        a class <tt class="literal">foo_overloads</tt> that can be passed on to <tt class="literal">def(...)</tt>.
        The third and fourth macro argument are the minimum arguments and maximum
-        arguments, respectively. In our <code class="literal">foo</code> function the minimum
-        number of arguments is 1 and the maximum number of arguments is 4. The <code class="literal">def(...)</code>
+        arguments, respectively. In our <tt class="literal">foo</tt> function the minimum
+        number of arguments is 1 and the maximum number of arguments is 4. The <tt class="literal">def(...)</tt>
        function will automatically add all the foo variants for us:
      </p>
 <pre class="programlisting">
 <span class="identifier">def</span><span class="special">(</span><span class="string">"foo"</span><span class="special">,</span> <span class="identifier">foo</span><span class="special">,</span> <span class="identifier">foo_overloads</span><span class="special">());</span>
 </pre>
-<a name="default_arguments.boost_python_member_function_overloads"></a><h3>
-<a name="id3146587"></a>
+<a name="default_arguments.boost_python_member_function_overloads"></a><h2>
+<a name="id466436"></a>
        BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS
-      </h3>
+      </h2>
 <p>
        Objects here, objects there, objects here there everywhere. More frequently
        than anything else, we need to expose member functions of our classes to
@@ -445,7 +456,7 @@ Namespaces are one honking great idea -- let's do more of those!
        play. Another macro is provided to make this a breeze.
      </p>
 <p>
-        Like <code class="literal">BOOST_PYTHON_FUNCTION_OVERLOADS</code>, <code class="literal">BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</code>
+        Like <tt class="literal">BOOST_PYTHON_FUNCTION_OVERLOADS</tt>, <tt class="literal">BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</tt>
        may be used to automatically create the thin wrappers for wrapping member
        functions. Let's have an example:
      </p>
@@ -466,11 +477,11 @@ Namespaces are one honking great idea -- let's do more of those!
 <span class="identifier">BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</span><span class="special">(</span><span class="identifier">george_overloads</span><span class="special">,</span> <span class="identifier">wack_em</span><span class="special">,</span> <span class="number">1</span><span class="special">,</span> <span class="number">3</span><span class="special">)</span>
 </pre>
 <p>
-        will generate a set of thin wrappers for george's <code class="literal">wack_em</code>
+        will generate a set of thin wrappers for george's <tt class="literal">wack_em</tt>
        member function accepting a minimum of 1 and a maximum of 3 arguments (i.e.
        the third and fourth macro argument). The thin wrappers are all enclosed
-        in a class named <code class="literal">george_overloads</code> that can then be used
-        as an argument to <code class="literal">def(...)</code>:
+        in a class named <tt class="literal">george_overloads</tt> that can then be used
+        as an argument to <tt class="literal">def(...)</tt>:
      </p>
 <pre class="programlisting">
 <span class="special">.</span><span class="identifier">def</span><span class="special">(</span><span class="string">"wack_em"</span><span class="special">,</span> <span class="special">&amp;</span><span class="identifier">george</span><span class="special">::</span><span class="identifier">wack_em</span><span class="special">,</span> <span class="identifier">george_overloads</span><span class="special">());</span>
@@ -479,13 +490,13 @@ Namespaces are one honking great idea -- let's do more of those!
        See the <a href="../../../../v2/overloads.html#BOOST_PYTHON_FUNCTION_OVERLOADS-spec" target="_top">overloads
        reference</a> for details.
      </p>
-<a name="default_arguments.init_and_optional"></a><h3>
-<a name="id3146923"></a>
+<a name="default_arguments.init_and_optional"></a><h2>
+<a name="id466799"></a>
        init and optional
-      </h3>
+      </h2>
 <p>
        A similar facility is provided for class constructors, again, with default
-        arguments or a sequence of overloads. Remember <code class="literal">init&lt;...&gt;</code>?
+        arguments or a sequence of overloads. Remember <tt class="literal">init&lt;...&gt;</tt>?
        For example, given a class X with a constructor:
      </p>
 <pre class="programlisting">
@@ -502,7 +513,7 @@ Namespaces are one honking great idea -- let's do more of those!
 <span class="special">.</span><span class="identifier">def</span><span class="special">(</span><span class="identifier">init</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="identifier">optional</span><span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="special">&gt;())</span>
 </pre>
 <p>
-        Notice the use of <code class="literal">init&lt;...&gt;</code> and <code class="literal">optional&lt;...&gt;</code>
+        Notice the use of <tt class="literal">init&lt;...&gt;</tt> and <tt class="literal">optional&lt;...&gt;</tt>
        to signify the default (optional arguments).
      </p>
 </div>
@@ -510,8 +521,8 @@ Namespaces are one honking great idea -- let's do more of those!
 <div class="titlepage"><div><div><h3 class="title">
 <a name="python.auto_overloading"></a>Auto-Overloading</h3></div></div></div>
 <p>
-        It was mentioned in passing in the previous section that <code class="literal">BOOST_PYTHON_FUNCTION_OVERLOADS</code>
-        and <code class="literal">BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</code> can also be
+        It was mentioned in passing in the previous section that <tt class="literal">BOOST_PYTHON_FUNCTION_OVERLOADS</tt>
+        and <tt class="literal">BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</tt> can also be
        used for overloaded functions and member functions with a common sequence
        of initial arguments. Here is an example:
      </p>
@@ -553,24 +564,24 @@ Namespaces are one honking great idea -- let's do more of those!
        Notice though that we have a situation now where we have a minimum of zero
        (0) arguments and a maximum of 3 arguments.
      </p>
-<a name="auto_overloading.manual_wrapping"></a><h3>
-<a name="id3147627"></a>
+<a name="auto_overloading.manual_wrapping"></a><h2>
+<a name="id467581"></a>
        Manual Wrapping
-      </h3>
+      </h2>
 <p>
-        It is important to emphasize however that <span class="bold"><strong>the overloaded
-        functions must have a common sequence of initial arguments</strong></span>. Otherwise,
+        It is important to emphasize however that <span class="bold"><b>the overloaded
+        functions must have a common sequence of initial arguments</b></span>. Otherwise,
        our scheme above will not work. If this is not the case, we have to wrap
        our functions <a href="functions.html#python.overloading" title="Overloading">manually</a>.
      </p>
 <p>
        Actually, we can mix and match manual wrapping of overloaded functions and
-        automatic wrapping through <code class="literal">BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</code>
-        and its sister, <code class="literal">BOOST_PYTHON_FUNCTION_OVERLOADS</code>. Following
+        automatic wrapping through <tt class="literal">BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</tt>
+        and its sister, <tt class="literal">BOOST_PYTHON_FUNCTION_OVERLOADS</tt>. Following
        up on our example presented in the section <a href="functions.html#python.overloading" title="Overloading">on
        overloading</a>, since the first 4 overload functins have a common sequence
-        of initial arguments, we can use <code class="literal">BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</code>
-        to automatically wrap the first three of the <code class="literal">def</code>s and
+        of initial arguments, we can use <tt class="literal">BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</tt>
+        to automatically wrap the first three of the <tt class="literal">def</tt>s and
        manually wrap just the last. Here's how we'll do this:
      </p>
 <pre class="programlisting">
@@ -594,12 +605,17 @@ Namespaces are one honking great idea -- let's do more of those!
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><small>Copyright © 2002-2005 Joel
-      de Guzman, David Abrahams</small></td>
+<td align="right"><div class="copyright-footer">Copyright © 2002-2005 Joel
+      de Guzman, David Abrahams<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>
+</div></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="exposing.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="object.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="exposing.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="object.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/tutorial/doc/html/python/hello.html
+++ b/doc/tutorial/doc/html/python/hello.html
@@ -1,82 +1,71 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Building Hello World</title>
-<link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<title> Building Hello World</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Chapter 1. python 1.0">
 <link rel="up" href="../index.html" title="Chapter 1. python 1.0">
 <link rel="prev" href="../index.html" title="Chapter 1. python 1.0">
-<link rel="next" href="exposing.html" title="Exposing Classes">
+<link rel="next" href="exposing.html" title=" Exposing Classes">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%">
+<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.htm">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
 <td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
 <td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</table>
+</tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../index.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="exposing.html"><img src="../images/next.png" alt="Next"></a>
+<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="exposing.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="python.hello"></a> Building Hello World</h2></div></div></div>
-<a name="hello.from_start_to_finish"></a><h3>
-<a name="id3091224"></a>
+<a name="hello.from_start_to_finish"></a><h2>
+<a name="id387672"></a>
      From Start To Finish
-    </h3>
+    </h2>
 <p>
      Now the first thing you'd want to do is to build the Hello World module and
-      try it for yourself in Python. In this section, we shall outline the steps
-      necessary to achieve that. We shall use the build tool that comes bundled with
-      every boost distribution: <span class="bold"><strong>bjam</strong></span>.
+      try it for yourself in Python. In this section, we will outline the steps necessary
+      to achieve that. We will use the build tool that comes bundled with every boost
+      distribution: <span class="bold"><b>bjam</b></span>.
    </p>
-<div class="informaltable"><table class="table">
-<colgroup><col></colgroup>
-<tbody><tr><td class="blurb"> <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> <span class="bold"><strong>Building without bjam</strong></span><br>
-            <br> Besides bjam, there are of course other ways to get your module
-            built. What's written here should not be taken as "the one and only
-            way". There are of course other build tools apart from <code class="literal">bjam</code>.<br>
-            <br> Take note however that the preferred build tool for Boost.Python
-            is bjam. There are so many ways to set up the build incorrectly. Experience
-            shows that 90% of the "I can't build Boost.Python" problems
-            come from people who had to use a different tool. </td></tr></tbody>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/html/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top">
+<p>
+        <span class="bold"><b>Building without bjam</b></span>
+      </p>
+<p>
+        Besides bjam, there are of course other ways to get your module built. What's
+        written here should not be taken as "the one and only way". There
+        are of course other build tools apart from <tt class="literal">bjam</tt>.
+      </p>
+<p>
+        Take note however that the preferred build tool for Boost.Python is bjam.
+        There are so many ways to set up the build incorrectly. Experience shows
+        that 90% of the "I can't build Boost.Python" problems come from
+        people who had to use a different tool.
+      </p>
+</td></tr>
 </table></div>
 <p>
-      We shall skip over the details. Our objective will be to simply create the
-      hello world module and run it in Python. For a complete reference to building
-      Boost.Python, check out: <a href="../../../../building.html" target="_top">building.html</a>.
-      After this brief <span class="emphasis"><em>bjam</em></span> tutorial, we should have built two
-      DLLs:
-    </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-        boost_python.dll
-      </li>
-<li>
-        hello.pyd
-      </li>
-</ul></div>
-<p>
-      if you are on Windows, and
-    </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-        libboost_python.so
-      </li>
-<li>
-        hello.so
-      </li>
-</ul></div>
-<p>
-      if you are on Unix.
+      We will skip over the details. Our objective will be to simply create the hello
+      world module and run it in Python. For a complete reference to building Boost.Python,
+      check out: <a href="../../../../building.html" target="_top">building.html</a>. After
+      this brief <span class="emphasis"><em>bjam</em></span> tutorial, we should have built the DLLs
+      and run a python program using the extension.
    </p>
 <p>
-      The tutorial example can be found in the directory: <code class="literal">libs/python/example/tutorial</code>.
+      The tutorial example can be found in the directory: <tt class="literal">libs/python/example/tutorial</tt>.
      There, you can find:
    </p>
 <div class="itemizedlist"><ul type="disc">
@@ -84,206 +73,136 @@
        hello.cpp
      </li>
 <li>
-        Jamfile
+        hello.py
+      </li>
+<li>
+        Jamroot
      </li>
 </ul></div>
 <p>
-      The <code class="literal">hello.cpp</code> file is our C++ hello world example. The
-      <code class="literal">Jamfile</code> is a minimalist <span class="emphasis"><em>bjam</em></span> script
-      that builds the DLLs for us.
+      The <tt class="literal">hello.cpp</tt> file is our C++ hello world example. The
+      <tt class="literal">Jamroot</tt> is a minimalist <span class="emphasis"><em>bjam</em></span> script
+      that builds the DLLs for us. Finally, <tt class="literal">hello.py</tt> is our Python
+      program that uses the extension in <tt class="literal">hello.cpp</tt>.
    </p>
 <p>
      Before anything else, you should have the bjam executable in your boost directory
-      or somewhere in your path such that <code class="literal">bjam</code> can be executed
+      or somewhere in your path such that <tt class="literal">bjam</tt> can be executed
      in the command line. Pre-built Boost.Jam executables are available for most
      platforms. The complete list of Bjam executables can be found <a href="http://sourceforge.net/project/showfiles.php?group_id=7586" target="_top">here</a>.
    </p>
-<a name="hello.let_s_jam_"></a><h3>
-<a name="id3091427"></a>
+<a name="hello.let_s_jam_"></a><h2>
+<a name="id386265"></a>
      Let's Jam!
-    </h3>
+    </h2>
 <p>
      <span class="inlinemediaobject"><img src="../images/jam.png" alt="jam"></span>
    </p>
 <p>
-      Here is our minimalist Jamfile:
-    </p>
-<pre class="programlisting"># This is the top of our own project tree
-project-root ;
-
-import python ;
-
-extension hello                     # Declare a Python extension called hello
-:   hello.cpp                       # source
-    # requirements and dependencies for Boost.Python extensions
-    &lt;template&gt;@boost/libs/python/build/extension
-    ;
-</pre>
-<p>
-      First, we need to specify our location. You may place your project anywhere.
-      <code class="literal">project-root</code> allows you to do that.
-    </p>
-<pre class="programlisting">project-root ;
-</pre>
-<p>
-      By doing so, you'll need a Jamrules file. Simply copy the one in the <a href="../../../../../example/tutorial/Jamrules" target="_top">example/tutorial directory</a>
-      and tweak the <code class="literal">path-global BOOST_ROOT</code> to where your boost
-      root directory is. The file has <a href="../../../../../example/tutorial/Jamrules" target="_top">detailed
-      instructions</a> you can follow.
+      <a href="../../../../../example/tutorial/Jamroot" target="_top">Here</a> is our minimalist
+      Jamroot file. Simply copy the file and tweak <tt class="literal">use-project boost</tt>
+      to where your boost root directory is and your OK.
    </p>
 <p>
-      Then we will import the definitions needed by Python modules:
+      The comments contained in the Jamrules file above should be sufficient to get
+      you going.
    </p>
-<pre class="programlisting">import python ;
-</pre>
-<p>
-      Finally we declare our <code class="literal">hello</code> extension:
-    </p>
-<pre class="programlisting">extension hello                     # Declare a Python extension called hello
-:   hello.cpp                       # source
-
-    # requirements and dependencies for Boost.Python extensions
-    &lt;template&gt;@boost/libs/python/build/extension
-    ;
-</pre>
-<p>
-      The last part tells BJam that we are depending on the Boost Python Library.
-    </p>
-<a name="hello.running_bjam"></a><h3>
-<a name="id3091556"></a>
+<a name="hello.running_bjam"></a><h2>
+<a name="id386322"></a>
      Running bjam
-    </h3>
+    </h2>
 <p>
      <span class="emphasis"><em>bjam</em></span> is run using your operating system's command line
      interpreter.
    </p>
-<div class="blockquote"><blockquote class="blockquote"><p>
-        Start it up.
-      </p></blockquote></div>
+<div class="blockquote"><blockquote class="blockquote">
 <p>
-      Make sure that the environment is set so that we can invoke the C++ compiler.
-      With MSVC, that would mean running the <code class="literal">Vcvars32.bat</code> batch
-      file. For instance:
+        </p>
+<p>
+          Start it up.
+        </p>
+<p>
+      </p>
+</blockquote></div>
+<p>
+      A file called user-config.jam in your home directory is used to configure your
+      tools. In Windows, your home directory can be found by typing:
    </p>
-<pre class="programlisting">C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat
+<pre class="programlisting">ECHO %HOMEDRIVE%%HOMEPATH%
 </pre>
 <p>
-      Some environment variables will have to be setup for proper building of our
-      Python modules. Example:
+      into a command prompt window. Your file should at least have the rules for
+      your compiler and your python installation. A specific example of this on Windows
+      would be:
    </p>
-<pre class="programlisting">set PYTHON_ROOT=c:/dev/tools/python
-set PYTHON_VERSION=2.2
+<pre class="programlisting">#  MSVC configuration
+using msvc : 8.0 ;
+
+#  Python configuration
+using python : 2.4 : C:/dev/tools<span class="emphasis"><em>Python</em></span> ;
 </pre>
 <p>
-      The above assumes that the Python installation is in <code class="literal">c:/dev/tools/python</code>
-      and that we are using Python version 2.2. You'll have to tweak these appropriately.
-    </p>
-<div class="informaltable"><table class="table">
-<colgroup><col></colgroup>
-<tbody><tr><td class="blurb"> <span class="inlinemediaobject"><img src="../images/tip.png" alt="tip"></span> Be sure not to include a third number, e.g. <span class="bold"><strong>not</strong></span> "2.2.1", even if that's the version
-            you have.</td></tr></tbody>
-</table></div>
-<p>
-      Take note that you may also do that through the Jamrules file we put in our
-      project as detailed above. The file has <a href="../../../../../example/tutorial/Jamrules" target="_top">detailed
-      instructions</a> you can follow.
+      The first rule tells Bjam to use the MSVC 8.0 compiler and associated tools.
+      The second rule provides information on Python, its version and where it is
+      located. The above assumes that the Python installation is in <tt class="literal">C:/dev/tools/Python/</tt>.
+      If you have one fairly "standard" python installation for your platform,
+      you might not need to do this.
    </p>
 <p>
-      Now we are ready... Be sure to <code class="literal">cd</code> to <code class="literal">libs/python/example/tutorial</code>
-      where the tutorial <code class="literal">"hello.cpp"</code> and the <code class="literal">"Jamfile"</code>
+      Now we are ready... Be sure to <tt class="literal">cd</tt> to <tt class="literal">libs/python/example/tutorial</tt>
+      where the tutorial <tt class="literal">"hello.cpp"</tt> and the <tt class="literal">"Jamroot"</tt>
      is situated.
    </p>
 <p>
      Finally:
    </p>
 <pre class="programlisting">
-<span class="identifier">bjam</span> <span class="special">-</span><span class="identifier">sTOOLS</span><span class="special">=</span><span class="identifier">vc</span><span class="special">-</span><span class="number">7</span><span class="identifier">_1</span>
+<span class="identifier">bjam</span>
 </pre>
-<p>
-      We are again assuming that we are using Microsoft Visual C++ version 7.1. If
-      not, then you will have to specify the appropriate tool. See <a href="../../../../../../../tools/build/index.html" target="_top">Building
-      Boost Libraries</a> for further details.
-    </p>
 <p>
      It should be building now:
    </p>
 <pre class="programlisting">cd C:\dev\boost\libs\python\example\tutorial
-bjam -sTOOLS=msvc
+bjam
 ...patience...
-...found 1703 targets...
-...updating 40 targets...
+...found 1101 targets...
+...updating 35 targets...
 </pre>
 <p>
      And so on... Finally:
    </p>
-<pre class="programlisting">Creating library bin\boost\libs\python\build\boost_python.dll\vc-7_1\debug\th
-reading-multi\boost_python.lib and object bin\boost\libs\python\build\boost_pyth
-on.dll\vc-7_1\debug\threading-multi\boost_python.exp
-vc-C++ bin\tutorial\hello.pyd\vc-7_1\debug\threading-multi\hello.obj
-hello.cpp
-vc-Link bin\tutorial\hello.pyd\vc-7_1\debug\threading-multi\hello.pyd bin\tutori
-al\hello.pyd\vc-7_1\debug\threading-multi\hello.lib
-   Creating library bin\tutorial\hello.pyd\vc-7_1\debug\threading-multi\hello.li
-b and object bin\tutorial\hello.pyd\vc-7_1\debug\threading-multi\hello.exp
-...updated 31 targets...
+<pre class="programlisting">Creating library <span class="emphasis"><em>path-to-boost_python.dll</em></span>
+   Creating library <span class="emphasis"><em>path-to-'''hello_ext'''.exp</em></span>
+**passed** ... hello.test
+...updated 35 targets...
 </pre>
 <p>
-      If all is well, you should now have:
+      Or something similar. If all is well, you should now have built the DLLs and
+      run the Python program.
    </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-        boost_python.dll
-      </li>
-<li>
-        hello.pyd
-      </li>
-</ul></div>
+<div class="blockquote"><blockquote class="blockquote">
 <p>
-      if you are on Windows, and
-    </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-        libboost_python.so
-      </li>
-<li>
-        hello.so
-      </li>
-</ul></div>
+        </p>
 <p>
-      if you are on Unix.
-    </p>
+          <span class="bold"><b>There you go... Have fun!</b></span>
+        </p>
 <p>
-      <code class="literal">boost_python.dll</code> and <code class="literal">hello.pyd</code> can be
-      found somewhere in your project's <code class="literal">bin</code> directory. After a
-      successful build, you make it possible for the system to find boost_python.dll
-      or libboost_python.so (usually done with LD_LIBRARY_PATH, DYLD_LIBRARY_PATH,
-      or some other variable on *nix and with PATH on Windows) and for Python to
-      find the hello module (Done with PYTHONPATH on all systems.)
-    </p>
-<p>
-      You may now fire up Python and run our hello module:
-    </p>
-<p>
-    </p>
-<pre class="programlisting">
-<span class="special">&gt;&gt;&gt;</span> <span class="keyword">import</span> <span class="identifier">hello</span>
-<span class="special">&gt;&gt;&gt;</span> <span class="keyword">print</span> <span class="identifier">hello</span><span class="special">.</span><span class="identifier">greet</span><span class="special">()</span>
-<span class="identifier">hello</span><span class="special">,</span> <span class="identifier">world</span>
-</pre>
-<p>
-    </p>
-<div class="blockquote"><blockquote class="blockquote"><p>
-        <span class="bold"><strong>There you go... Have fun!</strong></span>
-      </p></blockquote></div>
+      </p>
+</blockquote></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"><small>Copyright © 2002-2005 Joel
-      de Guzman, David Abrahams</small></td>
+<td align="right"><div class="copyright-footer">Copyright © 2002-2005 Joel
+      de Guzman, David Abrahams<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>
+</div></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="../index.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="exposing.html"><img src="../images/next.png" alt="Next"></a>
+<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="exposing.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/tutorial/doc/html/python/iterators.html
+++ b/doc/tutorial/doc/html/python/iterators.html
@@ -2,25 +2,25 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Iterators</title>
-<link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Chapter 1. python 1.0">
 <link rel="up" href="../index.html" title="Chapter 1. python 1.0">
 <link rel="prev" href="embedding.html" title="Embedding">
-<link rel="next" href="exception.html" title="Exception Translation">
+<link rel="next" href="exception.html" title=" Exception Translation">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%">
+<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.htm">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
 <td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
 <td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</table>
+</tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="embedding.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="exception.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="embedding.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="exception.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -30,7 +30,7 @@
      iterators, but these are two very different beasts.
    </p>
 <p>
-      <span class="bold"><strong>C++ iterators:</strong></span>
+      <span class="bold"><b>C++ iterators:</b></span>
    </p>
 <div class="itemizedlist"><ul type="disc">
 <li>
@@ -45,7 +45,7 @@
      </li>
 </ul></div>
 <p>
-      <span class="bold"><strong>Python Iterators:</strong></span>
+      <span class="bold"><b>Python Iterators:</b></span>
    </p>
 <div class="itemizedlist"><ul type="disc">
 <li>
@@ -59,8 +59,8 @@
      </li>
 </ul></div>
 <p>
-      The typical Python iteration protocol: <code class="literal"><span class="bold"><strong>for y
-      in x...</strong></span></code> is as follows:
+      The typical Python iteration protocol: <tt class="literal"><span class="bold"><b>for y
+      in x...</b></span></tt> is as follows:
    </p>
 <p>
    </p>
@@ -74,7 +74,7 @@
 </span></pre>
 <p>
      Boost.Python provides some mechanisms to make C++ iterators play along nicely
-      as Python iterators. What we need to do is to produce appropriate <code class="computeroutput"><span class="identifier">__iter__</span></code> function from C++ iterators that
+      as Python iterators. What we need to do is to produce appropriate <tt class="computeroutput"><span class="identifier">__iter__</span></tt> function from C++ iterators that
      is compatible with the Python iteration protocol. For example:
    </p>
 <p>
@@ -91,7 +91,7 @@
 <span class="special">.</span><span class="identifier">def</span><span class="special">(</span><span class="string">"__iter__"</span><span class="special">,</span> <span class="identifier">iterator</span><span class="special">&lt;</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;())</span>
 </pre>
 <p>
-      <span class="bold"><strong>range</strong></span>
+      <span class="bold"><b>range</b></span>
    </p>
 <p>
      We can create a Python savvy iterator using the range function:
@@ -119,14 +119,14 @@
      </li>
 </ul></div>
 <p>
-      <span class="bold"><strong>iterator</strong></span>
+      <span class="bold"><b>iterator</b></span>
    </p>
 <div class="itemizedlist"><ul type="disc"><li>
        iterator&lt;T, Policies&gt;()
      </li></ul></div>
 <p>
-      Given a container <code class="literal">T</code>, iterator is a shortcut that simply
-      calls <code class="literal">range</code> with &amp;T::begin, &amp;T::end.
+      Given a container <tt class="literal">T</tt>, iterator is a shortcut that simply
+      calls <tt class="literal">range</tt> with &amp;T::begin, &amp;T::end.
    </p>
 <p>
      Let's put this into action... Here's an example from some hypothetical bogon
@@ -152,14 +152,14 @@
    <span class="special">.</span><span class="identifier">property</span><span class="special">(</span><span class="string">"bogons"</span><span class="special">,</span> <span class="identifier">range</span><span class="special">(&amp;</span><span class="identifier">F</span><span class="special">::</span><span class="identifier">b_begin</span><span class="special">,</span> <span class="special">&amp;</span><span class="identifier">F</span><span class="special">::</span><span class="identifier">b_end</span><span class="special">));</span>
 </pre>
 <p>
-      <span class="bold"><strong>stl_input_iterator</strong></span>
+      <span class="bold"><b>stl_input_iterator</b></span>
    </p>
 <p>
      So far, we have seen how to expose C++ iterators and ranges to Python. Sometimes
      we wish to go the other way, though: we'd like to pass a Python sequence to
      an STL algorithm or use it to initialize an STL container. We need to make
-      a Python iterator look like an STL iterator. For that, we use <code class="computeroutput"><span class="identifier">stl_input_iterator</span><span class="special">&lt;&gt;</span></code>.
-      Consider how we might implement a function that exposes <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">list</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;::</span><span class="identifier">assign</span><span class="special">()</span></code> to Python:
+      a Python iterator look like an STL iterator. For that, we use <tt class="computeroutput"><span class="identifier">stl_input_iterator</span><span class="special">&lt;&gt;</span></tt>.
+      Consider how we might implement a function that exposes <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">list</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;::</span><span class="identifier">assign</span><span class="special">()</span></tt> to Python:
    </p>
 <p>
    </p>
@@ -178,7 +178,7 @@
 </span>    <span class="special">;</span>
 </pre>
 <p>
-      Now in Python, we can assign any integer sequence to <code class="computeroutput"><span class="identifier">list_int</span></code>
+      Now in Python, we can assign any integer sequence to <tt class="computeroutput"><span class="identifier">list_int</span></tt>
      objects:
    </p>
 <p>
@@ -190,12 +190,17 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><small>Copyright © 2002-2005 Joel
-      de Guzman, David Abrahams</small></td>
+<td align="right"><div class="copyright-footer">Copyright © 2002-2005 Joel
+      de Guzman, David Abrahams<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>
+</div></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="embedding.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="exception.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="embedding.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="exception.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/tutorial/doc/html/python/object.html
+++ b/doc/tutorial/doc/html/python/object.html
@@ -1,26 +1,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Object Interface</title>
-<link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<title> Object Interface</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Chapter 1. python 1.0">
 <link rel="up" href="../index.html" title="Chapter 1. python 1.0">
 <link rel="prev" href="functions.html" title="Functions">
 <link rel="next" href="embedding.html" title="Embedding">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%">
+<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.htm">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
 <td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
 <td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</table>
+</tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="functions.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="embedding.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="functions.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="embedding.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -35,13 +35,13 @@
      Python is dynamically typed, unlike C++ which is statically typed. Python variables
      may hold an integer, a float, list, dict, tuple, str, long etc., among other
      things. In the viewpoint of Boost.Python and C++, these Pythonic variables
-      are just instances of class <code class="literal">object</code>. We shall see in this
+      are just instances of class <tt class="literal">object</tt>. We will see in this
      chapter how to deal with Python objects.
    </p>
 <p>
      As mentioned, one of the goals of Boost.Python is to provide a bidirectional
      mapping between C++ and Python while maintaining the Python feel. Boost.Python
-      C++ <code class="literal">object</code>s are as close as possible to Python. This should
+      C++ <tt class="literal">object</tt>s are as close as possible to Python. This should
      minimize the learning curve significantly.
    </p>
 <p>
@@ -51,10 +51,10 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="python.basic_interface"></a>Basic Interface</h3></div></div></div>
 <p>
-        Class <code class="literal">object</code> wraps <code class="literal">PyObject*</code>. All the
-        intricacies of dealing with <code class="literal">PyObject</code>s such as managing
-        reference counting are handled by the <code class="literal">object</code> class. C++
-        object interoperability is seamless. Boost.Python C++ <code class="literal">object</code>s
+        Class <tt class="literal">object</tt> wraps <tt class="literal">PyObject*</tt>. All the
+        intricacies of dealing with <tt class="literal">PyObject</tt>s such as managing
+        reference counting are handled by the <tt class="literal">object</tt> class. C++
+        object interoperability is seamless. Boost.Python C++ <tt class="literal">object</tt>s
        can in fact be explicitly constructed from any C++ object.
      </p>
 <p>
@@ -99,7 +99,7 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="python.derived_object_types"></a>Derived Object types</h3></div></div></div>
 <p>
-        Boost.Python comes with a set of derived <code class="literal">object</code> types
+        Boost.Python comes with a set of derived <tt class="literal">object</tt> types
        corresponding to that of Python's:
      </p>
 <div class="itemizedlist"><ul type="disc">
@@ -123,32 +123,32 @@
        </li>
 </ul></div>
 <p>
-        These derived <code class="literal">object</code> types act like real Python types.
+        These derived <tt class="literal">object</tt> types act like real Python types.
        For instance:
      </p>
 <pre class="programlisting">
 <span class="identifier">str</span><span class="special">(</span><span class="number">1</span><span class="special">)</span> <span class="special">==&gt;</span> <span class="string">"1"</span>
 </pre>
 <p>
-        Wherever appropriate, a particular derived <code class="literal">object</code> has
-        corresponding Python type's methods. For instance, <code class="literal">dict</code>
-        has a <code class="literal">keys()</code> method:
+        Wherever appropriate, a particular derived <tt class="literal">object</tt> has
+        corresponding Python type's methods. For instance, <tt class="literal">dict</tt>
+        has a <tt class="literal">keys()</tt> method:
      </p>
 <pre class="programlisting">
 <span class="identifier">d</span><span class="special">.</span><span class="identifier">keys</span><span class="special">()</span>
 </pre>
 <p>
-        <code class="literal">make_tuple</code> is provided for declaring <span class="emphasis"><em>tuple literals</em></span>.
+        <tt class="literal">make_tuple</tt> is provided for declaring <span class="emphasis"><em>tuple literals</em></span>.
        Example:
      </p>
 <pre class="programlisting">
 <span class="identifier">make_tuple</span><span class="special">(</span><span class="number">123</span><span class="special">,</span> <span class="char">'D'</span><span class="special">,</span> <span class="string">"Hello, World"</span><span class="special">,</span> <span class="number">0.0</span><span class="special">);</span>
 </pre>
 <p>
-        In C++, when Boost.Python <code class="literal">object</code>s are used as arguments
+        In C++, when Boost.Python <tt class="literal">object</tt>s are used as arguments
        to functions, subtype matching is required. For example, when a function
-        <code class="literal">f</code>, as declared below, is wrapped, it will only accept
-        instances of Python's <code class="literal">str</code> type and subtypes.
+        <tt class="literal">f</tt>, as declared below, is wrapped, it will only accept
+        instances of Python's <tt class="literal">str</tt> type and subtypes.
      </p>
 <pre class="programlisting">
 <span class="keyword">void</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">str</span> <span class="identifier">name</span><span class="special">)</span>
@@ -172,16 +172,15 @@
 <span class="identifier">object</span> <span class="identifier">msg</span> <span class="special">=</span> <span class="string">"%s is bigger than %s"</span> <span class="special">%</span> <span class="identifier">make_tuple</span><span class="special">(</span><span class="identifier">NAME</span><span class="special">,</span><span class="identifier">name</span><span class="special">);</span>
 </pre>
 <p>
-        Demonstrates that you can write the C++ equivalent of <code class="literal">"format"
-        % x,y,z</code> in Python, which is useful since there's no easy way to
+        Demonstrates that you can write the C++ equivalent of <tt class="literal">"format"
+        % x,y,z</tt> in Python, which is useful since there's no easy way to
        do that in std C++.
      </p>
-<div class="informaltable"><table class="table">
-<colgroup><col></colgroup>
-<tbody><tr><td class="blurb"> <span class="inlinemediaobject"><img src="../images/alert.png" alt="alert"></span> <span class="bold"><strong>Beware</strong></span> the
-              common pitfall of forgetting that the constructors of most of Python's
-              mutable types make copies, just as in Python. </td></tr></tbody>
-</table></div>
+<div class="sidebar"><p>
+        <span class="inlinemediaobject"><img src="../images/alert.png" alt="alert"></span> <span class="bold"><b>Beware</b></span> the common pitfall
+        of forgetting that the constructors of most of Python's mutable types make
+        copies, just as in Python.
+      </p></div>
 <p>
        Python:
      </p>
@@ -196,12 +195,12 @@
 <span class="identifier">dict</span> <span class="identifier">d</span><span class="special">(</span><span class="identifier">x</span><span class="special">.</span><span class="identifier">attr</span><span class="special">(</span><span class="string">"__dict__"</span><span class="special">));</span>  <span class="comment">// copies x.__dict__
 </span><span class="identifier">d</span><span class="special">[</span><span class="char">'whatever'</span><span class="special">]</span> <span class="special">=</span> <span class="number">3</span><span class="special">;</span>           <span class="comment">// modifies the copy
 </span></pre>
-<a name="derived_object_types.class__lt_t_gt__as_objects"></a><h3>
-<a name="id3149441"></a>
+<a name="derived_object_types.class__lt_t_gt__as_objects"></a><h2>
+<a name="id469586"></a>
        class_&lt;T&gt; as objects
-      </h3>
+      </h2>
 <p>
-        Due to the dynamic nature of Boost.Python objects, any <code class="literal">class_&lt;T&gt;</code>
+        Due to the dynamic nature of Boost.Python objects, any <tt class="literal">class_&lt;T&gt;</tt>
        may also be one of these types! The following code snippet wraps the class
        (type) object.
      </p>
@@ -223,15 +222,15 @@
 <a name="python.extracting_c___objects"></a>Extracting C++ objects</h3></div></div></div>
 <p>
        At some point, we will need to get C++ values out of object instances. This
-        can be achieved with the <code class="literal">extract&lt;T&gt;</code> function. Consider
+        can be achieved with the <tt class="literal">extract&lt;T&gt;</tt> function. Consider
        the following:
      </p>
 <pre class="programlisting">
 <span class="keyword">double</span> <span class="identifier">x</span> <span class="special">=</span> <span class="identifier">o</span><span class="special">.</span><span class="identifier">attr</span><span class="special">(</span><span class="string">"length"</span><span class="special">);</span> <span class="comment">// compile error
 </span></pre>
 <p>
-        In the code above, we got a compiler error because Boost.Python <code class="literal">object</code>
-        can't be implicitly converted to <code class="literal">double</code>s. Instead, what
+        In the code above, we got a compiler error because Boost.Python <tt class="literal">object</tt>
+        can't be implicitly converted to <tt class="literal">double</tt>s. Instead, what
        we wanted to do above can be achieved by writing:
      </p>
 <pre class="programlisting">
@@ -241,14 +240,14 @@
 </pre>
 <p>
        The first line attempts to extract the "length" attribute of the
-        Boost.Python <code class="literal">object</code>. The second line attempts to <span class="emphasis"><em>extract</em></span>
-        the <code class="literal">Vec2</code> object from held by the Boost.Python <code class="literal">object</code>.
+        Boost.Python <tt class="literal">object</tt>. The second line attempts to <span class="emphasis"><em>extract</em></span>
+        the <tt class="literal">Vec2</tt> object from held by the Boost.Python <tt class="literal">object</tt>.
      </p>
 <p>
        Take note that we said "attempt to" above. What if the Boost.Python
-        <code class="literal">object</code> does not really hold a <code class="literal">Vec2</code>
+        <tt class="literal">object</tt> does not really hold a <tt class="literal">Vec2</tt>
        type? This is certainly a possibility considering the dynamic nature of Python
-        <code class="literal">object</code>s. To be on the safe side, if the C++ type can't
+        <tt class="literal">object</tt>s. To be on the safe side, if the C++ type can't
        be extracted, an appropriate exception is thrown. To avoid an exception,
        we need to test for extractibility:
      </p>
@@ -258,7 +257,7 @@
    <span class="identifier">Vec2</span><span class="special">&amp;</span> <span class="identifier">v</span> <span class="special">=</span> <span class="identifier">x</span><span class="special">();</span> <span class="special">...</span>
 </pre>
 <p>
-        <span class="inlinemediaobject"><img src="../images/tip.png" alt="tip"></span> The astute reader might have noticed that the <code class="literal">extract&lt;T&gt;</code>
+        <span class="inlinemediaobject"><img src="../images/tip.png" alt="tip"></span> The astute reader might have noticed that the <tt class="literal">extract&lt;T&gt;</tt>
        facility in fact solves the mutable copying problem:
      </p>
 <pre class="programlisting">
@@ -271,8 +270,8 @@
 <a name="python.enums"></a>Enums</h3></div></div></div>
 <p>
        Boost.Python has a nifty facility to capture and wrap C++ enums. While Python
-        has no <code class="literal">enum</code> type, we'll often want to expose our C++ enums
-        to Python as an <code class="literal">int</code>. Boost.Python's enum facility makes
+        has no <tt class="literal">enum</tt> type, we'll often want to expose our C++ enums
+        to Python as an <tt class="literal">int</tt>. Boost.Python's enum facility makes
        this easy while taking care of the proper conversions from Python's dynamic
        typing to C++'s strong static typing (in C++, ints cannot be implicitly converted
        to enums). To illustrate, given a C++ enum:
@@ -291,17 +290,25 @@
 </pre>
 <p>
        can be used to expose to Python. The new enum type is created in the current
-        <code class="literal">scope()</code>, which is usually the current module. The snippet
-        above creates a Python class derived from Python's <code class="literal">int</code>
+        <tt class="literal">scope()</tt>, which is usually the current module. The snippet
+        above creates a Python class derived from Python's <tt class="literal">int</tt>
        type which is associated with the C++ type passed as its first parameter.
      </p>
-<div class="informaltable"><table class="table">
-<colgroup><col></colgroup>
-<tbody><tr><td class="blurb"> <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> <span class="bold"><strong>what is a scope?</strong></span><br>
-              <br> The scope is a class that has an associated global Python object
-              which controls the Python namespace in which new extension classes
-              and wrapped functions will be defined as attributes. Details can be
-              found <a href="../../../../v2/scope.html" target="_top">here</a>.</td></tr></tbody>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/html/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top">
+<p>
+          <span class="bold"><b>what is a scope?</b></span>
+        </p>
+<p>
+          The scope is a class that has an associated global Python object which
+          controls the Python namespace in which new extension classes and wrapped
+          functions will be defined as attributes. Details can be found <a href="../../../../v2/scope.html" target="_top">here</a>.
+        </p>
+</td></tr>
 </table></div>
 <p>
        You can access those values in Python as
@@ -334,12 +341,17 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><small>Copyright © 2002-2005 Joel
-      de Guzman, David Abrahams</small></td>
+<td align="right"><div class="copyright-footer">Copyright © 2002-2005 Joel
+      de Guzman, David Abrahams<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>
+</div></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="functions.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="embedding.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="functions.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="embedding.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
 </body>
 </html>
--- a/doc/tutorial/doc/html/python/techniques.html
+++ b/doc/tutorial/doc/html/python/techniques.html
@@ -1,25 +1,25 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>General Techniques</title>
-<link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<title> General Techniques</title>
+<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Chapter 1. python 1.0">
 <link rel="up" href="../index.html" title="Chapter 1. python 1.0">
-<link rel="prev" href="exception.html" title="Exception Translation">
+<link rel="prev" href="exception.html" title=" Exception Translation">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%">
+<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.htm">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="../../../../../../../people/people.htm">People</a></td>
 <td align="center"><a href="../../../../../../../more/faq.htm">FAQ</a></td>
 <td align="center"><a href="../../../../../../../more/index.htm">More</a></td>
-</table>
+</tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="exception.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a>
+<a accesskey="p" href="exception.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>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -50,7 +50,7 @@
 <p>
        We have a C++ library that works with sounds: reading and writing various
        formats, applying filters to the sound data, etc. It is named (conveniently)
-        <code class="literal">sounds</code>. Our library already has a neat C++ namespace hierarchy,
+        <tt class="literal">sounds</tt>. Our library already has a neat C++ namespace hierarchy,
        like so:
      </p>
 <pre class="programlisting">
@@ -93,15 +93,20 @@
 <span class="special">}</span>
 </pre>
 <p>
-        Compiling these files will generate the following Python extensions: <code class="literal">core.pyd</code>,
-        <code class="literal">io.pyd</code> and <code class="literal">filters.pyd</code>.
+        Compiling these files will generate the following Python extensions: <tt class="literal">core.pyd</tt>,
+        <tt class="literal">io.pyd</tt> and <tt class="literal">filters.pyd</tt>.
      </p>
-<div class="informaltable"><table class="table">
-<colgroup><col></colgroup>
-<tbody><tr><td class="blurb"> <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> The extension <code class="literal">.pyd</code> is used
-              for python extension modules, which are just shared libraries. Using
-              the default for your system, like <code class="literal">.so</code> for Unix and
-              <code class="literal">.dll</code> for Windows, works just as well.</td></tr></tbody>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/html/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top"><p>
+          The extension <tt class="literal">.pyd</tt> is used for python extension modules,
+          which are just shared libraries. Using the default for your system, like
+          <tt class="literal">.so</tt> for Unix and <tt class="literal">.dll</tt> for Windows,
+          works just as well.
+        </p></td></tr>
 </table></div>
 <p>
        Now, we create this directory structure for our Python package:
@@ -113,12 +118,12 @@
    io.pyd
 </pre>
 <p>
-        The file <code class="literal">__init__.py</code> is what tells Python that the directory
-        <code class="literal">sounds/</code> is actually a Python package. It can be a empty
+        The file <tt class="literal">__init__.py</tt> is what tells Python that the directory
+        <tt class="literal">sounds/</tt> is actually a Python package. It can be a empty
        file, but can also perform some magic, that will be shown later.
      </p>
 <p>
-        Now our package is ready. All the user has to do is put <code class="literal">sounds</code>
+        Now our package is ready. All the user has to do is put <tt class="literal">sounds</tt>
        into his <a href="http://www.python.org/doc/current/tut/node8.html#SECTION008110000000000000000" target="_top">PYTHONPATH</a>
        and fire up the interpreter:
      </p>
@@ -157,7 +162,7 @@
 </pre>
 <p>
        Note that we added an underscore to the module name. The filename will have
-        to be changed to <code class="literal">_core.pyd</code> as well, and we do the same
+        to be changed to <tt class="literal">_core.pyd</tt> as well, and we do the same
        to the other extension modules. Now, we change our package hierarchy like
        so:
      </p>
@@ -165,12 +170,12 @@
    __init__.py
    core/
        __init__.py
-        _core.pyd
+        <span class="underline">core.pyd
    filters/
-        __init__.py
-        _filters.pyd
+        \</span>_init__.py
+        <span class="underline">filters.pyd
    io/
-        __init__.py
+        \</span>_init__.py
        _io.pyd
 </pre>
 <p>
@@ -185,11 +190,11 @@
 <span class="special">&gt;&gt;&gt;</span> <span class="identifier">sounds</span><span class="special">.</span><span class="identifier">core</span><span class="special">.</span><span class="identifier">_core</span><span class="special">.</span><span class="identifier">foo</span><span class="special">(...)</span>
 </pre>
 <p>
-        which is not what we want. But here enters the <code class="literal">__init__.py</code>
-        magic: everything that is brought to the <code class="literal">__init__.py</code> namespace
+        which is not what we want. But here enters the <tt class="literal">__init__.py</tt>
+        magic: everything that is brought to the <tt class="literal">__init__.py</tt> namespace
        can be accessed directly by the user. So, all we have to do is bring the
-        entire namespace from <code class="literal">_core.pyd</code> to <code class="literal">core/__init__.py</code>.
-        So add this line of code to <code class="literal">sounds<span class="emphasis"><em>core</em></span>__init__.py</code>:
+        entire namespace from <tt class="literal">_core.pyd</tt> to <tt class="literal">core/__init__.py</tt>.
+        So add this line of code to <tt class="literal">sounds<span class="emphasis"><em>core</em></span>__init__.py</tt>:
      </p>
 <pre class="programlisting">
 <span class="keyword">from</span> <span class="identifier">_core</span> <span class="keyword">import</span> <span class="special">*</span>
@@ -206,10 +211,10 @@
        with the additional benefit that we can easily add pure Python functions
        to any module, in a way that the user can't tell the difference between a
        C++ function and a Python function. Let's add a <span class="emphasis"><em>pure</em></span>
-        Python function, <code class="literal">echo_noise</code>, to the <code class="literal">filters</code>
-        package. This function applies both the <code class="literal">echo</code> and <code class="literal">noise</code>
-        filters in sequence in the given <code class="literal">sound</code> object. We create
-        a file named <code class="literal">sounds/filters/echo_noise.py</code> and code our
+        Python function, <tt class="literal">echo_noise</tt>, to the <tt class="literal">filters</tt>
+        package. This function applies both the <tt class="literal">echo</tt> and <tt class="literal">noise</tt>
+        filters in sequence in the given <tt class="literal">sound</tt> object. We create
+        a file named <tt class="literal">sounds/filters/echo_noise.py</tt> and code our
        function:
      </p>
 <pre class="programlisting">
@@ -220,14 +225,14 @@
    <span class="keyword">return</span> <span class="identifier">s</span>
 </pre>
 <p>
-        Next, we add this line to <code class="literal">sounds<span class="emphasis"><em>filters</em></span>__init__.py</code>:
+        Next, we add this line to <tt class="literal">sounds<span class="emphasis"><em>filters</em></span>__init__.py</tt>:
      </p>
 <pre class="programlisting">
 <span class="keyword">from</span> <span class="identifier">echo_noise</span> <span class="keyword">import</span> <span class="identifier">echo_noise</span>
 </pre>
 <p>
        And that's it. The user now accesses this function like any other function
-        from the <code class="literal">filters</code> package:
+        from the <tt class="literal">filters</tt> package:
      </p>
 <pre class="programlisting">
 <span class="special">&gt;&gt;&gt;</span> <span class="keyword">import</span> <span class="identifier">sounds</span><span class="special">.</span><span class="identifier">filters</span>
@@ -261,7 +266,7 @@
      </p>
 <p>
        We can do the same with classes that were wrapped with Boost.Python. Suppose
-        we have a class <code class="literal">point</code> in C++:
+        we have a class <tt class="literal">point</tt> in C++:
      </p>
 <p>
      </p>
@@ -275,7 +280,7 @@
 </pre>
 <p>
        If we are using the technique from the previous session, <a href="techniques.html#python.creating_packages" title="Creating Packages">Creating
-        Packages</a>, we can code directly into <code class="literal">geom/__init__.py</code>:
+        Packages</a>, we can code directly into <tt class="literal">geom/__init__.py</tt>:
      </p>
 <p>
      </p>
@@ -290,7 +295,7 @@
 </span><span class="identifier">point</span><span class="special">.</span><span class="identifier">__str__</span> <span class="special">=</span> <span class="identifier">point_str</span>
 </pre>
 <p>
-        <span class="bold"><strong>All</strong></span> point instances created from C++ will
+        <span class="bold"><b>All</b></span> point instances created from C++ will
        also have this member function! This technique has several advantages:
      </p>
 <div class="itemizedlist"><ul type="disc">
@@ -389,7 +394,7 @@
 <span class="special">}</span>
 </pre>
 <p>
-        Now you create a file <code class="literal">main.cpp</code>, which contains the <code class="literal">BOOST_PYTHON_MODULE</code>
+        Now you create a file <tt class="literal">main.cpp</tt>, which contains the <tt class="literal">BOOST_PYTHON_MODULE</tt>
        macro, and call the various export functions inside it.
      </p>
 <pre class="programlisting">
@@ -425,29 +430,43 @@
        exporting it to Python at the same time: changes in a class will only demand
        the compilation of a single cpp, instead of the entire wrapper code.
      </p>
-<div class="informaltable"><table class="table">
-<colgroup><col></colgroup>
-<tbody><tr><td class="blurb"> <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> If you're exporting your classes with <a href="../../../../../pyste/index.html" target="_top">Pyste</a>,
-              take a look at the <code class="literal">--multiple</code> option, that generates
-              the wrappers in various files as demonstrated here.</td></tr></tbody>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/html/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top"><p>
+          If you're exporting your classes with <a href="../../../../../pyste/index.html" target="_top">Pyste</a>,
+          take a look at the <tt class="literal">--multiple</tt> option, that generates
+          the wrappers in various files as demonstrated here.
+        </p></td></tr>
 </table></div>
-<div class="informaltable"><table class="table">
-<colgroup><col></colgroup>
-<tbody><tr><td class="blurb"> <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> This method is useful too if you are getting the
-              error message <span class="emphasis"><em>"fatal error C1204:Compiler limit:internal
-              structure overflow"</em></span> when compiling a large source file,
-              as explained in the <a href="../../../../v2/faq.html#c1204" target="_top">FAQ</a>.</td></tr></tbody>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/html/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top"><p>
+          This method is useful too if you are getting the error message <span class="emphasis"><em>"fatal
+          error C1204:Compiler limit:internal structure overflow"</em></span>
+          when compiling a large source file, as explained in the <a href="../../../../v2/faq.html#c1204" target="_top">FAQ</a>.
+        </p></td></tr>
 </table></div>
 </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"><small>Copyright © 2002-2005 Joel
-      de Guzman, David Abrahams</small></td>
+<td align="right"><div class="copyright-footer">Copyright © 2002-2005 Joel
+      de Guzman, David Abrahams<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>
+</div></td>
 </tr></table>
 <hr>
 <div class="spirit-nav">
-<a accesskey="p" href="exception.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a>
+<a accesskey="p" href="exception.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>
 </div>
 </body>
 </html>
--- a/doc/tutorial/doc/tutorial.qbk
+++ b/doc/tutorial/doc/tutorial.qbk
@@ -49,10 +49,10 @@ Function:
 can be exposed to Python by writing a Boost.Python wrapper:

    #include <boost/python.hpp>
-    using namespace boost::python;

-    BOOST_PYTHON_MODULE(hello)
+    BOOST_PYTHON_MODULE(hello_ext)
    {
+        using namespace boost::python;
        def("greet", greet);
    }

@@ -61,7 +61,7 @@ resulting DLL is now visible to Python. Here's a sample Python session:

 [python]

-    >>> import hello
+    >>> import hello_ext
    >>> print hello.greet()
    hello, world

@@ -75,43 +75,39 @@ resulting DLL is now visible to Python. Here's a sample Python session:
 [h2 From Start To Finish]

 Now the first thing you'd want to do is to build the Hello World module and
-try it for yourself in Python. In this section, we shall outline the steps
-necessary to achieve that. We shall use the build tool that comes bundled
+try it for yourself in Python. In this section, we will outline the steps
+necessary to achieve that. We will use the build tool that comes bundled
 with every boost distribution: [*bjam].

-[blurb __note__ [*Building without bjam]\n\n
-    Besides bjam, there are of course other ways to get your module built.
-    What's written here should not be taken as "the one and only way".
-    There are of course other build tools apart from [^bjam].\n\n
-    Take note however that the preferred build tool for Boost.Python is bjam.
-    There are so many ways to set up the build incorrectly. Experience shows
-    that 90% of the "I can't build Boost.Python" problems come from people
-    who had to use a different tool.
+[note [*Building without bjam]
+
+Besides bjam, there are of course other ways to get your module built.
+What's written here should not be taken as "the one and only way".
+There are of course other build tools apart from [^bjam].
+
+Take note however that the preferred build tool for Boost.Python is bjam.
+There are so many ways to set up the build incorrectly. Experience shows
+that 90% of the "I can't build Boost.Python" problems come from people
+who had to use a different tool.
 ]

-We shall skip over the details. Our objective will be to simply create the
-hello world module and run it in Python. For a complete reference to
-building Boost.Python, check out: [@../../../building.html building.html].
-After this brief ['bjam] tutorial, we should have built two DLLs:
-
-* boost_python.dll
-* hello.pyd
-
-if you are on Windows, and
-
-* libboost_python.so
-* hello.so
-
-if you are on Unix.
+We will skip over the details. Our objective will be to simply create
+the hello world module and run it in Python. For a complete reference to
+building Boost.Python, check out: [@/libs/python/doc/building.html
+building.html]. After this brief ['bjam] tutorial, we should have built
+the DLLs and run a python program using the extension.

 The tutorial example can be found in the directory:
 [^libs/python/example/tutorial]. There, you can find:

 * hello.cpp
-* Jamfile
+* hello.py
+* Jamroot

-The [^hello.cpp] file is our C++ hello world example. The [^Jamfile] is a
-minimalist ['bjam] script that builds the DLLs for us.
+The [^hello.cpp] file is our C++ hello world example. The [^Jamroot] is
+a minimalist ['bjam] script that builds the DLLs for us. Finally,
+[^hello.py] is our Python program that uses the extension in
+[^hello.cpp].

 Before anything else, you should have the bjam executable in your boost
 directory or somewhere in your path such that [^bjam] can be executed in
@@ -122,51 +118,12 @@ platforms. The complete list of Bjam executables can be found
 [h2 Let's Jam!]
 __jam__

-Here is our minimalist Jamfile:
+[@/libs/python/example/tutorial/Jamroot Here] is our minimalist Jamroot
+file. Simply copy the file and tweak [^use-project boost] to where your
+boost root directory is and your OK.

-[pre
-# This is the top of our own project tree
-project-root ;
-
-import python ;
-
-extension hello                     # Declare a Python extension called hello
-:   hello.cpp                       # source
-    # requirements and dependencies for Boost.Python extensions
-    <template>@boost/libs/python/build/extension
-    ;
-]
-
-First, we need to specify our location. You may place your project anywhere.
-[^project-root] allows you to do that.
-
-[pre
-project-root ;
-]
-
-By doing so, you'll need a Jamrules file. Simply copy the one in the 
-[@../../../../example/tutorial/Jamrules example/tutorial directory] and tweak 
-the [^path-global BOOST_ROOT] to where your boost root directory is. The file
-has [@../../../../example/tutorial/Jamrules detailed instructions] you can follow.
-
-Then we will import the definitions needed by Python modules:
-
-[pre
-import python ;
-]
-
-Finally we declare our [^hello] extension:
-
-[pre
-extension hello                     # Declare a Python extension called hello
-:   hello.cpp                       # source
-
-    # requirements and dependencies for Boost.Python extensions
-    <template>@boost/libs/python/build/extension
-    ;
-]
-
-The last part tells BJam that we are depending on the Boost Python Library.
+The comments contained in the Jamrules file above should be sufficient
+to get you going.

 [h2 Running bjam]

@@ -174,98 +131,60 @@ The last part tells BJam that we are depending on the Boost Python Library.

 [:Start it up.]

-Make sure that the environment is set so that we can invoke the C++
-compiler. With MSVC, that would mean running the [^Vcvars32.bat] batch
-file. For instance:
+A file called user-config.jam in your home directory is used to
+configure your tools. In Windows, your home directory can be found by
+typing:

 [pre
-C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat
+ECHO %HOMEDRIVE%%HOMEPATH%
 ]

-Some environment variables will have to be setup for proper building of our
-Python modules. Example:
+into a command prompt window. Your file should at least have the rules
+for your compiler and your python installation. A specific example of
+this on Windows would be:

 [pre
-set PYTHON_ROOT=c:/dev/tools/python
-set PYTHON_VERSION=2.2
+#  MSVC configuration
+using msvc : 8.0 ;
+
+#  Python configuration
+using python : 2.4 : C:/dev/tools/Python/ ;
 ]

-The above assumes that the Python installation is in [^c:/dev/tools/python]
-and that we are using Python version 2.2. You'll have to tweak these
-appropriately.
-
-[blurb __tip__ Be sure not to include a third number, e.g. [*not]  "2.2.1",
-even if that's the version you have.]
-
-Take note that you may also do that through the Jamrules file we put in
-our project as detailed above. The file
-has [@../../../../example/tutorial/Jamrules detailed instructions] you 
-can follow.
+The first rule tells Bjam to use the MSVC 8.0 compiler and associated
+tools. The second rule provides information on Python, its version and
+where it is located. The above assumes that the Python installation is
+in [^C:/dev/tools\/Python/]. If you have one fairly "standard" python
+installation for your platform, you might not need to do this.

 Now we are ready... Be sure to [^cd] to [^libs/python/example/tutorial]
-where the tutorial [^"hello.cpp"] and the [^"Jamfile"] is situated.
+where the tutorial [^"hello.cpp"] and the [^"Jamroot"] is situated.

 Finally:

-    bjam -sTOOLS=vc-7_1
-
-We are again assuming that we are using Microsoft Visual C++ version 7.1. If
-not, then you will have to specify the appropriate tool. See
-[@../../../../../../tools/build/index.html Building Boost Libraries] for
-further details.
+    bjam

 It should be building now:

 [pre
 cd C:\dev\boost\libs\python\example\tutorial
-bjam -sTOOLS=msvc
+bjam
 ...patience...
-...found 1703 targets...
-...updating 40 targets...
+...found 1101 targets...
+...updating 35 targets...
 ]

 And so on... Finally:

 [pre
-Creating library bin\boost\libs\python\build\boost_python.dll\vc-7_1\debug\th
-reading-multi\boost_python.lib and object bin\boost\libs\python\build\boost_pyth
-on.dll\vc-7_1\debug\threading-multi\boost_python.exp
-vc-C++ bin\tutorial\hello.pyd\vc-7_1\debug\threading-multi\hello.obj
-hello.cpp
-vc-Link bin\tutorial\hello.pyd\vc-7_1\debug\threading-multi\hello.pyd bin\tutori
-al\hello.pyd\vc-7_1\debug\threading-multi\hello.lib
-   Creating library bin\tutorial\hello.pyd\vc-7_1\debug\threading-multi\hello.li
-b and object bin\tutorial\hello.pyd\vc-7_1\debug\threading-multi\hello.exp
-...updated 31 targets...
+   Creating library /path-to-boost_python.dll/
+   Creating library /path-to-'''hello_ext'''.exp/
+'''**passed**''' ... hello.test
+...updated 35 targets...
 ]

-If all is well, you should now have:
-
-* boost_python.dll
-* hello.pyd
-
-if you are on Windows, and
-
-* libboost_python.so
-* hello.so
-
-if you are on Unix.
-
-[^boost_python.dll] and [^hello.pyd] can be found somewhere in your project's
-[^bin] directory. After a successful build, you make it possible for the system 
-to find boost_python.dll or libboost_python.so (usually done with LD_LIBRARY_PATH, 
-DYLD_LIBRARY_PATH, or some other variable on *nix and with PATH on Windows) and 
-for Python to find the hello module (Done with PYTHONPATH on all systems.)
-
-You may now fire up Python and run our hello module:
-
-[python]
-
-    >>> import hello
-    >>> print hello.greet()
-    hello, world
-
-[c++]
+Or something similar. If all is well, you should now have built the DLLs and
+run the Python program.

 [:[*There you go... Have fun!]]

@@ -495,7 +414,7 @@ Doing so, we get some things for free:
  Python via a pointer or reference to [^Base] can be passed where a pointer
  or reference to [^Derived] is expected.

-Now, we shall expose the C++ free functions [^b] and [^d] and [^factory]:
+Now, we will expose the C++ free functions [^b] and [^d] and [^factory]:

    def("b", b);
    def("d", d);
@@ -505,7 +424,7 @@ Note that free function [^factory] is being used to generate new
 instances of class [^Derived]. In such cases, we use
 [^return_value_policy<manage_new_object>] to instruct Python to adopt
 the pointer to [^Base] and hold the instance in a new Python [^Base]
-object until the the Python object is destroyed. We shall see more of
+object until the the Python object is destroyed. We will see more of
 Boost.Python [link python.call_policies call policies] later.

    // Tell Python to take ownership of factory's result
@@ -516,7 +435,7 @@ Boost.Python [link python.call_policies call policies] later.

 [section Class Virtual Functions]

-In this section, we shall learn how to make functions behave polymorphically
+In this section, we will learn how to make functions behave polymorphically
 through virtual functions. Continuing our example, let us add a virtual function
 to our [^Base] class:

@@ -526,13 +445,13 @@ to our [^Base] class:
        virtual int f() = 0;
    };

-One of the goals of Boost.Python is to be minimally intrusive on an existing C++ 
-design. In principle, it should be possible to expose the interface for a 3rd 
-party library without changing it. It is not ideal to add anything to our class 
-`Base`. Yet, when you have a virtual function that's going to be overridden in 
-Python and called polymorphically *from C++*, we'll need to add some 
-scaffoldings to make things work properly. What we'll do is write a class 
-wrapper that derives from `Base` that will unintrusively hook into the virtual 
+One of the goals of Boost.Python is to be minimally intrusive on an existing C++
+design. In principle, it should be possible to expose the interface for a 3rd
+party library without changing it. It is not ideal to add anything to our class
+`Base`. Yet, when you have a virtual function that's going to be overridden in
+Python and called polymorphically *from C++*, we'll need to add some
+scaffoldings to make things work properly. What we'll do is write a class
+wrapper that derives from `Base` that will unintrusively hook into the virtual
 functions so that a Python override may be called:

    struct BaseWrap : Base, wrapper<Base>
@@ -544,12 +463,14 @@ functions so that a Python override may be called:
    };

 Notice too that in addition to inheriting from `Base`, we also multiply-
-inherited `wrapper<Base>` (See [@../../../v2/wrapper.html Wrapper]). The
+inherited `wrapper<Base>` (See [@/libs/python/doc/v2/wrapper.html Wrapper]). The
 `wrapper` template makes the job of wrapping classes that are meant to
 overridden in Python, easier.

-[blurb __alert__ [*MSVC6/7 Workaround]\n\n 
-If you are using Microsoft Visual C++ 6 or 7, you have to write `f` as:\n\n
+[blurb __alert__ [*MSVC6/7 Workaround]
+
+If you are using Microsoft Visual C++ 6 or 7, you have to write `f` as:
+
 `return call<int>(this->get_override("f").ptr());`.]

 BaseWrap's overridden virtual member function `f` in effect calls the
@@ -561,24 +482,25 @@ Finally, exposing `Base`:
        .def("f", pure_virtual(&Base::f))
        ;

-`pure_virtual` signals Boost.Python that the function `f` is a pure virtual 
+`pure_virtual` signals Boost.Python that the function `f` is a pure virtual
 function.

-[blurb __note__ [*member function and methods]\n\n Python, like
-many object oriented languages uses the term [*methods].  Methods
-correspond roughly to C++'s [*member functions]]
+[note [*member function and methods]
+
+Python, like many object oriented languages uses the term [*methods].
+Methods correspond roughly to C++'s [*member functions]]

 [endsect]

 [section Virtual Functions with Default Implementations]

-We've seen in the previous section how classes with pure virtual functions are 
-wrapped using Boost.Python's [@../../../v2/wrapper.html class wrapper]
-facilities. If we wish to wrap [*non]-pure-virtual functions instead, the 
+We've seen in the previous section how classes with pure virtual functions are
+wrapped using Boost.Python's [@/libs/python/doc/v2/wrapper.html class wrapper]
+facilities. If we wish to wrap [*non]-pure-virtual functions instead, the
 mechanism is a bit different.

-Recall that in the [link python.class_virtual_functions previous section], we 
-wrapped a class with a pure virtual function that we then implemented in C++, or 
+Recall that in the [link python.class_virtual_functions previous section], we
+wrapped a class with a pure virtual function that we then implemented in C++, or
 Python classes derived from it. Our base class:

    struct Base
@@ -596,7 +518,7 @@ not declared as pure virtual:
    };

 We wrap it this way:
-    
+
    struct BaseWrap : Base, wrapper<Base>
    {
        int f()
@@ -608,24 +530,26 @@ We wrap it this way:

        int default_f() { return this->Base::f(); }
    };
-    
-Notice how we implemented `BaseWrap::f`. Now, we have to check if there is an 
+
+Notice how we implemented `BaseWrap::f`. Now, we have to check if there is an
 override for `f`. If none, then we call `Base::f()`.

-[blurb __alert__ [*MSVC6/7 Workaround]\n\n 
+[blurb __alert__ [*MSVC6/7 Workaround]
+
 If you are using Microsoft Visual C++ 6 or 7, you have to rewrite the line
-with the `*note*` as:\n\n
+with the `*note*` as:
+
 `return call<char const*>(f.ptr());`.]

 Finally, exposing:
-    
+
    class_<BaseWrap, boost::noncopyable>("Base")
        .def("f", &Base::f, &BaseWrap::default_f)
        ;

-Take note that we expose both `&Base::f` and `&BaseWrap::default_f`. 
-Boost.Python needs to keep track of 1) the dispatch function [^f] and 2) the 
-forwarding function to its default implementation [^default_f]. There's a 
+Take note that we expose both `&Base::f` and `&BaseWrap::default_f`.
+Boost.Python needs to keep track of 1) the dispatch function [^f] and 2) the
+forwarding function to its default implementation [^default_f]. There's a
 special [^def] function for this purpose.

 In Python, the results would be as expected:
@@ -715,7 +639,7 @@ that correspond to these Python ['special functions]. Example:

 Need we say more?

-[blurb __note__ What is the business of `operator<<`?
+[note What is the business of `operator<<`?
 Well, the method `str` requires the `operator<<` to do its work (i.e.
 `operator<<` is used by the method defined by `def(str(self))`.]

@@ -725,9 +649,9 @@ Well, the method `str` requires the `operator<<` to do its work (i.e.
 [section Functions]

 In this chapter, we'll look at Boost.Python powered functions in closer
-detail. We shall see some facilities to make exposing C++ functions to
+detail. We will see some facilities to make exposing C++ functions to
 Python safe from potential pifalls such as dangling pointers and
-references. We shall also see facilities that will make it even easier for
+references. We will also see facilities that will make it even easier for
 us to expose C++ functions that take advantage of C++ features such as
 overloading and default arguments.

@@ -888,20 +812,23 @@ or more policies can be composed by chaining. Here's the general syntax:
            policy3<args...> > >

 Here is the list of predefined call policies. A complete reference detailing
-these can be found [@../../../v2/reference.html#models_of_call_policies here].
+these can be found [@/libs/python/doc/v2/reference.html#models_of_call_policies here].

-* [*with_custodian_and_ward]\n Ties lifetimes of the arguments
-* [*with_custodian_and_ward_postcall]\n Ties lifetimes of the arguments and results
-* [*return_internal_reference]\n Ties lifetime of one argument to that of result
-* [*return_value_policy<T> with T one of:]\n
-* [*reference_existing_object]\nnaive (dangerous) approach
-* [*copy_const_reference]\nBoost.Python v1 approach
-* [*copy_non_const_reference]\n
-* [*manage_new_object]\n Adopt a pointer and hold the instance
+* [*with_custodian_and_ward]:  Ties lifetimes of the arguments
+* [*with_custodian_and_ward_postcall]:  Ties lifetimes of the arguments and results
+* [*return_internal_reference]:  Ties lifetime of one argument to that of result
+* [*return_value_policy<T> with T one of:]
+    * [*reference_existing_object]: naive (dangerous) approach
+    * [*copy_const_reference]: Boost.Python v1 approach
+    * [*copy_non_const_reference]:
+    * [*manage_new_object]: Adopt a pointer and hold the instance

-[blurb :-) [*Remember the Zen, Luke:]\n\n
-"Explicit is better than implicit"\n
-"In the face of ambiguity, refuse the temptation to guess"\n]
+[blurb :-) [*Remember the Zen, Luke:]
+
+"Explicit is better than implicit"
+
+"In the face of ambiguity, refuse the temptation to guess"
+]

 [endsect]
 [section Overloading]
@@ -935,7 +862,7 @@ We have here our C++ class:
        };
    };

-Class X has 4 overloaded functions. We shall start by introducing some
+Class X has 4 overloaded functions. We will start by introducing some
 member function pointer variables:

    bool    (X::*fx1)(int)              = &X::f;
@@ -1043,7 +970,7 @@ fourth macro argument). The thin wrappers are all enclosed in a class named

    .def("wack_em", &george::wack_em, george_overloads());

-See the [@../../../v2/overloads.html#BOOST_PYTHON_FUNCTION_OVERLOADS-spec overloads reference]
+See the [@/libs/python/doc/v2/overloads.html#BOOST_PYTHON_FUNCTION_OVERLOADS-spec overloads reference]
 for details.

 [h2 init and optional]
@@ -1141,7 +1068,7 @@ Then...
 Python is dynamically typed, unlike C++ which is statically typed. Python
 variables may hold an integer, a float, list, dict, tuple, str, long etc.,
 among other things. In the viewpoint of Boost.Python and C++, these
-Pythonic variables are just instances of class [^object]. We shall see in
+Pythonic variables are just instances of class [^object]. We will see in
 this chapter how to deal with Python objects.

 As mentioned, one of the goals of Boost.Python is to provide a
@@ -1290,14 +1217,14 @@ we wanted to do above can be achieved by writing:
    Vec2& v = extract<Vec2&>(o);
    assert(l == v.length());

-The first line attempts to extract the "length" attribute of the Boost.Python 
-[^object]. The second line attempts to ['extract] the [^Vec2] object from held 
+The first line attempts to extract the "length" attribute of the Boost.Python
+[^object]. The second line attempts to ['extract] the [^Vec2] object from held
 by the Boost.Python [^object].

-Take note that we said "attempt to" above. What if the Boost.Python [^object] 
-does not really hold a [^Vec2] type? This is certainly a possibility considering 
-the dynamic nature of Python [^object]s. To be on the safe side, if the C++ type 
-can't be extracted, an appropriate exception is thrown. To avoid an exception, 
+Take note that we said "attempt to" above. What if the Boost.Python [^object]
+does not really hold a [^Vec2] type? This is certainly a possibility considering
+the dynamic nature of Python [^object]s. To be on the safe side, if the C++ type
+can't be extracted, an appropriate exception is thrown. To avoid an exception,
 we need to test for extractibility:

    extract<Vec2&> x(o);
@@ -1335,10 +1262,12 @@ current [^scope()], which is usually the current module. The snippet above
 creates a Python class derived from Python's [^int] type which is
 associated with the C++ type passed as its first parameter.

-[blurb __note__ [*what is a scope?]\n\n The scope is a class that has an
-associated global Python object which controls the Python namespace in
-which new extension classes and wrapped functions will be defined as
-attributes. Details can be found [@../../../v2/scope.html here].]
+[note [*what is a scope?]
+
+The scope is a class that has an associated global Python object which
+controls the Python namespace in which new extension classes and wrapped
+functions will be defined as attributes. Details can be found
+[@/libs/python/doc/v2/scope.html here].]

 You can access those values in Python as

@@ -1399,7 +1328,7 @@ in Boost's [^/libs/python/build/bin-stage] subdirectory. On Windows, the
 variants are called [^boost_python.lib] (for release builds) and
 [^boost_python_debug.lib] (for debugging). If you can't find the libraries,
 you probably haven't built Boost.Python yet. See
-[@../../../building.html Building and Testing] on how to do this.
+[@/libs/python/doc/building.html Building and Testing] on how to do this.

 Python's library can be found in the [^/libs] subdirectory of
 your Python directory. On Windows it is called pythonXY.lib where X.Y is
@@ -1433,15 +1362,15 @@ Being able to build is nice, but there is nothing to build yet. Embedding
 the Python interpreter into one of your C++ programs requires these 4
 steps:

-# '''#include''' [^<boost/python.hpp>]\n\n
+# '''#include''' [^<boost/python.hpp>]

-# Call Py_Initialize() to start the interpreter and create the [^__main__] module.\n\n
+# Call Py_Initialize() to start the interpreter and create the [^__main__] module.

-# Call other Python C API routines to use the interpreter.\n\n
+# Call other Python C API routines to use the interpreter.

 [/ # Call Py_Finalize() to stop the interpreter and release its resources.]

-[blurb __note__ [*Note that at this time you must not call Py_Finalize() to stop the
+[note [*Note that at this time you must not call Py_Finalize() to stop the
 interpreter. This may be fixed in a future version of boost.python.]
 ]

@@ -1452,13 +1381,13 @@ interpreter. This may be fixed in a future version of boost.python.]
 [section Using the interpreter]

 As you probably already know, objects in Python are reference-counted.
-Naturally, the [^PyObject]s of the Python/C API are also reference-counted.
+Naturally, the [^PyObject]s of the Python\/C API are also reference-counted.
 There is a difference however. While the reference-counting is fully
-automatic in Python, the Python/C API requires you to do it
+automatic in Python, the Python\/C API requires you to do it
 [@http://www.python.org/doc/current/api/refcounts.html by hand]. This is
 messy and especially hard to get right in the presence of C++ exceptions.
-Fortunately Boost.Python provides the [@../../../v2/handle.html handle] and
-[@../../../v2/object.html object] class templates to automate the process.
+Fortunately Boost.Python provides the [@/libs/python/doc/v2/handle.html handle] and
+[@/libs/python/doc/v2/object.html object] class templates to automate the process.

 [h2 Running Python code]

@@ -1499,10 +1428,10 @@ containing a phrase that is well-known in programming circles.

 [h2 Manipulating Python objects]

-Often we'd like to have a class to manipulate Python objects. 
-But we have already seen such a class above, and in the 
-[@python/object.html previous section]: the aptly named [^object] class 
-and its derivatives. We've already seen that they can be constructed from 
+Often we'd like to have a class to manipulate Python objects.
+But we have already seen such a class above, and in the
+[@python/object.html previous section]: the aptly named [^object] class
+and its derivatives. We've already seen that they can be constructed from
 a [^handle]. The following examples should further illustrate this fact:

    object main_module = import("__main__");
@@ -1521,7 +1450,7 @@ which returns the result directly:
 [h2 Exception handling]

 If an exception occurs in the evaluation of the python expression,
-[@../../../v2/errors.html#error_already_set-spec error_already_set] is thrown:
+[@/libs/python/doc/v2/errors.html#error_already_set-spec error_already_set] is thrown:

    try
    {
@@ -1650,7 +1579,7 @@ So far, we have seen how to expose C++ iterators and ranges to Python.
 Sometimes we wish to go the other way, though: we'd like to pass a
 Python sequence to an STL algorithm or use it to initialize an STL
 container. We need to make a Python iterator look like an STL iterator.
-For that, we use `stl_input_iterator<>`. Consider how we might 
+For that, we use `stl_input_iterator<>`. Consider how we might
 implement a function that exposes `std::list<int>::assign()` to
 Python:

@@ -1754,7 +1683,7 @@ separately with Boost.Python, like this:
 Compiling these files will generate the following Python extensions:
 [^core.pyd], [^io.pyd] and [^filters.pyd].

-[blurb __note__ The extension [^.pyd] is used for python extension modules, which
+[note The extension [^.pyd] is used for python extension modules, which
 are just shared libraries.  Using the default for your system, like [^.so] for
 Unix and [^.dll] for Windows, works just as well.]

@@ -2025,13 +1954,13 @@ This method is recommended too if you are developing the C++ library and
 exporting it to Python at the same time: changes in a class will only demand
 the compilation of a single cpp, instead of the entire wrapper code.

-[blurb __note__ If you're exporting your classes with [@../../../../pyste/index.html Pyste],
+[note If you're exporting your classes with [@/libs/python/doc/pyste/index.html Pyste],
 take a look at the [^--multiple] option, that generates the wrappers in
 various files as demonstrated here.]

-[blurb __note__ This method is useful too if you are getting the error message
+[note This method is useful too if you are getting the error message
 ['"fatal error C1204:Compiler limit:internal structure overflow"] when compiling
-a large source file, as explained in the [@../../../v2/faq.html#c1204 FAQ].]
+a large source file, as explained in the [@/libs/python/doc/v2/faq.html#c1204 FAQ].]

 [endsect]
 [endsect] [/ General Techniques]
--- a/doc/tutorial/index.html
+++ b/doc/tutorial/index.html
@@ -11,8 +11,8 @@
    <a href="doc/html/index.html">link</a> &nbsp;<hr>
    <p>© Copyright Beman Dawes, 2001</p>
    <p>Distributed under the Boost Software License, Version 1.0. (See 
-    accompanying file <a href="../../../LICENSE_1_0.txt">
+    accompanying file <a href="../../../../LICENSE_1_0.txt">
    LICENSE_1_0.txt</a> or copy at
    <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
  </body>
-</html>
+</html>
--- a/doc/v2/Apr2002.html
+++ b/doc/v2/Apr2002.html
@@ -160,7 +160,7 @@ documentation).
  13 November, 2002
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
 </p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
+<p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 
  2002. </i></p>
 </body>
 </html>
--- a/doc/v2/CallPolicies.html
+++ b/doc/v2/CallPolicies.html
@@ -8,7 +8,7 @@
    <meta name="generator" content=
    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href=../../../../boost.css>
+    <link rel="stylesheet" type="text/css" href="../../../../boost.css">

    <title>Boost.Python - CallPolicies Concept</title>
  </head>
@@ -60,6 +60,7 @@

      <li><code>postcall</code> - Python argument tuple and result management
      after the wrapped object is invoked</li>
+      <li><code>extract_return_type</code> - metafunction for extracting the return type from a given signature type sequence</li>
    </ol>

    <h2><a name="composition"></a>CallPolicies Composition</h2>
@@ -132,7 +133,16 @@
        reference count must be decremented; if another existing object is
        returned, its reference count must be incremented.</td>
      </tr>
-    </table>
+      <tr>
+        <td valign="top"><code>P::extract_return_type</code></td>
+
+        <td>A model of <a href=
+          "../../../doc/refmanual/metafunction.html">Metafunction</a>.</td>
+
+        <td>An MPL unary <a href=
+          "../../../mpl/doc/refmanual/metafunction.html">Metafunction</a> used extract the return type from a given signature. By default it is derived from mpl::front.</td>
+      </tr>
+  </table>
    Models of CallPolicies are required to be <a href=
    "../../../utility/CopyConstructible.html">CopyConstructible</a>. 
    <hr>
@@ -144,7 +154,7 @@
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>

    <p>Permission to copy, use, modify, sell and distribute this software is
    granted provided this copyright notice appears in all copies. This
--- a/doc/v2/Dereferenceable.html
+++ b/doc/v2/Dereferenceable.html
@@ -63,7 +63,7 @@ type <code>T</code>.  In addition, all pointers are Dereferenceable.
  18 December, 2003
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
 </p>
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
+    <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
    Abrahams</a> 2002-2003. </i>

 <p>Permission to copy, use, modify, sell
--- a/doc/v2/Extractor.html
+++ b/doc/v2/Extractor.html
@@ -85,7 +85,7 @@ are layout-compatible with PyObject.
  13 November, 2002
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
 </p>
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
+    <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
    Abrahams</a> 2002. </i>

 <p>Permission to copy, use, modify, sell
--- a/doc/v2/HolderGenerator.html
+++ b/doc/v2/HolderGenerator.html
@@ -63,7 +63,7 @@ type.
  13 November, 2002
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
 </p>
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
+    <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
    Abrahams</a> 2002. </i>

 <p>Permission to copy, use, modify, sell
--- a/doc/v2/Jun2002.html
+++ b/doc/v2/Jun2002.html
@@ -223,7 +223,7 @@ you'll just have to wait till next month (hopefully the beginning).
  13 November, 2002
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
 </p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
+<p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 
  2002. </i></p>
 </body>
 </html>
--- a/doc/v2/Mar2002.html
+++ b/doc/v2/Mar2002.html
@@ -231,7 +231,7 @@ worth doing anything about it.
  13 November, 2002
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
 </p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
+<p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 
  2002. </i></p>
 </body>
 </html>
--- a/doc/v2/May2002.html
+++ b/doc/v2/May2002.html
@@ -305,7 +305,7 @@ to these issues will probably have to be formalized before long.
  13 November, 2002
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
 </p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
+<p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 
  2002. </i></p>
 </body>
 </html>
--- a/doc/v2/ObjectWrapper.html
+++ b/doc/v2/ObjectWrapper.html
@@ -147,7 +147,7 @@ instances of the associated Python type will be considered a match.
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/ResultConverter.html
+++ b/doc/v2/ResultConverter.html
@@ -1,10 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
 <!-- Copyright David Abrahams 2006. Distributed under 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) -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href=../../../../boost.css>
+<link rel="stylesheet" type="text/css" href="../../../../boost.css">
 <title>Boost.Python - ResultConverter Concept</title>
 </head>
 <body link="#0000ff" vlink="#800080">
@@ -24,10 +26,12 @@
 <dl class="page-index"> 
  <dt><a href="#introduction">Introduction</a></dt>
  <dt><a href="#concept-requirements">Concept Requirements</a></dt>
-  <dl class="page-index"> 
-    <dt><a href="#ResultConverter-concept">ResultConverter Concept</a></dt>
-    <dt><a href="#ResultConverterGenerator-concept">ResultConverterGenerator Concept</a></dt>
-  </dl>
+  <dd>
+    <dl class="page-index"> 
+      <dt><a href="#ResultConverter-concept">ResultConverter Concept</a></dt>
+      <dt><a href="#ResultConverterGenerator-concept">ResultConverterGenerator Concept</a></dt>
+    </dl>
+  </dd>
 </dl>

 <h2><a name="introduction"></a>Introduction</h2>
@@ -79,6 +83,13 @@ denotes an object of type <code><b>R</b></code>.
    href="http://www.python.org/doc/current/api/exceptionHandling.html#l2h-71">PyErr_Occurred</a>
    should return non-zero.</td>
  </tr>
+  <tr> 
+    <td valign="top"><code>c.get_pytype()</code></td>
+    <td><code>PyTypeObject const*</code></td>
+    <td>A pointer to a Python Type object corresponding to result of the conversion,
+    or <code>0</code>. Used for documentation generation. If <code>0</code> is returned
+    the generated type in the documentation will be <b>object</b> .</td>
+  </tr>
 </table>

 <h3><a name="ResultConverterGenerator-concept"></a>ResultConverterGenerator Concept</h3>
@@ -102,7 +113,7 @@ C++ function return type.
  09 May, 2002    <!--Luann's birthday! -->
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
 </p>
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
+    <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
    Abrahams</a> 2002. </i>

 <p>Permission to copy, use, modify, sell
--- a/doc/v2/acknowledgments.html
+++ b/doc/v2/acknowledgments.html
@@ -31,7 +31,7 @@
    </table>
    <hr>

-    <p><a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> is
+    <p><a href="http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> is
    the architect, designer, and implementor of <b>Boost.Python</b>.</p>

    <p><a href="mailto:brett.calcott@paradise.net.nz">Brett Calcott</a>
@@ -47,7 +47,7 @@
    argument support</a> and wrote the excellent <a href=
    "../tutorial/index.html">tutorial documentation</a>.</p>

-    <p><a href="../../../../people/ralf_w_grosse_kunstleve.htm">Ralf W.
+    <p><a href="http://www.boost.org/people/ralf_w_grosse_kunstleve.htm">Ralf W.
    Grosse-Kunstleve</a> implemented the <a href="pickle.html">pickle
    support</a>, and has enthusiastically supported the library since its
    birth, contributing to design decisions and providing invaluable
@@ -59,15 +59,15 @@
    C++ and Python for solving the problems of large-scale software
    construction.</p>

-    <p><a href="../../../../people/aleksey_gurtovoy.htm">Aleksey Gurtovoy</a>
+    <p><a href="http://www.boost.org/people/aleksey_gurtovoy.htm">Aleksey Gurtovoy</a>
    wrote an incredible C++ <a href="http://www.mywikinet.com/mpl">Template
    Metaprogramming Library</a> which allows Boost.Python to perform much of
    its compile-time magic. In addition, Aleksey very generously contributed
    his time and deep knowledge of the quirks of various buggy compilers to
    help us get around problems at crucial moments.</p>

-    <p><a href="../../../../people/paul_mensonides.htm">Paul Mensonides</a>,
-    building on the work <a href="../../../../people/vesa_karvonen.htm">Vesa
+    <p><a href="http://www.boost.org/people/paul_mensonides.htm">Paul Mensonides</a>,
+    building on the work <a href="http://www.boost.org/people/vesa_karvonen.htm">Vesa
    Karvonen</a>, wrote a similarly amazing <a href=
    "../../../preprocessor/doc/index.html">Preprocessor Metaprogramming
    Library</a>, and generously contributed the time and expertise to get it
@@ -129,7 +129,7 @@
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/args.html
+++ b/doc/v2/args.html
@@ -193,7 +193,7 @@ BOOST_PYTHON_MODULE(xxx)
    <p>Revised 01 August, 2003</p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002-2003.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002-2003.</i></p>
  </body>
 </html>

--- a/doc/v2/call.html
+++ b/doc/v2/call.html
@@ -79,7 +79,7 @@ double apply2(PyObject* func, double x, double y)
  9 May, 2002 <!-- Luann's birthday! -->
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
 </p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
+<p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 
  2002. </i></p>
 </body>
 </html>
--- a/doc/v2/call_method.html
+++ b/doc/v2/call_method.html
@@ -155,7 +155,7 @@ BOOST_PYTHON_MODULE(my_module)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/callbacks.html
+++ b/doc/v2/callbacks.html
@@ -248,7 +248,7 @@ void apply(PyObject* callable, X&amp; x)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/class.html
+++ b/doc/v2/class.html
@@ -784,7 +784,7 @@ class_&lt;Derived, bases&lt;Base&gt; &gt;("Derived");
 <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
   1 November, 2005 <!--webbot bot="Timestamp" endspan i-checksum="39359" -->

-  <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
+  <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
  Abrahams</a> 2002.</i></p>
 </body>
 </html>
--- a/doc/v2/configuration.html
+++ b/doc/v2/configuration.html
@@ -139,6 +139,41 @@
        compares <code>typeid(T).name()</code> instead of using and comparing
        the <code>std::type_info</code> objects directly.</td>
      </tr>
+      <tr>
+        <td valign="top"><code>BOOST_PYTHON_NO_PY_SIGNATURES</code></td>
+
+        <td valign="top" align="center"><i>not&nbsp;defined</i></td>
+
+        <td valign="top">If defined for a module no pythonic signatures are generated 
+        for the docstrings of the module functions, and no python type is associated with any
+        of the converters registered by the module. This also reduces the binary size of the 
+        module by about 14% (gcc compiled).<br>
+        If defined for the boost_python runtime library, the default for the 
+        <code>docstring_options.enable_py_signatures()</code> is set to <code>false</code>.
+        </td>
+
+      </tr>
+      <tr>
+        <td valign="top"><code>BOOST_PYTHON_SUPPORTS_PY_SIGNATURES</code></td>
+
+        <td valign="top" align="center"><i>defined if <code>BOOST_PYTHON_NO_PY_SIGNATURES</code> is undefined</i></td>
+
+        <td valign="top">This macro is defined to enable a smooth transition from older Boost.Python versions
+        which do not support pythonic signatures. For example usage see 
+        <a href="pytype_function.html#examples">here</a>.
+        </td>
+
+      </tr>
+      <tr>
+        <td valign="top"><code>BOOST_PYTHON_PY_SIGNATURES_PROPER_INIT_SELF_TYPE</code></td>
+
+        <td valign="top" align="center"><i>not&nbsp;defined</i></td>
+
+        <td valign="top">If defined the python type of <code>__init__</code> method "self" parameters
+        is properly generated, otherwise <code><b>object</b></code> is used. It is undefined
+        by default because it increases the binary size of the module by about 14% (gcc compiled).</td>
+
+      </tr>
    </table>
    <hr>

@@ -149,7 +184,7 @@
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/copy_const_reference.html
+++ b/doc/v2/copy_const_reference.html
@@ -143,7 +143,7 @@ BOOST_PYTHON_MODULE(my_module)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/copy_non_const_reference.html
+++ b/doc/v2/copy_non_const_reference.html
@@ -143,7 +143,7 @@ BOOST_PYTHON_MODULE(my_module)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/data_members.html
+++ b/doc/v2/data_members.html
@@ -223,7 +223,7 @@ BOOST_PYTHON_MODULE_INIT(data_members_example)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/def.html
+++ b/doc/v2/def.html
@@ -185,7 +185,7 @@ BOOST_PYTHON_MODULE(def_test)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/default_call_policies.html
+++ b/doc/v2/default_call_policies.html
@@ -82,6 +82,7 @@ namespace boost { namespace python
        static PyObject* postcall(PyObject*, PyObject* result);
        typedef <a href=
 "#default_result_converter-spec">default_result_converter</a> result_converter;
+        template &lt;class Sig&gt; struct extract_return_type : mpl::front&lt;Sig&gt;{};
    };
 }}
 </pre>
@@ -161,11 +162,11 @@ struct return_value_policy : Base

    <p>Revised 
    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
+  11 June, 2007
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->


-  <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
+  <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
  Abrahams</a> 2002.</i> Distributed under 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)</p>
--- a/doc/v2/definitions.html
+++ b/doc/v2/definitions.html
@@ -96,7 +96,7 @@
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/dict.html
+++ b/doc/v2/dict.html
@@ -146,7 +146,7 @@ dict swap_object_dict(object target, dict d)
    <p>Revised 30 September, 2002</p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/docstring_options.html
+++ b/doc/v2/docstring_options.html
@@ -103,6 +103,8 @@ namespace boost { namespace python {

          docstring_options(bool show_user_defined, bool show_signatures);

+          docstring_options(bool show_user_defined, bool show_py_signatures, bool show_cpp_signatures);
+
          ~docstring_options();

          void
@@ -117,6 +119,18 @@ namespace boost { namespace python {
          void
          enable_signatures();

+          void
+          disable_py_signatures();
+
+          void
+          enable_py_signatures();
+
+          void
+          disable_cpp_signatures();
+
+          void
+          enable_cpp_signatures();
+
          void
          disable_all();

@@ -139,7 +153,7 @@ docstring_options(bool show_all=true);
    object which controls the appearance of function and
    member-function docstrings defined in the code that follows. If
    <code>show_all</code> is <code>true</code>, both the
-    user-defined docstrings and the automatically generated C++
+    user-defined docstrings and the automatically generated Python and C++
    signatures are shown. If <code>show_all</code> is
    <code>false</code> the <code>__doc__</code> attributes are
    <code>None</code>.</dt>
@@ -154,12 +168,29 @@ docstring_options(bool show_user_defined, bool show_signatures);
    member-function docstrings defined in the code that follows.
    Iff <code>show_user_defined</code> is <code>true</code>, the
    user-defined docstrings are shown. Iff
-    <code>show_signatures</code> is <code>true</code>, C++
+    <code>show_signatures</code> is <code>true</code>, Python and C++
    signatures are automatically added. If both
    <code>show_user_defined</code> and <code>show_signatures</code>
    are <code>false</code>, the <code>__doc__</code> attributes are
    <code>None</code>.</dt>
  </dl>
+  <pre>
+docstring_options(bool show_user_defined, bool show_py_signatures, bool show_cpp_signatures);
+</pre>
+
+  <dl class="function-semantics">
+    <dt><b>Effects:</b> Constructs a <code>docstring_options</code>
+    object which controls the appearance of function and
+    member-function docstrings defined in the code that follows.
+    Iff <code>show_user_defined</code> is <code>true</code>, the
+    user-defined docstrings are shown. Iff
+    <code>show_py_signatures</code> is <code>true</code>, Python 
+    signatures are automatically added. Iff 
+    <code>show_cpp_signatures</code> is <code>true</code>, C++ 
+    signatures are automatically added. If all parameters are
+    <code>false</code>, the <code>__doc__</code> attributes are
+    <code>None</code>.</dt>
+  </dl>

  <h4><a name="docstring_options-spec-dtors" id=
  "docstring_options-spec-dtors"></a>Class
@@ -186,6 +217,10 @@ void disable_user_defined();
 void enable_user_defined();
 void disable_signatures();
 void enable_signatures();
+void disable_py_signatures();
+void enable_py_signatures();
+void disable_cpp_signatures();
+void enable_cpp_signatures();
 void disable_all();
 void enable_all();
 </pre>
@@ -196,7 +231,7 @@ void enable_all();
    <code>*_user_defined()</code> and <code>*_signatures()</code>
    member functions are provided for fine-grained control. The
    <code>*_all()</code> member functions are convenient shortcuts
-    to manipulate both settings simultaneously.</dt>
+    to manipulate all settings simultaneously.</dt>
  </dl>

  <h2><a name="examples" id="examples"></a>Examples</h2>
@@ -219,7 +254,7 @@ BOOST_PYTHON_MODULE(demo)
  <pre>
 &gt;&gt;&gt; import demo
 &gt;&gt;&gt; print demo.foo.__doc__
-foo doc
+foo() -&gt; None : foo doc
 C++ signature:
    foo(void) -&gt; void
 </pre>If compiled with
@@ -253,21 +288,33 @@ BOOST_PYTHON_MODULE(demo)
    def("foo3", foo3, arg("f"), "foo3 doc");
    doc_options.enable_user_defined();
    def("foo4", foo4, arg("d"), "foo4 doc");
+    doc_options.enable_py_signatures();
+    def("foo5", foo4, arg("d"), "foo5 doc");
+    doc_options.disable_py_signatures();
+    doc_options.enable_cpp_signatures();
+    def("foo6", foo4, arg("d"), "foo6 doc");
 }
 </pre>Python code:
  <pre>
 &gt;&gt;&gt; import demo
 &gt;&gt;&gt; print demo.foo1.__doc__
-foo1 doc
+foo1( (int)i) -&gt; int : foo1 doc
 C++ signature:
    foo1(int i) -&gt; int
 &gt;&gt;&gt; print demo.foo2.__doc__
+foo2( (int)l) -&gt; int : 
 C++ signature:
    foo2(long l) -&gt; int
 &gt;&gt;&gt; print demo.foo3.__doc__
 None
 &gt;&gt;&gt; print demo.foo4.__doc__
 foo4 doc
+&gt;&gt;&gt; print demo.foo5.__doc__
+foo5( (float)d) -&gt; int : foo5 doc
+&gt;&gt;&gt; print demo.foo6.__doc__
+foo6 doc
+C++ signature:
+    foo6(double d) -&gt; int
 </pre>

  <h4>Wrapping from multiple C++ scopes</h4>
@@ -333,7 +380,7 @@ bar2 doc
  <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>

  <p><i>&copy; Copyright <a href=
-  "../../../../people/ralf_w_grosse_kunstleve.htm">Ralf W.
+  "http://www.boost.org/people/ralf_w_grosse_kunstleve.htm">Ralf W.
  Grosse-Kunstleve</a> 2006.</i></p>
 </body>
 </html>
--- a/doc/v2/enum.html
+++ b/doc/v2/enum.html
@@ -89,7 +89,7 @@ namespace boost { namespace python
  template &lt;class T&gt;
  class enum_ : public <a href="object.html#object-spec">object</a>
  {
-    enum_(char const* name);
+    enum_(char const* name, char const* doc = 0);
    enum_&lt;T&gt;&amp; value(char const* name, T);
    enum_&lt;T&gt;&amp; export_values();
  };
@@ -99,7 +99,7 @@ namespace boost { namespace python
    <h4><a name="enum_-spec-ctors"></a>Class template <code>enum_</code>
    constructors</h4>
 <pre>
-enum_(char const* name);
+enum_(char const* name, char const* doc=0);
 </pre>

    <dl class="function-semantics">
@@ -131,7 +131,7 @@ inline enum_&lt;T&gt;&amp; value(char const* name, T x);

      <dt><b>Effects:</b> adds an instance of the wrapped enumeration
      type with value <code>x</code> to the type's dictionary as the
-      <code>name</code>d attribute</dt>.
+      <code>name</code>d attribute.</dt>

      <dt><b>Returns:</b> <code>*this</code></dt>

@@ -146,7 +146,7 @@ inline enum_&lt;T&gt;&amp; export_values();
      <dt><b>Effects:</b> sets attributes in the current <a
        href="scope.html#scope-spec"><code>scope</code></a> with the
        same names and values as all enumeration values exposed so far
-        by calling <code>value()</code></dt>.
+        by calling <code>value()</code>.</dt>

      <dt><b>Returns:</b> <code>*this</code></dt>

@@ -228,7 +228,7 @@ TypeError: bad argument type for built-in operation
     

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/errors.html
+++ b/doc/v2/errors.html
@@ -283,7 +283,7 @@ same_name2(PyObject* args, PyObject* keywords)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/exception_translator.html
+++ b/doc/v2/exception_translator.html
@@ -144,7 +144,7 @@ BOOST_PYTHON_MODULE(exception_translator_ext)
    <p>Revised 03 October, 2002</p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/exec.html
+++ b/doc/v2/exec.html
@@ -127,7 +127,7 @@ void greet()

  // Define greet function in Python.
  object result = exec(
-    "def greet(self):               \n"
+    "def greet():                   \n"
    "   return 'Hello from Python!' \n",
    global, global);

@@ -144,7 +144,7 @@ void greet()
      we could also store it in an a file...</para>

 <pre>
-def greet(self):
+def greet():
   return 'Hello from Python!'
 </pre>
    <para>... and execute that instead.</para>
--- a/doc/v2/extract.html
+++ b/doc/v2/extract.html
@@ -226,7 +226,7 @@ BOOST_PYTHON_MODULE(extract_ext)
    <p>Revised 15 November, 2002</p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/faq.html
+++ b/doc/v2/faq.html
@@ -856,6 +856,6 @@ BOOST_PYTHON_MODULE(custom_string)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002-2006.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002-2006.</i></p>
  </body>
 </html>
--- a/doc/v2/feb2002.html
+++ b/doc/v2/feb2002.html
@@ -361,7 +361,7 @@


  <p class="c3">&copy; Copyright <a href=
-  "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. Distributed
+  "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002. Distributed
  under 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)</p>

--- a/doc/v2/function_doc_signature.html
+++ b/doc/v2/function_doc_signature.html
@@ -0,0 +1,216 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<!-- Copyright Nikolay Mladenov	 2007. Distributed under 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) -->
+<html>
+<head>
+  <meta http-equiv="Content-Type" content=
+  "text/html; charset=us-ascii">
+  <link rel="stylesheet" type="text/css" href="../boost.css">
+
+  <title>Boost.Python -
+  &lt;boost/python/doobject/function_doc_signature.hpp&gt;</title>
+</head>
+
+<body>
+  <table border="0" cellpadding="7" cellspacing="0" width="100%"
+  summary="header">
+    <tr>
+      <td valign="top" width="300">
+        <h3><a href="../../../../index.htm"><img height="86" width=
+        "277" alt="C++ Boost" src="../../../../boost.png" border=
+        "0"></a></h3>
+      </td>
+
+      <td valign="top">
+        <h1 align="center"><a href=
+        "../index.html">Boost.Python</a></h1>
+
+        <h2 align="center">Header
+        &lt;boost/python/object/function_doc_signature.hpp&gt;</h2>
+      </td>
+    </tr>
+  </table>
+  <hr>
+
+  <h2>Contents</h2>
+
+  <dl class="page-index">
+    <dt><a href="#introduction">Introduction</a></dt>
+
+    <dt><a href="#classes">Classes</a></dt>
+
+    <dd>
+      <dl class="page-index">
+        <dt><a href="#function_doc_signature_generator-spec">Class
+        <code>function_doc_signature_generator</code></a></dt>
+
+        <dd>
+          <dl class="page-index">
+            <dt><a href="#function_doc_signature_generator-spec-synopsis">Class
+            <code>function_doc_signature_generator</code> synopsis</a></dt>
+
+          </dl>
+        </dd>
+      </dl>
+    </dd>
+
+    <dt><a href="#examples">Examples</a></dt>
+  </dl>
+  <hr>
+
+  <h2><a name="introduction" id=
+  "introduction"></a>Introduction</h2>
+
+  <p>Boost.Python supports docstrings with automatic
+  appending of Pythonic and C++ signatures. This feature is implemented 
+  by <code>class function_doc_signature_generator</code>
+  The class uses all of the overloads, supplied arg names and default values, as well as 
+  the user-defined docstrings, to generate documentation for a given function.</p>
+
+  <h2><a name="classes" id="classes"></a>Classes</h2>
+
+  <h3><a name="function_doc_signature_generator-spec" id=
+  "function_doc_signature_generator-spec"></a>Class
+  <code>function_doc_signature_generator</code></h3>
+
+  <p>
+   The class has only one public function which returns a list of strings documenting the
+   overloads of a function.
+  </p>
+
+  <h4><a name="function_doc_signature_generator-spec-synopsis" id=
+  "function_doc_signature_generator-spec-synopsis"></a>Class
+  <code>function_doc_signature_generator</code> synopsis</h4>
+  <pre>
+namespace boost { namespace python { namespace objects {
+
+    class function_doc_signature_generator 
+    {
+      public:
+          static list function_doc_signatures(function const *f);
+    };
+
+}}}
+</pre>
+
+
+  <h2><a name="examples" id="examples"></a>Examples</h2>
+
+  <h4>Docstrings generated with <code>function_doc_signature_generator</code></h4>
+  <pre>
+#include &lt;boost/python/module.hpp&gt;
+#include &lt;boost/python/def.hpp&gt;
+#include &lt;boost/python/args.hpp&gt;
+#include &lt;boost/python/tuple.hpp&gt;
+#include &lt;boost/python/class.hpp&gt;
+#include &lt;boost/python/overloads.hpp&gt;
+#include &lt;boost/python/raw_function.hpp&gt;
+
+using namespace boost::python;
+
+tuple f(int x = 1, double y = 4.25, char const* z = "wow")
+{
+    return make_tuple(x, y, z);
+}
+
+BOOST_PYTHON_FUNCTION_OVERLOADS(f_overloads, f, 0, 3)
+
+
+struct X
+{
+    tuple f(int x = 1, double y = 4.25, char const* z = "wow")
+    {
+        return make_tuple(x, y, z);
+    }
+};
+
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(X_f_overloads, X::f, 0, 3)
+
+tuple raw_func(tuple args, dict kw)
+{
+    return make_tuple(args, kw);
+}
+
+BOOST_PYTHON_MODULE(args_ext)
+{
+    def("f", f, (arg("x")=1, arg("y")=4.25, arg("z")="wow")
+        , "This is f's docstring"
+        );
+
+    def("raw", raw_function(raw_func));
+
+    def("f1", f, f_overloads("f1's docstring", args("x", "y", "z")));
+
+
+    class_&lt;X&gt;("X", "This is X's docstring", init&lt;&gt;(args("self")))
+        .def("f", &amp;X::f
+             , "This is X.f's docstring"
+             , args("self","x", "y", "z"))
+
+        ;
+
+}
+
+</pre>
+Python code:
+  <pre>
+&gt;&gt;&gt; import args_ext
+&gt;&gt;&gt; help(args_ext)
+Help on module args_ext:
+
+NAME
+    args_ext
+
+FILE
+    args_ext.pyd
+
+CLASSES
+    Boost.Python.instance(__builtin__.object)
+        X
+
+    class X(Boost.Python.instance)
+     |  This is X's docstring
+     |
+     |  Method resolution order:
+     |      X
+     |      Boost.Python.instance
+     |      __builtin__.object
+     |
+     |  Methods defined here:
+     |
+     |  __init__(...)
+     |      __init__( (object)self) -> None :
+     |       C++ signature:
+     |           void __init__(struct _object *)
+     |
+     |  f(...)
+     |      f( (X)self, (int)x, (float)y, (str)z) -> tuple : This is X.f's docstring
+     |      C++ signature:
+     |          class boost::python::tuple f(struct X {lvalue},int,double,char const *)
+     |
+     |    .................
+     |
+FUNCTIONS
+    f(...)
+        f([ (int)x=1 [, (float)y=4.25 [, (str)z='wow']]]) -> tuple : This is f's docstring
+        C++ signature:
+            class boost::python::tuple f([ int=1 [,double=4.25 [,char const *='wow']]])
+
+    f1(...)
+        f1([ (int)x [, (float)y [, (str)z]]]) -> tuple : f1's docstring
+        C++ signature:
+            class boost::python::tuple f1([ int [,double [,char const *]]])
+
+    raw(...)
+        object raw(tuple args, dict kwds) :
+        C++ signature:
+            object raw(tuple args, dict kwds)
+
+
+</pre>
+
+  <p><i>&copy; Copyright <a href="mailto:nickm at sitius dot com">Nikolay Mladenov</a> 2007.</i></p>
+</body>
+</html>
--- a/doc/v2/handle.html
+++ b/doc/v2/handle.html
@@ -329,7 +329,7 @@ null_ok&lt;T&gt;* allow_null(T* p)
    </p>

    <p class="c4">&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002
 .</p>
  </body>
 </html>
--- a/doc/v2/has_back_reference.html
+++ b/doc/v2/has_back_reference.html
@@ -218,7 +218,7 @@ BOOST_PYTHON_MODULE(back_references)
    </p>

    <p class="c3">&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002
 .</p>
  </body>
 </html>
--- a/doc/v2/implicit.html
+++ b/doc/v2/implicit.html
@@ -157,7 +157,7 @@ BOOST_PYTHON_MODULE(implicit_ext)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/init.html
+++ b/doc/v2/init.html
@@ -245,7 +245,7 @@ class_&lt;X&gt;("X", "This is X's docstring.",
     

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/instance_holder.html
+++ b/doc/v2/instance_holder.html
@@ -213,7 +213,7 @@ struct pointer_holder : instance_holder


    <p class="c4">&copy; Copyright <a href= 
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. 
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002. 

  </body>
 </html>
--- a/doc/v2/iterator.html
+++ b/doc/v2/iterator.html
@@ -392,7 +392,7 @@ BOOST_PYTHON_MODULE(demo)
        </p>

        <p><i>&copy; Copyright <a href=
-        "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+        "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/list.html
+++ b/doc/v2/list.html
@@ -136,7 +136,7 @@ long zeroes(list l)
    <p>Revised 1 October, 2002</p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/long.html
+++ b/doc/v2/long.html
@@ -113,7 +113,7 @@ python::long_ fact(long n)
    <p>Revised 1 October, 2002</p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/lvalue_from_pytype.html
+++ b/doc/v2/lvalue_from_pytype.html
@@ -295,7 +295,7 @@ BOOST_PYTHON_MODULE(noddy_cache)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/make_function.html
+++ b/doc/v2/make_function.html
@@ -204,7 +204,7 @@ BOOST_PYTHON_MODULE(make_function_test)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/manage_new_object.html
+++ b/doc/v2/manage_new_object.html
@@ -139,7 +139,7 @@ BOOST_PYTHON_MODULE(my_module)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/module.html
+++ b/doc/v2/module.html
@@ -103,7 +103,7 @@ RuntimeError: Unidentifiable C++ Exception
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->


-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
+    <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
    Abrahams</a> 2002. </i> Distributed
  under 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)</p>
--- a/doc/v2/numeric.html
+++ b/doc/v2/numeric.html
@@ -270,7 +270,7 @@ void set_first_element(numeric::array&amp; y, double value)

  <p>Revised 07 October, 2006</p>

-  <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
+  <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
  Abrahams</a> 2002-2006.</i></p>
 </body>
 </html>
--- a/doc/v2/object.html
+++ b/doc/v2/object.html
@@ -943,6 +943,6 @@ object sum_items(object seq)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2006.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2006.</i></p>
  </body>
 </html>
--- a/doc/v2/operators.html
+++ b/doc/v2/operators.html
@@ -214,6 +214,9 @@ namespace boost { namespace python { namespace self_ns {
   <a href=
 "#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; str(self_t);

+   <a href=
+"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; repr(self_t);
+
 }}};
 </pre>
    The tables below describe the methods generated when the results of the
@@ -765,6 +768,15 @@ namespace boost { namespace python { namespace self_ns {
        <td><code><a href=
        "../../../conversion/lexical_cast.htm#lexical_cast">lexical_cast</a>&lt;std::string&gt;(x)</code></td>
      </tr>
+
+      <tr>
+        <td><code>repr</code></td>
+
+        <td><code>__repr__</code></td>
+
+        <td><code><a href=
+        "../../../conversion/lexical_cast.htm#lexical_cast">lexical_cast</a>&lt;std::string&gt;(x)</code></td>
+      </tr>
    </table>

    <h3><a name="other-spec"></a>Class Template <code>other</code></h3>
@@ -903,7 +915,7 @@ BOOST_PYTHON_MODULE(demo)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/overloads.html
+++ b/doc/v2/overloads.html
@@ -223,7 +223,7 @@ BOOST_PYTHON_MODULE(args_ext)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/platforms.html
+++ b/doc/v2/platforms.html
@@ -129,7 +129,7 @@
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/pointee.html
+++ b/doc/v2/pointee.html
@@ -111,7 +111,7 @@ BOOST_PYTHON_MODULE(pointee_demo)
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->


-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
+    <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
    Abrahams</a> 2002. </i>   Distributed
  under 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)</p>
--- a/doc/v2/progress_reports.html
+++ b/doc/v2/progress_reports.html
@@ -41,7 +41,7 @@ design decisions and links to relevant discussions.
  13 November, 2002
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
 </p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
+<p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 
  2002. </i></p>
 </body>
 </html>
--- a/doc/v2/ptr.html
+++ b/doc/v2/ptr.html
@@ -258,7 +258,7 @@ void pass_as_arg(expensive_to_copy* x, PyObject* f)
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->


-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
+    <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
    Abrahams</a> 2002. </i> Distributed
  under 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)</p>
--- a/doc/v2/python.html
+++ b/doc/v2/python.html
@@ -104,7 +104,7 @@
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/pytype_function.html
+++ b/doc/v2/pytype_function.html
@@ -0,0 +1,370 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<!-- Copyright Nikolay Mladenov 2007. Distributed under 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) -->
+<html>
+<head>
+  <meta http-equiv="Content-Type" content=
+  "text/html; charset=us-ascii">
+  <link rel="stylesheet" type="text/css" href="../boost.css">
+
+  <title>Boost.Python -
+  &lt;boost/python/doobject/pytype_function.hpp&gt;</title>
+</head>
+
+<body>
+  <table border="0" cellpadding="7" cellspacing="0" width="100%"
+  summary="header">
+    <tr>
+      <td valign="top" width="300">
+        <h3><a href="../../../../index.htm"><img height="86" width=
+        "277" alt="C++ Boost" src="../../../../boost.png" border=
+        "0"></a></h3>
+      </td>
+
+      <td valign="top">
+        <h1 align="center"><a href=
+        "../index.html">Boost.Python</a></h1>
+
+        <h2 align="center">Header
+        &lt;boost/python/converter/pytype_function.hpp&gt;</h2>
+      </td>
+    </tr>
+  </table>
+  <hr>
+
+  <h2>Contents</h2>
+
+  <dl class="page-index">
+    <dt><a href="#introduction">Introduction</a></dt>
+
+    <dt><a href="#classes">Classes</a></dt>
+
+    <dd>
+      <dl class="page-index">
+        <dt><a href="#wrap_pytype-spec">Class
+        <code>wrap_pytype</code></a></dt>
+
+        <dd>
+          <dl class="page-index">
+            <dt><a href="#wrap_pytype-spec-synopsis">Class
+            <code>wrap_pytype</code> synopsis</a></dt>
+
+          </dl>
+        </dd>
+      </dl>
+    </dd>
+
+    <dd>
+      <dl class="page-index">
+        <dt><a href="#registered_pytype-spec">Class
+        <code>registered_pytype</code></a></dt>
+
+        <dd>
+          <dl class="page-index">
+            <dt><a href="#registered_pytype-spec-synopsis">Class
+            <code>registered_pytype</code> synopsis</a></dt>
+
+          </dl>
+        </dd>
+      </dl>
+    </dd>
+
+    <dd>
+      <dl class="page-index">
+        <dt><a href="#expected_from_python_type-spec">Class
+        <code>expected_from_python_type</code></a></dt>
+
+        <dd>
+          <dl class="page-index">
+            <dt><a href="#expected_from_python_type-spec-synopsis">Class
+            <code>expected_from_python_type</code> synopsis</a></dt>
+
+          </dl>
+        </dd>
+      </dl>
+    </dd>
+
+    <dd>
+      <dl class="page-index">
+        <dt><a href="#to_python_target_type-spec">Class
+        <code>to_python_target_type</code></a></dt>
+
+        <dd>
+          <dl class="page-index">
+            <dt><a href="#to_python_target_type-spec-synopsis">Class
+            <code>to_python_target_type</code> synopsis</a></dt>
+
+          </dl>
+        </dd>
+      </dl>
+    </dd>
+
+    <dt><a href="#examples">Examples</a></dt>
+  </dl>
+  <hr>
+
+  <h2><a name="introduction" id=
+  "introduction"></a>Introduction</h2>
+
+  <p>To support Pythonic signatures the converters should supply a <code>get_pytype</code> function
+  returning a pointer to the associated <code>PyTypeObject</code>. See for example
+  <a href="ResultConverter.html#ResultConverter-concept">ResultConverter</a> or 
+  <a href="to_python_converter.html#to_python_converter-spec">to_python_converter</a>.
+  The classes in this header file are meant to be used when implmenting <code>get_pytype</code>.
+  There are also <code>_direct</code> versions of the templates of <code>class T</code> which
+  should be used with undecorated type parameter, expected to be in the conversion registry when the module loads.
+  </p>
+
+  <h2><a name="classes" id="classes"></a>Classes</h2>
+
+  <h3><a name="wrap_pytype-spec" id=
+  "wrap_pytype-spec"></a>Class
+  <code>wrap_pytype</code></h3>
+
+  <p>
+   This template generates a static <code>get_pytype</code> member returning the template parameter.
+  </p>
+
+  <h4><a name="wrap_pytype-spec-synopsis" id=
+  "wrap_pytype-spec-synopsis"></a>Class
+  <code>wrap_pytype</code> synopsis</h4>
+  <pre>
+namespace boost { namespace python { namespace converter{
+
+    template &lt; PyTypeObject const *pytype &gt;
+    class wrap_pytype 
+    {
+      public:
+          static PyTypeObject const *get_pytype(){return pytype; }
+    };
+
+}}}
+</pre>
+
+
+  <h3><a name="registered_pytype-spec" id=
+  "registered_pytype-spec"></a>Class
+  <code>registered_pytype</code></h3>
+
+  <p>
+   This template should be used with template parameters which are (possibly decorated)
+   types exported to python using <a href="class.html"><code>class_</code></a>.
+   The generated a static <code>get_pytype</code> member 
+   returns the corresponding python type.
+  </p>
+
+  <h4><a name="registered_pytype-spec-synopsis" id=
+  "registered_pytype-spec-synopsis"></a>Class
+  <code>registered_pytype</code> synopsis</h4>
+  <pre>
+namespace boost { namespace python { namespace converter{
+
+    template &lt; class T &gt;
+    class registered_pytype 
+    {
+      public:
+          static PyTypeObject const *get_pytype();
+    };
+
+}}}
+</pre>
+
+
+  <h3><a name="expected_from_python_type-spec" id=
+  "expected_from_python_type-spec"></a>Class
+  <code>expected_from_python_type</code></h3>
+
+  <p>
+   This template generates a static <code>get_pytype</code> member which inspects the registered
+   <code>from_python</code> converters for the type <code>T</code> and returns a matching python type.
+  </p>
+
+  <h4><a name="expected_from_python_type-spec-synopsis" id=
+  "expected_from_python_type-spec-synopsis"></a>Class
+  <code>expected_from_python_type</code> synopsis</h4>
+  <pre>
+namespace boost { namespace python { namespace converter{
+
+    template &lt; class T &gt;
+    class expected_from_python_type 
+    {
+      public:
+          static PyTypeObject const *get_pytype();
+    };
+
+}}}
+</pre>
+
+
+  <h3><a name="to_python_target_type-spec" id=
+  "to_python_target_type-spec"></a>Class
+  <code>to_python_target_type</code></h3>
+
+  <p>
+   This template generates a static <code>get_pytype</code> member returning the 
+   python type to which T can be converted.
+  </p>
+
+  <h4><a name="to_python_target_type-spec-synopsis" id=
+  "to_python_target_type-spec-synopsis"></a>Class
+  <code>to_python_target_type</code> synopsis</h4>
+  <pre>
+namespace boost { namespace python { namespace converter{
+
+    template &lt; class T &gt;
+    class to_python_target_type 
+    {
+      public:
+          static PyTypeObject const *get_pytype();
+    };
+
+}}}
+</pre>
+
+
+  <h2><a name="examples" id="examples"></a>Examples</h2>
+
+    This example presumes that someone has implemented the standard <a href=
+    "http://www.python.org/doc/2.2/ext/dnt-basics.html">noddy example
+    module</a> from the Python documentation, and placed the corresponding
+    declarations in <code>"noddy.h"</code>. Because
+    <code>noddy_NoddyObject</code> is the ultimate trivial extension type,
+    the example is a bit contrived: it wraps a function for which all
+    information is contained in the <i>type</i> of its return value.
+
+    <h3>C++ module definition</h3>
+<pre>
+#include &lt;boost/python/reference.hpp&gt;
+#include &lt;boost/python/module.hpp&gt;
+#include "noddy.h"
+
+struct tag {};
+tag make_tag() { return tag(); }
+
+using namespace boost::python;
+
+struct tag_to_noddy 
+#if defined BOOST_PYTHON_SUPPORTS_PY_SIGNATURES //unnecessary overhead if py signatures are not supported
+: wrap_pytype<&amp;noddy_NoddyType> //inherits get_pytype from wrap_pytype
+#endif
+{
+    static PyObject* convert(tag const&amp; x)
+    {
+        return PyObject_New(noddy_NoddyObject, &amp;noddy_NoddyType);
+    }
+};
+
+BOOST_PYTHON_MODULE(to_python_converter)
+{
+    def("make_tag", make_tag);
+    to_python_converter&lt;tag, tag_to_noddy
+#if defined BOOST_PYTHON_SUPPORTS_PY_SIGNATURES //invalid if py signatures are not supported
+          , true
+#endif
+          &gt;(); //"true" because tag_to_noddy has member get_pytype
+}
+</pre>
+
+
+<p>The following example registers to and from python converters using the templates
+<code>expected_from_python_type</code> and <code>to_pyhton_target_type</code>.
+</p>
+<pre>
+#include &lt;boost/python/module.hpp&gt;
+#include &lt;boost/python/def.hpp&gt;
+#include &lt;boost/python/extract.hpp&gt;
+#include &lt;boost/python/to_python_converter.hpp&gt;
+#include &lt;boost/python/class.hpp&gt;
+
+using namespace boost::python;
+
+struct A
+{
+};
+
+struct B
+{
+  A a;
+  B(const A& a_):a(a_){}
+};
+
+// Converter from A to python int
+struct BToPython 
+#if defined BOOST_PYTHON_SUPPORTS_PY_SIGNATURES //unnecessary overhead if py signatures are not supported
+   : converter::to_python_target_type&lt;A&gt;  //inherits get_pytype
+#endif
+{
+  static PyObject* convert(const B& b)
+  {
+    return incref(object(b.a).ptr());
+  }
+};
+
+// Conversion from python int to A
+struct BFromPython
+{
+  BFromPython()
+  {
+    boost::python::converter::registry::push_back
+        ( &amp;convertible
+        , &amp;construct
+        , type_id&lt; B &gt;()
+#if defined BOOST_PYTHON_SUPPORTS_PY_SIGNATURES //invalid if py signatures are not supported
+        , &amp;converter::expected_from_python_type&lt;A&gt;::get_pytype//convertible to A can be converted to B
+#endif
+        );
+  }
+
+  static void* convertible(PyObject* obj_ptr)
+  {
+      extract&lt;const A&&gt; ex(obj_ptr);
+      if (!ex.check()) return 0;
+      return obj_ptr;
+  }
+
+  static void construct(
+      PyObject* obj_ptr,
+      converter::rvalue_from_python_stage1_data* data)
+  {
+    void* storage = (
+        (converter::rvalue_from_python_storage&lt; B &gt;*)data)-&gt; storage.bytes;
+
+    extract&lt;const A&&gt; ex(obj_ptr);
+    new (storage) B(ex());
+    data->convertible = storage;
+  }
+};
+
+
+B func(const B& b) { return b ; }
+
+BOOST_PYTHON_MODULE(pytype_function_ext)
+{
+  to_python_converter&lt; B , BToPython
+#if defined BOOST_PYTHON_SUPPORTS_PY_SIGNATURES //invalid if py signatures are not supported
+             ,true 
+#endif
+             &gt;(); //has get_pytype
+  BFromPython();
+
+  class_&lt;A&gt;("A") ;
+
+  def("func", &amp;func);
+
+}
+
+
+
+&gt;&gt;&gt; from pytype_function_ext import *
+&gt;&gt;&gt; print func.__doc__
+func( (A)arg1) -> A :
+    C++ signature:
+         struct B func(struct B)
+</pre>
+
+
+  <p><i>&copy; Copyright <a href="mailto:nickm at sitius dot com">Nikolay Mladenov</a> 2007.</i></p>
+</body>
+</html>
--- a/doc/v2/raw_function.html
+++ b/doc/v2/raw_function.html
@@ -112,7 +112,7 @@ Python:
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/reference.html
+++ b/doc/v2/reference.html
@@ -609,6 +609,66 @@
        </dl>
      </dd>

+      <dd>
+        <a name="function_documentation"></a> 
+
+        <h3>Function documentation</h3>
+
+        <dl class="index">
+          <dt><a href=
+          "function_doc_signature.html">function_doc_signature.hpp</a></dt>
+
+          <dd>
+            <dl class="index">
+              <dt><a href=
+              "function_doc_signature.html#classes">Classes</a></dt>
+
+              <dd>
+                <dl class="index">
+                  <dt><a href=
+                  "function_doc_signature.html#function_doc_signature_generator-spec">function_doc_signature_generator</a></dt>
+
+                </dl>
+              </dd>
+            </dl>
+          </dd>
+        </dl>
+        <dl class="index">
+          <dt><a href=
+          "pytype_function.html">pytype_function.hpp</a></dt>
+
+          <dd>
+            <dl class="index">
+              <dt><a href=
+              "pytype_function.html#classes">Classes</a></dt>
+
+              <dd>
+                <dl class="index">
+                  <dt><a href=
+                  "pytype_function.html#wrap_pytype-spec">wrap_pytype</a></dt>
+
+                </dl>
+                <dl class="index">
+                  <dt><a href=
+                  "pytype_function.html#expected_from_python_type-spec">expected_from_python_type</a></dt>
+
+                </dl>
+                <dl class="index">
+                  <dt><a href=
+                  "pytype_function.html#to_python_target_type-spec">to_python_target_type</a></dt>
+
+                </dl>
+                <dl class="index">
+                  <dt><a href=
+                  "pytype_function.html#registered_pytype-spec">registered_pytype</a></dt>
+
+                </dl>
+              </dd>
+            </dl>
+          </dd>
+        </dl>
+      </dd>
+
      <dd>
        <a name="models_of_call_policies"></a> 

@@ -1125,7 +1185,7 @@
    </p>

    <p class="c3">&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002
 .</p>
  </body>
 </html>
--- a/doc/v2/reference_existing_object.html
+++ b/doc/v2/reference_existing_object.html
@@ -174,7 +174,7 @@ BOOST_PYTHON_MODULE(singleton)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/register_ptr_to_python.html
+++ b/doc/v2/register_ptr_to_python.html
@@ -154,7 +154,7 @@ TypeError: No to_python (by-value) converter found for C++ type: class boost::sh
  24 Jun, 2003
  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
 </p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
+<p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 
  2002. </i></p>
 </body>
 </html>  
--- a/doc/v2/return_arg.html
+++ b/doc/v2/return_arg.html
@@ -125,6 +125,8 @@ namespace boost { namespace python
   {
      static PyObject* postcall(PyObject*, PyObject* result);
      struct result_converter{ template &lt;class T&gt; struct apply; };
+      template &lt;class Sig&gt; struct extract_return_type : mpl::at_c&lt;Sig, arg_pos&gt;{};
+
   };
 }}
 </pre>
@@ -215,7 +217,7 @@ BOOST_PYTHON_MODULE(return_self_ext)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> and Nikolay
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> and Nikolay
    Mladenov 2003. </i></p>
  </body>
 </html>
--- a/doc/v2/return_by_value.html
+++ b/doc/v2/return_by_value.html
@@ -143,7 +143,7 @@ BOOST_PYTHON_MODULE(my_module)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/return_internal_reference.html
+++ b/doc/v2/return_internal_reference.html
@@ -223,7 +223,7 @@ BOOST_PYTHON_MODULE(internal_refs)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/return_value_policy.html
+++ b/doc/v2/return_value_policy.html
@@ -161,7 +161,7 @@ BOOST_PYTHON_MODULE(my_module)
    </p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/doc/v2/scope.html
+++ b/doc/v2/scope.html
@@ -167,7 +167,7 @@ BOOST_PYTHON_MODULE(nested)
    <p>Revised 09 October, 2002</p>

    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2002.</i></p>
  </body>
 </html>

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel James	f1ed00e3a5	Use root links in quickbook. [SVN r45364]	2008-05-14 20:38:29 +00:00
Daniel James	0c5577c99a	Update 'more' links. [SVN r44996]	2008-05-01 21:34:42 +00:00
Daniel James	21d11150fd	Work around a quickbook bug which is affecting the python docs. Refs #1864 . [SVN r44590]	2008-04-19 15:38:29 +00:00
Daniel James	502fe1fdb2	Fix some links in the python docs. Refs #1684 . [SVN r44589]	2008-04-19 15:37:39 +00:00
Daniel James	5d3b58f6f7	Create a branch for documentation work. [SVN r44584]	2008-04-19 14:48:18 +00:00
Joel de Guzman	b316819925	Andreas indexing suite patch [SVN r44450]	2008-04-16 03:07:11 +00:00
Joel de Guzman	52245de2e5	Andreas patch [SVN r44449]	2008-04-16 03:07:06 +00:00
Ralf W. Grosse-Kunstleve	2f1f79ce87	bogus VC8 warning C4180 disabled [SVN r44041]	2008-04-04 18:57:27 +00:00
Beman Dawes	863bff9072	Remove per email from Dave [SVN r43901]	2008-03-28 02:11:13 +00:00
Dave Abrahams	2213cf98c6	Work around vc9 bugs [SVN r43845]	2008-03-24 18:27:22 +00:00
Ralf W. Grosse-Kunstleve	2dba3148ce	map std::invalid_argument -> Python ValueError [SVN r43546]	2008-03-09 04:30:13 +00:00
Daniel James	48aa6ab9a9	Fix incorrect links to copyright of the form 'http:#www.boost.org [SVN r43423]	2008-02-27 19:22:01 +00:00
Daniel James	6ba5067e0b	Point links to the pages that used to be in 'more' to the site. [SVN r43210]	2008-02-10 15:02:17 +00:00
Daniel James	60f4f5e54c	Link to people pages on the website, as they've been removed from the download. [SVN r43209]	2008-02-10 14:56:22 +00:00
Eric Niebler	7ee9cf679b	stl_iterator does better error handling [SVN r42836]	2008-01-17 22:47:54 +00:00
Ralf W. Grosse-Kunstleve	03a72363a4	undo revision 41404; see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34238 [SVN r41986]	2007-12-12 05:39:45 +00:00
Jürgen Hunold	38cc1a0c15	Add cosmetic virtual detructors to silence compile warnings. [SVN r41650]	2007-12-03 18:51:26 +00:00
Jürgen Hunold	ff44521920	Silence unused paramter warning in release mode. [SVN r41649]	2007-12-03 18:47:17 +00:00
Jürgen Hunold	0ac7e3f858	Revert revisions 41544 and 41549. See http://lists.boost.org/Archives/boost/2007/12/131116.php for details. [SVN r41577]	2007-12-02 11:51:08 +00:00
Jürgen Hunold	5cbb539ec5	Remove unused paramters. Add -Wextra to gcc flags to enable more warnings. [SVN r41550]	2007-12-01 20:26:37 +00:00
Jürgen Hunold	40e4940877	Silence compiler by adding cosmetic virtual destructors. [SVN r41549]	2007-12-01 20:24:51 +00:00
Jürgen Hunold	ab0911cf53	Silence compiler by adding cosmetic virtual destructors. [SVN r41544]	2007-12-01 19:27:06 +00:00
Dave Abrahams	0d81eb6695	Boost.Python: * Workarounds for many SunCC 5.9 bugs * Suppression of many SunCC 5.9 warnings * Improve the style of some test invocations in Jamfile [SVN r41521]	2007-12-01 02:15:17 +00:00
Dave Abrahams	e0b535df1e	Try to extend the workaround to SunPro 5.9, since we're marked as not working on 5.8 [SVN r41408]	2007-11-26 22:01:50 +00:00
Ralf W. Grosse-Kunstleve	d2517faa78	g++ 4.3.0 compatibility (4.3.0 20071125 (experimental)) [SVN r41404]	2007-11-26 20:46:28 +00:00
Beman Dawes	8cd4ff8950	Remove extra ) from prior commit [SVN r41355]	2007-11-25 13:56:09 +00:00
Dave Abrahams	26f77691ee	Attempt SunPro workaround [SVN r41352]	2007-11-25 09:02:01 +00:00
Joel de Guzman	6e7f594027	fix for trac ticket #1450 [SVN r41164]	2007-11-17 01:51:04 +00:00
Beman Dawes	eada30f0cb	Get rid of .cvsignore files [SVN r41107]	2007-11-15 15:20:27 +00:00
Joel de Guzman	e919ffdac4	refresh docs [SVN r41082]	2007-11-14 10:24:21 +00:00
Joel de Guzman	1cf41fd031	fix mismatch include guard [SVN r41019]	2007-11-11 22:32:48 +00:00
Nikolay Mladenov	7b67118271	changed handle cast to downcast [SVN r40935]	2007-11-08 16:28:44 +00:00
Nikolay Mladenov	e14c702a40	added forgotten array_object_manager_traits::get_pytype [SVN r40889]	2007-11-07 16:06:55 +00:00
Joel de Guzman	d303ea16fc	added copyright and license info for each page. [SVN r40871]	2007-11-07 03:35:49 +00:00
Ralf W. Grosse-Kunstleve	65114d8637	reinterpret_cast -> const_cast; commented out dead code removed [SVN r40749]	2007-11-04 18:08:28 +00:00
Joel de Guzman	597dfc586b	tutorial update [SVN r40734]	2007-11-04 00:12:29 +00:00
Dave Abrahams	6a3085ad5d	Merging some of the more obvious changes from RC_1_34_0 [SVN r40714]	2007-11-03 03:25:13 +00:00
Joel de Guzman	190d0d7ea6	replacing reinterpret_cast with static_cast<PySliceObject>(static_cast<void>(i)) [SVN r40712]	2007-11-03 03:05:26 +00:00
Eric Niebler	8b915a15ff	merge Changeset 37947 [SVN r40675]	2007-11-02 04:35:01 +00:00
Dave Abrahams	90c5c19220	Take out print statement I added for debugging purposes. [SVN r40536]	2007-10-28 19:24:02 +00:00
Dave Abrahams	cfe6f96f69	Closes #1379 , really this time. The old code would sandwich argv[1] between quotes and interpret it as a string, so backslashes in windows paths were interpreted as escape sequences. [SVN r40535]	2007-10-28 19:22:21 +00:00
Vladimir Prus	77907c5369	Make sure every library can be installed by using bjam stage\|install in libs/<library>/build. [SVN r40475]	2007-10-26 09:04:25 +00:00
Rene Rivera	512b30c971	Do not refer to nonexistent target when python is not configured. [SVN r40216]	2007-10-20 16:36:18 +00:00
Rene Rivera	f005518686	Fix build system error when Python is not configured, without preventing the BPL target from being declared. Instead the target is now unbuildable, and will be skipped when Python is not configured. [SVN r40156]	2007-10-18 16:11:41 +00:00
Rene Rivera	274a219965	Remove BPL build conditional as it prevents normal build failures. [SVN r39731]	2007-10-06 19:46:39 +00:00
Ralf W. Grosse-Kunstleve	abc4abf84a	gcc 4.3.0 compatibility (resolves new "changes meaning" error) [SVN r39434]	2007-09-20 23:20:45 +00:00
Nikolay Mladenov	94a3ced83a	fixed cpp signature related test failure [SVN r39372]	2007-09-18 17:51:47 +00:00
Nikolay Mladenov	7eb0c678ee	epydoc friendlier formatting [SVN r39371]	2007-09-18 17:32:06 +00:00
Nikolay Mladenov	92460adce6	tabs removes, code reformatting [SVN r39370]	2007-09-18 17:28:23 +00:00
Nikolay Mladenov	8cfd3fb2ef	epydoc friendlier formatting [SVN r39368]	2007-09-18 17:16:31 +00:00
Nikolay Mladenov	62ef542eaf	fixed problem reported by Neal Becker; added a test case [SVN r39223]	2007-09-12 21:31:39 +00:00
Ralf W. Grosse-Kunstleve	5809078ba9	Patches by Nikolay Mladenov (nickm at sitius com): new pythonic signatures; docstring support for enums; fix unrelated Visual C++ 6 problem [SVN r39191]	2007-09-11 16:53:50 +00:00
Vladimir Prus	04e54d670c	Remove V1 Jamfiles [SVN r38516]	2007-08-08 19:02:26 +00:00
Stefan Seefeld	dd7c0a7f3d	Fix ticket #1115 . [SVN r38289]	2007-07-26 16:11:18 +00:00
Stefan Seefeld	71f54cc920	Fix ticket #1115 . [SVN r38288]	2007-07-26 14:41:41 +00:00
Ralf W. Grosse-Kunstleve	9de994c0d1	Hans Meine's extra new-line for epydoc with reST compatibility [SVN r37906]	2007-06-06 00:00:57 +00:00
Stefan Seefeld	e9caacc428	More fixes for embedding python docs. [SVN r37709]	2007-05-18 15:52:55 +00:00
Stefan Seefeld	5070e84f70	Enhance documentation for embedding python. [SVN r37708]	2007-05-18 15:22:43 +00:00
Stefan Seefeld	fe23d9885f	Add new eval() function. [SVN r37560]	2007-05-02 13:11:20 +00:00
Ralf W. Grosse-Kunstleve	e7ee17b71b	MIPSpro: undo Python 2.5.1 define (the define leads to many warnings) [SVN r37502]	2007-04-25 04:45:17 +00:00
Dave Abrahams	5edb63d01c	Some progress on Python build guide. Minor fixes to getting started guide. [SVN r37418]	2007-04-11 23:35:08 +00:00
Dave Abrahams	f4b3aab7d4	Checkpoint before reorg [SVN r37370]	2007-04-05 20:13:13 +00:00
Dave Abrahams	6af67d1a4c	kill off BBv1 project archive [SVN r37367]	2007-04-05 17:19:20 +00:00
Dave Abrahams	16d975ba5c	Bringing forward BBv2/Python support and a few other things that were obviously more up-to-date on the RC branch. Removed the Boost.Python v1 zip archive. [SVN r37346]	2007-04-03 17:10:53 +00:00
Dave Abrahams	4fc5cafd40	Some progress on new build/test guide. [SVN r37333]	2007-04-02 05:24:25 +00:00
Stefan Seefeld	1b5cd10f7c	Fix reference counting error. [SVN r37312]	2007-03-28 18:12:08 +00:00
Stefan Seefeld	0f91872518	Fix import_ failure. [SVN r37142]	2007-03-05 18:51:04 +00:00
Stefan Seefeld	dc6b2979e4	Add copyright notice. [SVN r37132]	2007-03-02 17:16:51 +00:00
Stefan Seefeld	50034140c4	Fix boost::python::import. [SVN r37120]	2007-03-01 15:17:29 +00:00
Dave Abrahams	08a6f35ec2	Correct testing bugs: either changing assert(...) or BOOST_ASSERT(...) to BOOST_TEST (in my code only) or adding "return boost::report_errors();" where it was clearly missing (and a pure bug, in anyone's code). [SVN r37057]	2007-02-24 22:40:59 +00:00
Dave Abrahams	67236ffbad	New build instructions in progress [SVN r36879]	2007-02-03 16:55:07 +00:00
Dave Abrahams	96ab7a80a4	Remove BBv1 for good [SVN r36323]	2006-12-11 05:02:34 +00:00
Dave Abrahams	d8c3ff199e	Remove BBv1 for good [SVN r36321]	2006-12-11 03:35:10 +00:00
Dave Abrahams	0c4ebef579	Fix auto-link to look at the right variable. Make boost-build.jam point at the v2 Boost. [SVN r36318]	2006-12-11 02:54:48 +00:00
Dave Abrahams	8fe9d41b58	Cleaned out flotsam and improved comments [SVN r36317]	2006-12-11 02:50:55 +00:00
Dave Abrahams	8a4590b2ef	Enable auto-linking [SVN r36291]	2006-12-07 17:44:05 +00:00
Ralf W. Grosse-Kunstleve	d67b040683	fixes to support pickling of enums (by Shashank Bapat) [SVN r36256]	2006-12-03 20:43:48 +00:00
Beman Dawes	2db61657f2	Add copyright, license [SVN r35905]	2006-11-07 19:11:57 +00:00
Dave Abrahams	6d2ee96ba3	improve error message [SVN r35822]	2006-11-03 16:34:53 +00:00
Stefan Seefeld	a74c8e3da3	Fix symbol visibility. [SVN r35754]	2006-10-27 21:19:47 +00:00
Ralf W. Grosse-Kunstleve	9f4d39d9fe	correct trivial, obvious accident: stray line removed [SVN r35599]	2006-10-13 22:06:17 +00:00
Dave Abrahams	31c19644ed	make numpy tests portable to Darwin with older docutils [SVN r35597]	2006-10-13 21:34:26 +00:00
Dave Abrahams	600d444136	Fix some problems with testing on old docutils installations [SVN r35594]	2006-10-13 19:35:28 +00:00
Dave Abrahams	c3bd0fcbad	Make object comparison operators return object instead of bool, to accomodate strange beasts like numarray arrays that return arrays that can't be used as truth values from their comparison ops. Fix numpy test for portability with old doctest (again!) [SVN r35572]	2006-10-12 09:07:07 +00:00
Dave Abrahams	991a7c198a	Workaround vc6 bugs [SVN r35568]	2006-10-12 06:41:55 +00:00
Dave Abrahams	9b67f0447d	Suppress a couple of msvc class/struct warnings [SVN r35567]	2006-10-12 06:41:18 +00:00
Dave Abrahams	b714f6cc23	Adjust tests to account for numarray behavior differences [SVN r35539]	2006-10-10 22:44:09 +00:00
Dave Abrahams	479a6ba4fc	Try for backward compatibility with older versions of doctest [SVN r35535]	2006-10-10 18:12:43 +00:00
Dave Abrahams	d78836b828	Fix lots of bugs in the numeric interface and tests. Tests: * Coerce a result to bool to deal with Python's new Bool type * Better reporting of mismatches in expected and received results * Remove bogus nullary y.astype() call * Fix all uses of trace and diagonal so they don't cause errors * Use appropriate typecodes * Use doctest detailed API to run just the relevant tests * Factor out error handling from macro API: * Added get_module_name() function to get current numeric module * new_(x) now returns an array instead of object * Fixed the signatures of the factory() family of functions * Updated docs accordingly. [SVN r35528]	2006-10-09 04:05:25 +00:00
Dave Abrahams	7a59131d37	Fix missing #include [SVN r35524]	2006-10-08 05:17:20 +00:00
Dave Abrahams	5ab00bc9c8	Fix long-standing misnaming of "factory" method as "array" [SVN r35428]	2006-09-29 22:24:12 +00:00
Dave Abrahams	94500ae36d	Tests and fixes for a bad interaction between wrapper<> and operators support. "self" arguments weren't getting unwrapped properly. [SVN r35365]	2006-09-28 14:41:01 +00:00
Dave Abrahams	5e5d34cc36	Fixed broken links [SVN r35329]	2006-09-26 04:23:32 +00:00
Ralf W. Grosse-Kunstleve	c6f2aa4ef2	new boost/python/ssize_t.hpp; avoids potential clash of Py_ssize_t typedef and PY_SSIZE_T_MIN/MAX macros with definitions from other libraries [SVN r35325]	2006-09-26 00:25:07 +00:00
Dave Abrahams	c7fb2f7047	Attempt GCC-3.4.4 and 4.0.1 workarounds [SVN r35276]	2006-09-22 15:12:04 +00:00
Vladimir Prus	afedc1cd9a	Add tests [SVN r35244]	2006-09-21 07:26:35 +00:00
Gottfried Ganßauge	070e02d7d5	Renamed from opaque_pointer_converter.html [SVN r35242]	2006-09-21 07:07:14 +00:00
Dave Abrahams	ccc56c2a4c	Apply Boost license, with permission from Prabhu Ramachandran. [SVN r35240]	2006-09-21 03:43:59 +00:00
Dave Abrahams	e00a88ff49	Fix inspection issues [SVN r35239]	2006-09-21 02:40:19 +00:00
Stefan Seefeld	e527bc860f	Fix copyright issues. [SVN r35236]	2006-09-20 22:30:39 +00:00
Dave Abrahams	921e306b9a	Fix license/copyright [SVN r35234]	2006-09-20 21:59:03 +00:00
Dave Abrahams	bed1d26904	Return an int, not a string, on success from check_numeric_array_rich_slice, since that's what the tests expect. [SVN r35184]	2006-09-18 22:21:50 +00:00
Dave Abrahams	41a342f026	vc6/7 workaround [SVN r35164]	2006-09-18 18:25:12 +00:00
Dave Abrahams	cee8e07046	Checkin missing op_repr definition [SVN r35153]	2006-09-18 02:59:31 +00:00
Dave Abrahams	0806e89964	More informative error messages Better autoconfiguration [SVN r35140]	2006-09-17 02:41:20 +00:00
Dave Abrahams	f5421ca6b2	Default to Python 2.4 in Unix builds Applied contributed patches http://tinyurl.com/ndljr and http://tinyurl.com/18r [SVN r35138]	2006-09-16 18:43:53 +00:00
Ralf W. Grosse-Kunstleve	eea7697175	if __name__ == '__main__' [SVN r35114]	2006-09-14 21:57:56 +00:00
Ralf W. Grosse-Kunstleve	777ce7b561	magic coding: iso-latin1 comment added to avoid Python SyntaxError [SVN r35113]	2006-09-14 21:53:00 +00:00
Gottfried Ganßauge	864ece5539	cross module compatibility test for opaque [SVN r35111]	2006-09-14 19:06:33 +00:00
Gottfried Ganßauge	2610eb9acb	Type object for opaque initialized with PyType_Clear. opaque is registered only if not another module has already registered a conversion for that pointer type. Doc update. [SVN r35104]	2006-09-14 05:59:29 +00:00
Dave Abrahams	567a2c7b89	attempt unverified workaround for http://tinyurl.com/gvrgd [SVN r35103]	2006-09-13 22:47:11 +00:00
Dave Abrahams	05070faf12	Attempt to capture better debugging info in output [SVN r35079]	2006-09-12 23:58:40 +00:00
Dave Abrahams	ad8069314d	Move definition of BOOST_PYTHON_SUPPRESS_REGISTRY_INITIALIZATION back where it belongs. [SVN r35076]	2006-09-12 22:37:09 +00:00
Dave Abrahams	9366c48351	add missing license/copyright info [SVN r35068]	2006-09-11 22:08:18 +00:00
Dave Abrahams	5a14319753	SunPro workarounds [SVN r35067]	2006-09-11 10:38:14 +00:00
Joel de Guzman	279a4f7888	Update [SVN r35006]	2006-08-31 06:01:57 +00:00
Dave Abrahams	d3418d494c	Restort BOOST_PYTHON_STATIC_LIB. We don't want to create exported symbols. [SVN r34942]	2006-08-24 19:03:35 +00:00
Dave Abrahams	c839427246	Sun workaround [SVN r34939]	2006-08-24 13:04:59 +00:00
Dave Abrahams	dd3a136b18	Attempted Sun workaround [SVN r34914]	2006-08-22 11:50:35 +00:00
Dave Abrahams	48696918de	Try not specifying static link, to see if it makes Darwin happy [SVN r34871]	2006-08-11 15:50:21 +00:00
Dave Abrahams	88be35ddc2	Attempt Sun-5.8 workaround [SVN r34864]	2006-08-11 00:47:48 +00:00
Gennaro Prota	9ee0d36a1d	removed tabs (inspect tool) [SVN r34722]	2006-07-24 22:25:35 +00:00
Gennaro Prota	f240e0bab6	removed tabs (inspect tool) [SVN r34720]	2006-07-24 22:20:25 +00:00
Gennaro Prota	4081605e4b	removed tabs (inspect tool) [SVN r34719]	2006-07-24 22:14:15 +00:00
Gennaro Prota	f332ff2d89	minor fix: violation of min/max guidelines [SVN r34717]	2006-07-24 22:04:05 +00:00
Vladimir Prus	ec77608840	Clarify comment [SVN r34668]	2006-07-22 12:53:49 +00:00
Vladimir Prus	f5a69a1dab	Windows fix: use <library>/pytho/python_for_extensions, not <use>, so that we actually link to Python import lib on windows. [SVN r34666]	2006-07-22 12:28:00 +00:00
Vladimir Prus	a1e865061c	Don't link Boost.Python to python library, and don't require <threading>multi for embedding applications. * libs/python/build/Jamfile.v2: (boost_python): Don't link to /python//python. Use /python//python_for_extensions. * libs/python/test/Jamfile.v2: Remove <threading>multi project requirements. (py-run): Link to /python//python. (exec): Likewise. * tools/build/v2/tools/python.jam: (pthread): Declare. (init-unix): Add 'pthread' to extra-libs. ( [SVN r34662]	2006-07-22 07:12:10 +00:00
Ralf W. Grosse-Kunstleve	596e92404a	old misunderstanding corrected (L-BFGS) [SVN r34504]	2006-07-11 04:09:41 +00:00
Joel de Guzman	2640f5af94	new css [SVN r34426]	2006-06-29 09:35:52 +00:00
Joel de Guzman	0605e9fdcf	minor tweak [SVN r34375]	2006-06-22 13:43:09 +00:00
Joel de Guzman	cf68da0b19	added test for vector<string> [SVN r34374]	2006-06-22 13:33:46 +00:00
Joel de Guzman	d3c474b295	terminology tweak [SVN r34360]	2006-06-20 14:01:12 +00:00
Joel de Guzman	c9300e07c2	added custom converter test for map indexing suite [SVN r34359]	2006-06-20 00:33:22 +00:00
Ralf W. Grosse-Kunstleve	cab94a7bba	adjustments for new MIPSpro 7.4.4 [SVN r34132]	2006-06-02 05:39:50 +00:00
Ralf W. Grosse-Kunstleve	caa9cb8268	Python 2.5 compatibility [SVN r34017]	2006-05-18 22:41:14 +00:00
Ralf W. Grosse-Kunstleve	66ac61450e	avoid Visual C++ 7.1 "resolved overload was found by argument-dependent lookup" warning [SVN r34016]	2006-05-18 22:09:20 +00:00
Ralf W. Grosse-Kunstleve	59f81def56	Python include must appear before any system include [SVN r34010]	2006-05-18 18:47:12 +00:00
Ralf W. Grosse-Kunstleve	92862028b7	MIPSpro 7.3.1 compatibility [SVN r34009]	2006-05-18 18:46:26 +00:00
Ralf W. Grosse-Kunstleve	b0ba7dfc50	also exercise OVERLOADS with docstring [SVN r34006]	2006-05-18 16:15:59 +00:00
Ralf W. Grosse-Kunstleve	fe3abeda9f	much more informative pickle error messages if pickling is not enabled [SVN r34004]	2006-05-18 15:49:41 +00:00
Markus Schöpflin	3fdfb30e33	Include python first, fixes error on Tru64/CXX. [SVN r33454]	2006-03-23 09:38:03 +00:00
Vladimir Prus	cdcf8633bb	Force multithreading for Python test. Workaround for problem described in http://thread.gmane.org/gmane.comp.lib.boost.devel/139601 [SVN r33434]	2006-03-22 09:53:34 +00:00