This commit was manufactured by cvs2svn to create tag

'Version_1_34_0'. [SVN r37679]
Jamfile had extra bogus tst executable target
2026-01-21 17:12:22 +00:00 · 2007-05-12 21:59:40 +00:00 · 2007-05-07 19:00:01 +00:00 · 2007-05-04 01:08:54 +00:00 · 2007-05-04 00:56:22 +00:00 · 2007-05-01 16:14:39 +00:00
58 changed files with 1874 additions and 1058 deletions
--- a/build/Attic/python_v1.zip
+++ b/build/Attic/python_v1.zip
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -7,12 +7,26 @@ import modules ;

 import python ;

-if [ python.configured ] {
+if ! [ python.configured ] && ! ( --without-python in  [ modules.peek : ARGV ] )
+{
+    # Attempt default configuration of python
+    import toolset : using ;
+    using python ;
    
+    if ! [ python.configured ]
+    {
+        ECHO "WARNING: No python installation configured and autoconfiguration" ; 
+        ECHO "         failed.  See http://www.boost.org/libs/python/doc/building.html" ;
+        ECHO "         for configuration instructions or pass --without-python to" ;
+        ECHO "         suppress this message and silently skip all Boost.Python targets" ;
+    }
+}
+
+if [ python.configured ] {

 project boost/python
-  : source-location ../src
-  ;
+    : source-location ../src
+    ;

 lib boost_python
    : # sources
@@ -63,11 +77,13 @@ lib boost_python
        # import library, as usage requirements.
        <library>/python//python_for_extensions
      
+        <python-debugging>on:<define>BOOST_DEBUG_PYTHON
+      
    :   # default build
        <link>shared
    :   # usage requirements
-        <link>static:<define>BOOST_PYTHON_STATIC_LIB 
-        <link>shared:<define>BOOST_PYTHON_DYNAMIC_LIB
+        <link>static:<define>BOOST_PYTHON_STATIC_LIB
+        <python-debugging>on:<define>BOOST_DEBUG_PYTHON
    ;
 }
 else
--- a/doc/building.html
+++ b/doc/building.html
@@ -9,60 +9,63 @@
 </head>
 <body>
 <div class="document" id="logo-boost-python-build-and-test-howto">
-<h1 class="title"><a class="reference" href="../index.htm"><img alt="Boost C++ Libraries:" class="boost-logo" src="../boost.png" /></a> Boost.Python Build and Test HOWTO</h1>
+<h1 class="title"><a class="reference external" href="../index.htm"><img alt="Boost C++ Libraries:" class="boost-logo" src="../../../boost.png" /></a> Boost.Python Build and Test HOWTO</h1>

 <!-- 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) -->
-<div class="contents sidebar small topic">
-<p class="topic-title first"><a id="contents" name="contents">Contents</a></p>
+<div class="contents sidebar small topic" id="contents">
+<p class="topic-title first">Contents</p>
 <ul class="auto-toc simple">
-<li><a class="reference" href="#requirements" id="id20" name="id20">1&nbsp;&nbsp;&nbsp;Requirements</a></li>
-<li><a class="reference" href="#background" id="id21" name="id21">2&nbsp;&nbsp;&nbsp;Background</a></li>
-<li><a class="reference" href="#getting-boost-python-binaries" id="id22" name="id22">3&nbsp;&nbsp;&nbsp;Getting Boost.Python Binaries</a><ul class="auto-toc">
-<li><a class="reference" href="#no-install-quickstart" id="id23" name="id23">3.1&nbsp;&nbsp;&nbsp;No-Install Quickstart</a></li>
-<li><a class="reference" href="#installing-boost-python-on-your-system" id="id24" name="id24">3.2&nbsp;&nbsp;&nbsp;Installing Boost.Python on your System</a></li>
+<li><a class="reference internal" href="#requirements" id="id25">1&nbsp;&nbsp;&nbsp;Requirements</a></li>
+<li><a class="reference internal" href="#background" id="id26">2&nbsp;&nbsp;&nbsp;Background</a></li>
+<li><a class="reference internal" href="#no-install-quickstart" id="id27">3&nbsp;&nbsp;&nbsp;No-Install Quickstart</a><ul class="auto-toc">
+<li><a class="reference internal" href="#basic-procedure" id="id28">3.1&nbsp;&nbsp;&nbsp;Basic Procedure</a></li>
+<li><a class="reference internal" href="#in-case-of-trouble" id="id29">3.2&nbsp;&nbsp;&nbsp;In Case of Trouble</a></li>
+<li><a class="reference internal" href="#in-case-everything-seemed-to-work" id="id30">3.3&nbsp;&nbsp;&nbsp;In Case Everything Seemed to Work</a></li>
+<li><a class="reference internal" href="#modifying-the-example-project" id="id31">3.4&nbsp;&nbsp;&nbsp;Modifying the Example Project</a></li>
 </ul>
 </li>
-<li><a class="reference" href="#configuring-boost-build" id="id25" name="id25">4&nbsp;&nbsp;&nbsp;Configuring Boost.Build</a></li>
-<li><a class="reference" href="#building-an-extension-module" id="id26" name="id26">5&nbsp;&nbsp;&nbsp;Building an Extension Module</a></li>
-<li><a class="reference" href="#testing" id="id27" name="id27">6&nbsp;&nbsp;&nbsp;Testing</a></li>
-<li><a class="reference" href="#advanced-configuration" id="id28" name="id28">7&nbsp;&nbsp;&nbsp;Advanced Configuration</a><ul class="auto-toc">
-<li><a class="reference" href="#python-configuration-parameters" id="id29" name="id29">7.1&nbsp;&nbsp;&nbsp;Python Configuration Parameters</a></li>
-<li><a class="reference" href="#examples" id="id30" name="id30">7.2&nbsp;&nbsp;&nbsp;Examples</a></li>
+<li><a class="reference internal" href="#installing-boost-python-on-your-system" id="id32">4&nbsp;&nbsp;&nbsp;Installing Boost.Python on your System</a></li>
+<li><a class="reference internal" href="#configuring-boost-build" id="id33">5&nbsp;&nbsp;&nbsp;Configuring Boost.Build</a><ul class="auto-toc">
+<li><a class="reference internal" href="#python-configuration-parameters" id="id34">5.1&nbsp;&nbsp;&nbsp;Python Configuration Parameters</a></li>
+<li><a class="reference internal" href="#examples" id="id35">5.2&nbsp;&nbsp;&nbsp;Examples</a></li>
 </ul>
 </li>
-<li><a class="reference" href="#choosing-a-boost-python-library-binary" id="id31" name="id31">8&nbsp;&nbsp;&nbsp;Choosing a Boost.Python Library Binary</a><ul class="auto-toc">
-<li><a class="reference" href="#the-dynamic-binary" id="id32" name="id32">8.1&nbsp;&nbsp;&nbsp;The Dynamic Binary</a></li>
-<li><a class="reference" href="#the-static-binary" id="id33" name="id33">8.2&nbsp;&nbsp;&nbsp;The Static Binary</a></li>
+<li><a class="reference internal" href="#choosing-a-boost-python-library-binary" id="id36">6&nbsp;&nbsp;&nbsp;Choosing a Boost.Python Library Binary</a><ul class="auto-toc">
+<li><a class="reference internal" href="#the-dynamic-binary" id="id37">6.1&nbsp;&nbsp;&nbsp;The Dynamic Binary</a></li>
+<li><a class="reference internal" href="#the-static-binary" id="id38">6.2&nbsp;&nbsp;&nbsp;The Static Binary</a></li>
 </ul>
 </li>
-<li><a class="reference" href="#notes-for-mingw-and-cygwin-with-mno-cygwin-gcc-users" id="id34" name="id34">9&nbsp;&nbsp;&nbsp;Notes for MinGW (and Cygwin with -mno-cygwin) GCC Users</a></li>
+<li><a class="reference internal" href="#include-issues" id="id39">7&nbsp;&nbsp;&nbsp;<tt class="docutils literal"><span class="pre">#include</span></tt> Issues</a></li>
+<li><a class="reference internal" href="#python-debugging-builds" id="id40">8&nbsp;&nbsp;&nbsp;Python Debugging Builds</a></li>
+<li><a class="reference internal" href="#testing-boost-python" id="id41">9&nbsp;&nbsp;&nbsp;Testing Boost.Python</a></li>
+<li><a class="reference internal" href="#notes-for-mingw-and-cygwin-with-mno-cygwin-gcc-users" id="id42">10&nbsp;&nbsp;&nbsp;Notes for MinGW (and Cygwin with -mno-cygwin) GCC Users</a></li>
 </ul>
 </div>
-<div class="section">
-<h1><a class="toc-backref" href="#id20" id="requirements" name="requirements">1&nbsp;&nbsp;&nbsp;Requirements</a></h1>
-<p>Boost.Python requires <a class="reference" href="http://www.python.org/2.2">Python 2.2</a><a class="footnote-reference" href="#id16" id="id2" name="id2"><sup>1</sup></a> <em>or</em> <a class="reference" href="http://www.python.org"><em>newer</em></a>.</p>
+<div class="section" id="requirements">
+<h1><a class="toc-backref" href="#id25">1&nbsp;&nbsp;&nbsp;Requirements</a></h1>
+<p>Boost.Python requires <a class="reference external" href="http://www.python.org/2.2">Python 2.2</a><a class="footnote-reference" href="#id22" id="id2"><sup>1</sup></a> <em>or</em> <a class="reference external" href="http://www.python.org"><em>newer</em></a>.</p>
 </div>
-<div class="section">
-<h1><a class="toc-backref" href="#id21" id="background" name="background">2&nbsp;&nbsp;&nbsp;Background</a></h1>
+<div class="section" id="background">
+<h1><a class="toc-backref" href="#id26">2&nbsp;&nbsp;&nbsp;Background</a></h1>
 <p>There are two basic models for combining C++ and Python:</p>
 <ul class="simple">
-<li><a class="reference" href="http://www.python.org/doc/current/ext/intro.html">extending</a>, in which the end-user launches the Python interpreter
+<li><a class="reference external" href="http://www.python.org/doc/current/ext/intro.html">extending</a>, in which the end-user launches the Python interpreter
 executable and imports Python “extension modules” written in C++.
 Think of taking a library written in C++ and giving it a Python
 interface so Python programmers can use it.  From Python, these
 modules look just like regular Python modules.</li>
-<li><a class="reference" href="http://www.python.org/doc/current/ext/embedding.html">embedding</a>, in which the end-user launches a program written
+<li><a class="reference external" href="http://www.python.org/doc/current/ext/embedding.html">embedding</a>, in which the end-user launches a program written
 in C++ that in turn invokes the Python interpreter as a library
 subroutine.  Think of adding scriptability to an existing
 application.</li>
 </ul>
 <p>The key distinction between extending and embedding is the location
-of C++' <tt class="docutils literal"><span class="pre">main()</span></tt> function: in the Python interpreter executable,
+of the C++ <tt class="docutils literal"><span class="pre">main()</span></tt> function: in the Python interpreter executable,
 or in some other program, respectively.  Note that even when
-embedding Python in another program, <a class="reference" href="http://www.python.org/doc/current/ext/extending-with-embedding.html">extension modules are often
+embedding Python in another program, <a class="reference external" href="http://www.python.org/doc/current/ext/extending-with-embedding.html">extension modules are often
 the best way to make C/C++ functionality accessible to Python
 code</a>, so the use of extension modules is really at the heart of
 both models.</p>
@@ -71,127 +74,289 @@ dynamically-loaded libraries with a single entry point, which means
 you can change them without rebuilding either the other extension
 modules or the executable containing <tt class="docutils literal"><span class="pre">main()</span></tt>.</p>
 </div>
-<div class="section">
-<h1><a class="toc-backref" href="#id22" id="getting-boost-python-binaries" name="getting-boost-python-binaries">3&nbsp;&nbsp;&nbsp;Getting Boost.Python Binaries</a></h1>
-<p>Since Boost.Python is a separately-compiled (as opposed to
-<a class="reference" href="../../../more/getting_started/windows.html#header-only-libraries">header-only</a>) library, its user relies on the services of a
-Boost.Python library binary.</p>
-<div class="section">
-<h2><a class="toc-backref" href="#id23" id="no-install-quickstart" name="no-install-quickstart">3.1&nbsp;&nbsp;&nbsp;No-Install Quickstart</a></h2>
-<p>If you just want to get started quickly building and testing
-Boost.Python extension modules, or embedding Python in an
-executable, you don't need to worry about installing Boost.Python
-binaries explicitly.  These instructions use <a class="reference" href="../../../tools/build">Boost.Build</a> projects,
+<div class="section" id="no-install-quickstart">
+<h1><a class="toc-backref" href="#id27">3&nbsp;&nbsp;&nbsp;No-Install Quickstart</a></h1>
+<p>There is no need to “install Boost” in order to get started using
+Boost.Python.  These instructions use <a class="reference external" href="../../../tools/build/index.html">Boost.Build</a> projects,
 which will build those binaries as soon as they're needed.  Your
 first tests may take a little longer while you wait for
 Boost.Python to build, but doing things this way will save you from
 worrying about build intricacies like which library binaries to use
-for a specific compiler configuration.</p>
+for a specific compiler configuration and figuring out the right
+compiler options to use yourself.</p>
+<!-- .. raw:: html
+
+<div style="width:50%"> -->
 <div class="note">
 <p class="first admonition-title">Note</p>
 <p>Of course it's possible to use other build systems to
 build Boost.Python and its extensions, but they are not
-officially supported by Boost and <strong>99% of all “I can't build
-Boost.Python” problems come from trying to use another build
-system</strong>.</p>
-<p class="last">If you want to use another system anyway, we suggest that you
-follow these instructions, and then invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> with the
-<tt class="docutils literal"><span class="pre">-a</span> <span class="pre">-o</span></tt><em>filename</em> option to dump the build commands it executes
-to a file, so you can see what your build system needs to do.</p>
+officially supported by Boost.  Moreover <strong>99% of all “I can't
+build Boost.Python” problems come from trying to use another
+build system</strong> without first following these instructions.</p>
+<p>If you want to use another system anyway, we suggest that you
+follow these instructions, and then invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> with the</p>
+<pre class="literal-block">
+<tt class="docutils literal"><span class="pre">-a</span> <span class="pre">-o</span></tt><em>filename</em>
+</pre>
+<p class="last">options to dump the build commands it executes to a file, so
+you can see what your alternate build system needs to do.</p>
+</div>
+<!-- .. raw:: html
+
+</div> -->
+<div class="section" id="basic-procedure">
+<h2><a class="toc-backref" href="#id28">3.1&nbsp;&nbsp;&nbsp;Basic Procedure</a></h2>
+<ol class="arabic">
+<li><p class="first">Get Boost; see sections 1 and 2 [<a class="reference external" href="../../../more/getting_started/unix-variants.html#get-boost">Unix/Linux</a>, <a class="reference external" href="../../../more/getting_started/windows.html#get-boost">Windows</a>] of the
+Boost <a class="reference external" href="../../../more/getting_started/index.html">Getting Started Guide</a>.</p>
+</li>
+<li><p class="first">Get the <tt class="docutils literal"><span class="pre">bjam</span></tt> build driver.  See section 5 [<a class="reference external" href="../../../more/getting_started/unix-variants.html#prepare-to-use-a-boost-library-binary">Unix/Linux</a>,
+<a class="reference external" href="../../../more/getting_started/windows.html#prepare-to-use-a-boost-library-binary">Windows</a>] of the Boost <a class="reference external" href="../../../more/getting_started/index.html">Getting Started Guide</a>.</p>
+</li>
+<li><p class="first">cd into the <tt class="docutils literal"><span class="pre">libs/python/example/quickstart/</span></tt> directory of your
+Boost installation, which contains a small example project.</p>
+</li>
+<li><p class="first">Invoke <tt class="docutils literal"><span class="pre">bjam</span></tt>.  Replace the “<tt class="docutils literal"><span class="pre">stage</span></tt>“ argument from the
+example invocation from section 5 of the <a class="reference external" href="../../../more/getting_started/index.html">Getting Started
+Guide</a> with “<tt class="docutils literal"><span class="pre">test</span></tt>,“ to build all the test targets.  Also add
+the argument “<tt class="docutils literal"><span class="pre">--verbose-test</span></tt>” to see the output generated by
+the tests when they are run.</p>
+<p>On Windows, your <tt class="docutils literal"><span class="pre">bjam</span></tt> invocation might look something like:</p>
+<pre class="literal-block">
+C:\boost_1_34_0\…\quickstart&gt; <strong>bjam toolset=msvc --verbose-test test</strong>
+</pre>
+<p>and on Unix variants, perhaps,</p>
+<pre class="literal-block">
+~/boost_1_34_0/…/quickstart$ <strong>bjam toolset=gcc --verbose-test test</strong>
+</pre>
+</li>
+</ol>
+<div class="admonition-note-to-windows-users admonition">
+<p class="first admonition-title">Note to Windows Users</p>
+<p class="last">For the sake of concision, the rest of this guide will use
+unix-style forward slashes in pathnames instead of the
+backslashes with which you may be more familiar.  The forward
+slashes should work everywhere except in <a class="reference external" href="../../../more/getting_started/windows.html#command-prompt">Command Prompt</a>
+windows, where you should use backslashes.</p>
+</div>
+<p>If you followed this procedure successfully, you will have built an
+extension module called <tt class="docutils literal"><span class="pre">extending</span></tt> and tested it by running a
+Python script called <tt class="docutils literal"><span class="pre">test_extending.py</span></tt>.  You will also have
+built and run a simple application called <tt class="docutils literal"><span class="pre">embedding</span></tt> that embeds
+python.</p>
+</div>
+<div class="section" id="in-case-of-trouble">
+<h2><a class="toc-backref" href="#id29">3.2&nbsp;&nbsp;&nbsp;In Case of Trouble</a></h2>
+<p>If you're seeing lots of compiler and/or linker error messages,
+it's probably because Boost.Build is having trouble finding your
+Python installation.  You might want to pass the
+<tt class="docutils literal"><span class="pre">--debug-configuration</span></tt> option to <tt class="docutils literal"><span class="pre">bjam</span></tt> the first few times
+you invoke it, to make sure that Boost.Build is correctly locating
+all the parts of your Python installation.  If it isn't, consider
+<a class="reference internal" href="#configuring-boost-build">Configuring Boost.Build</a> as detailed below.</p>
+<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>
+</ul>
+</div>
+<div class="section" id="in-case-everything-seemed-to-work">
+<h2><a class="toc-backref" href="#id30">3.3&nbsp;&nbsp;&nbsp;In Case Everything Seemed to Work</a></h2>
+<p>Rejoice!  If you're new to Boost.Python, at this point it might be
+a good idea to ignore build issues for a while and concentrate on
+learning the library by going through the <a class="reference external" href="tutorial/index.html">tutorial</a> and perhaps
+some of the <a class="reference external" href="v2/reference.html">reference documentation</a>, trying out what you've
+learned about the API by modifying the quickstart project.</p>
+</div>
+<div class="section" id="modifying-the-example-project">
+<h2><a class="toc-backref" href="#id31">3.4&nbsp;&nbsp;&nbsp;Modifying the Example Project</a></h2>
+<p>If you're content to keep your extension module forever in one
+source file called <a class="reference external" href="../example/quickstart/extending.cpp"><tt class="docutils literal"><span class="pre">extending.cpp</span></tt></a>, inside your Boost
+distribution, and import it forever as <tt class="docutils literal"><span class="pre">extending</span></tt>, then you can
+stop here.  However, it's likely that you will want to make a few
+changes.  There are a few things you can do without having to learn
+<a class="reference external" href="../../../tools/build/index.html">Boost.Build</a> in depth.</p>
+<p>The project you just built is specified in two files in the current
+directory: <a class="reference external" href="../example/quickstart/boost-build.jam"><tt class="docutils literal"><span class="pre">boost-build.jam</span></tt></a>, which tells <tt class="docutils literal"><span class="pre">bjam</span></tt> where it can
+find the interpreted code of the Boost build system, and
+<a class="reference external" href="../example/quickstart/Jamroot"><tt class="docutils literal"><span class="pre">Jamroot</span></tt></a>, which describes the targets you just built.  These
+files are heavily commented, so they should be easy to modify.
+Take care, however, to preserve whitespace.  Punctuation such as
+<tt class="docutils literal"><span class="pre">;</span></tt> will not be recognized as intended by <tt class="docutils literal"><span class="pre">bjam</span></tt> if it is not
+surrounded by whitespace.</p>
+<div class="section" id="relocate-the-project">
+<h3>Relocate the Project</h3>
+<p>You'll probably want to copy this project elsewhere so you can
+change it without modifying your Boost distribution.  To do that,
+simply</p>
+<ol class="loweralpha simple">
+<li>copy the entire <tt class="docutils literal"><span class="pre">libs/python/example/quickstart/</span></tt> directory
+into a new directory.</li>
+<li>In the new copies of <a class="reference external" href="../example/quickstart/boost-build.jam"><tt class="docutils literal"><span class="pre">boost-build.jam</span></tt></a> and <a class="reference external" href="../example/quickstart/Jamroot"><tt class="docutils literal"><span class="pre">Jamroot</span></tt></a>, locate
+the relative path near the top of the file that is clearly
+marked by a comment, and edit that path so that it refers to the
+same directory your Boost distribution as it referred to when
+the file was in its original location in the
+<tt class="docutils literal"><span class="pre">libs/python/example/quickstart/</span></tt> directory.</li>
+</ol>
+<p>For example, if you moved the project from
+<tt class="docutils literal"><span class="pre">/home/dave/boost_1_34_0/libs/python/example/quickstart</span></tt> to
+<tt class="docutils literal"><span class="pre">/home/dave/my-project</span></tt>, you could change the first path in
+<a class="reference external" href="../example/quickstart/boost-build.jam"><tt class="docutils literal"><span class="pre">boost-build.jam</span></tt></a> from</p>
+<pre class="literal-block">
+<strong>../../../..</strong>/tools/build/v2
+</pre>
+<p>to</p>
+<pre class="literal-block">
+<strong>/home/dave/boost_1_34_0</strong>/tools/build/v2
+</pre>
+<p>and change the first path in <a class="reference external" href="../example/quickstart/Jamroot"><tt class="docutils literal"><span class="pre">Jamroot</span></tt></a> from</p>
+<pre class="literal-block">
+<strong>../../../..</strong>
+</pre>
+<p>to</p>
+<pre class="literal-block">
+<strong>/home/dave/boost_1_34_0</strong>
+</pre>
+</div>
+<div class="section" id="add-new-or-change-names-of-existing-source-files">
+<h3>Add New or Change Names of Existing Source Files</h3>
+<p>The names of additional source files involved in building your
+extension module or embedding application can be listed in
+<a class="reference external" href="../example/quickstart/Jamroot"><tt class="docutils literal"><span class="pre">Jamroot</span></tt></a> right alongside <tt class="docutils literal"><span class="pre">extending.cpp</span></tt> or <tt class="docutils literal"><span class="pre">embedding.cpp</span></tt>
+respectively.  Just be sure to leave whitespace around each
+filename:</p>
+<pre class="literal-block">
+… file1.cpp file2.cpp file3.cpp …
+</pre>
+<p>Naturally, if you want to change the name of a source file you can
+tell Boost.Build about it by editing the name in <a class="reference external" href="../example/quickstart/Jamroot"><tt class="docutils literal"><span class="pre">Jamroot</span></tt></a>.</p>
+</div>
+<div class="section" id="change-the-name-of-your-extension-module">
+<h3>Change the Name of your Extension Module</h3>
+<p>The name of the extension module is determined by two things:</p>
+<ol class="arabic simple">
+<li>the name in <a class="reference external" href="../example/quickstart/Jamroot"><tt class="docutils literal"><span class="pre">Jamroot</span></tt></a> immediately following <tt class="docutils literal"><span class="pre">python-extension</span></tt>, and</li>
+<li>the name passed to <tt class="docutils literal"><span class="pre">BOOST_PYTHON_MODULE</span></tt> in <a class="reference external" href="../example/quickstart/extending.cpp"><tt class="docutils literal"><span class="pre">extending.cpp</span></tt></a>.</li>
+</ol>
+<p>To change the name of the extension module from <tt class="docutils literal"><span class="pre">extending</span></tt> to
+<tt class="docutils literal"><span class="pre">hello</span></tt>, you'd edit <a class="reference external" href="../example/quickstart/Jamroot"><tt class="docutils literal"><span class="pre">Jamroot</span></tt></a>, changing</p>
+<pre class="literal-block">
+python-extension <strong>extending</strong> : extending.cpp ;
+</pre>
+<p>to</p>
+<pre class="literal-block">
+python-extension <strong>hello</strong> : extending.cpp ;
+</pre>
+<p>and you'd edit extending.cpp, changing</p>
+<pre class="literal-block">
+BOOST_PYTHON_MODULE(<strong>extending</strong>)
+</pre>
+<p>to</p>
+<pre class="literal-block">
+BOOST_PYTHON_MODULE(<strong>hello</strong>)
+</pre>
 </div>
 </div>
-<div class="section">
-<h2><a class="toc-backref" href="#id24" id="installing-boost-python-on-your-system" name="installing-boost-python-on-your-system">3.2&nbsp;&nbsp;&nbsp;Installing Boost.Python on your System</a></h2>
-<p>If you need a regular, installation of the Boost.Python library
-binaries on your system, the Boost <a class="reference" href="../../../more/getting_started/index.html">Getting Started Guide</a> will
-walk you through the steps of installing one.  If building binaries
+</div>
+<div class="section" id="installing-boost-python-on-your-system">
+<h1><a class="toc-backref" href="#id32">4&nbsp;&nbsp;&nbsp;Installing Boost.Python on your System</a></h1>
+<p>Since Boost.Python is a separately-compiled (as opposed to
+<a class="reference external" href="../../../more/getting_started/windows.html#header-only-libraries">header-only</a>) library, its user relies on the services of a
+Boost.Python library binary.</p>
+<p>If you need a regular installation of the Boost.Python library
+binaries on your system, the Boost <a class="reference external" href="../../../more/getting_started/index.html">Getting Started Guide</a> will
+walk you through the steps of creating one.  If building binaries
 from source, you might want to supply the <tt class="docutils literal"><span class="pre">--with-python</span></tt>
 argument to <tt class="docutils literal"><span class="pre">bjam</span></tt> (or the <tt class="docutils literal"><span class="pre">--with-libraries=python</span></tt> argument
 to <tt class="docutils literal"><span class="pre">configure</span></tt>), so only the Boost.Python binary will be built,
 rather than all the Boost binaries.</p>
+<div class="admonition-windows-users-no-auto-link-support admonition">
+<p class="first admonition-title">Windows Users: No Auto-Link Support</p>
+<p class="last">Boost.Python does not yet support the <a class="reference external" href="../../../more/getting_started/windows.html#link-your-program-to-a-boost-library">auto-link</a> feature, so if
+you're not using the <a class="reference internal" href="#no-install-quickstart">quickstart</a> method, you'll have to pay
+attention to the names of generated libraries and add extra link
+arguments not shown in the <a class="reference external" href="../../../more/getting_started/index.html">Getting Started Guide</a> to select the
+right library.</p>
 </div>
 </div>
-<div class="section">
-<h1><a class="toc-backref" href="#id25" id="configuring-boost-build" name="configuring-boost-build">4&nbsp;&nbsp;&nbsp;Configuring Boost.Build</a></h1>
-<p>As described in the <a class="reference" href="http://www.boost.orgdoc/html/bbv2/advanced.html#bbv2.advanced.configuration">Boost.Build reference manual</a>, a file called
-<tt class="docutils literal"><span class="pre">user-config.jam</span></tt> in your home
-directory<a class="footnote-reference" href="#home-dir" id="id5" name="id5"><sup>7</sup></a> is used to
-describe the build resources available to the build system.  You'll
-need to tell it about your Python installation.</p>
+<div class="section" id="configuring-boost-build">
+<h1><a class="toc-backref" href="#id33">5&nbsp;&nbsp;&nbsp;Configuring Boost.Build</a></h1>
+<p>As described in the <a class="reference external" href="http://www.boost.orgdoc/html/bbv2/advanced.html#bbv2.advanced.configuration">Boost.Build reference manual</a>, a file called
+<tt class="docutils literal"><span class="pre">user-config.jam</span></tt> in your home directory<a class="footnote-reference" href="#home-dir" id="id11"><sup>6</sup></a> is used to
+specify the tools and libraries available to the build system. You
+may need to create or edit <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> to tell Boost.Build
+how to invoke Python, <tt class="docutils literal"><span class="pre">#include</span></tt> its headers, and link with its
+libraries.</p>
 <div class="admonition-users-of-unix-variant-oses admonition">
 <p class="first admonition-title">Users of Unix-Variant OSes</p>
 <p class="last">If you are using a unix-variant OS and you ran Boost's
 <tt class="docutils literal"><span class="pre">configure</span></tt> script, it may have generated a
-<tt class="docutils literal"><span class="pre">user-config.jam</span></tt> for you.<a class="footnote-reference" href="#overwrite" id="id7" name="id7"><sup>4</sup></a> If your <tt class="docutils literal"><span class="pre">configure</span></tt>/<tt class="docutils literal"><span class="pre">make</span></tt> sequence was successful and Boost.Python binaries
+<tt class="docutils literal"><span class="pre">user-config.jam</span></tt> for you.<a class="footnote-reference" href="#overwrite" id="id13"><sup>4</sup></a> If your <tt class="docutils literal"><span class="pre">configure</span></tt>/<tt class="docutils literal"><span class="pre">make</span></tt> sequence was successful and Boost.Python binaries
 were built, your <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file is probably already
 correct.</p>
 </div>
-<p>If you have a fairly “standard” python installation for your
-platform, there's very little you need to do to describe it.
-Simply having</p>
+<p>If you have one fairly “standard” python installation for your
+platform, you might not need to do anything special to describe it.  If
+you haven't configured python in <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> (and you don't
+specify <tt class="docutils literal"><span class="pre">--without-python</span></tt> on the Boost.Build command line),
+Boost.Build will automatically execute the equivalent of</p>
 <pre class="literal-block">
 import toolset : using ;
 using python ;
 </pre>
-<p>in a <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file in your home directory<a class="footnote-reference" href="#home-dir" id="id8" name="id8"><sup>7</sup></a>
-should be enough.<a class="footnote-reference" href="#user-config-jam" id="id9" name="id9"><sup>6</sup></a>  For more complicated setups,
-see <a class="reference" href="#advanced-configuration">Advanced Configuration</a>.</p>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">You might want to pass the <tt class="docutils literal"><span class="pre">--debug-configuration</span></tt>
-option to <tt class="docutils literal"><span class="pre">bjam</span></tt> the first few times you invoke it, to make
-sure that Boost.Build is correctly locating all the parts of
-your Python installation.  If it isn't, consider passing some of
-the optional <a class="reference" href="#python-configuration-parameters">Python configuration parameters</a> detailed below.</p>
-</div>
-</div>
-<div class="section">
-<h1><a class="toc-backref" href="#id26" id="building-an-extension-module" name="building-an-extension-module">5&nbsp;&nbsp;&nbsp;Building an Extension Module</a></h1>
-</div>
-<div class="section">
-<h1><a class="toc-backref" href="#id27" id="testing" name="testing">6&nbsp;&nbsp;&nbsp;Testing</a></h1>
-</div>
-<div class="section">
-<h1><a class="toc-backref" href="#id28" id="advanced-configuration" name="advanced-configuration">7&nbsp;&nbsp;&nbsp;Advanced Configuration</a></h1>
+<p>which automatically looks for Python in the most likely places.
+However, that only happens when using the Boost.Python project file
+(e.g. when referred to by another project as in the <a class="reference internal" href="#no-install-quickstart">quickstart</a>
+method).  If instead you are linking against separately-compiled
+Boost.Python binaries, you should set up a <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file
+with at least the minimal incantation above.</p>
+<div class="section" id="python-configuration-parameters">
+<h2><a class="toc-backref" href="#id34">5.1&nbsp;&nbsp;&nbsp;Python Configuration Parameters</a></h2>
 <p>If you have several versions of Python installed, or Python is
 installed in an unusual way, you may want to supply any or all of
 the following optional parameters to <tt class="docutils literal"><span class="pre">using</span> <span class="pre">python</span></tt>.</p>
-<div class="section">
-<h2><a class="toc-backref" href="#id29" id="python-configuration-parameters" name="python-configuration-parameters">7.1&nbsp;&nbsp;&nbsp;Python Configuration Parameters</a></h2>
 <dl class="docutils">
 <dt>version</dt>
 <dd>the version of Python to use.  Should be in Major.Minor
 format, for example, <tt class="docutils literal"><span class="pre">2.3</span></tt>.  Do not include the subminor
 version (i.e. <em>not</em> <tt class="docutils literal"><span class="pre">2.5.1</span></tt>).  If you have multiple Python
 versions installed, the version will usually be the only
-additional argument required.</dd>
+configuration argument required.</dd>
 <dt>cmd-or-prefix</dt>
-<dd>preferably, a command that invokes a Python
-interpreter.  Alternatively, the installation prefix for Python
-libraries and header files.  Use the alternative formulation if
-there is no appropriate Python executable available.</dd>
+<dd>preferably, a command that invokes a Python interpreter.
+Alternatively, the installation prefix for Python libraries and
+header files.  Only use the alternative formulation if there is
+no appropriate Python executable available.</dd>
 <dt>includes</dt>
-<dd>the <tt class="docutils literal"><span class="pre">#include</span></tt> path for Python headers.</dd>
+<dd>the <tt class="docutils literal"><span class="pre">#include</span></tt> paths for Python headers.  Normally the correct
+path(s) will be automatically deduced from <tt class="docutils literal"><span class="pre">version</span></tt> and/or
+<tt class="docutils literal"><span class="pre">cmd-or-prefix</span></tt>.</dd>
 <dt>libraries</dt>
 <dd>the path to Python library binaries.  On MacOS/Darwin,
-you can also pass the path of the Python framework.</dd>
+you can also pass the path of the Python framework.  Normally the
+correct path(s) will be automatically deduced from <tt class="docutils literal"><span class="pre">version</span></tt>
+and/or <tt class="docutils literal"><span class="pre">cmd-or-prefix</span></tt>.</dd>
 <dt>condition</dt>
 <dd>if specified, should be a set of Boost.Build
 properties that are matched against the build configuration when
-Boost.Build selects a Python configuration to use.</dd>
+Boost.Build selects a Python configuration to use.  See examples
+below for details.</dd>
 <dt>extension-suffix</dt>
 <dd>A string to append to the name of extension
 modules before the true filename extension.  You almost certainly
 don't need to use this.  Usually this suffix is only used when
 targeting a Windows debug build of Python, and will be set
 automatically for you based on the value of the
-<tt class="docutils literal"><span class="pre">&lt;python-debugging&gt;</span></tt> feature.  However, at least one Linux
+<a class="reference internal" href="#python-debugging"><tt class="docutils literal"><span class="pre">&lt;python-debugging&gt;</span></tt></a> feature.  However, at least one Linux
 distribution (Ubuntu Feisty Fawn) has a specially configured
-<a class="reference" href="https://wiki.ubuntu.com/PyDbgBuilds">python-dbg</a> package that claims to use such a suffix.</dd>
+<a class="reference external" href="https://wiki.ubuntu.com/PyDbgBuilds">python-dbg</a> package that claims to use such a suffix.</dd>
 </dl>
 </div>
-<div class="section">
-<h2><a class="toc-backref" href="#id30" id="examples" name="examples">7.2&nbsp;&nbsp;&nbsp;Examples</a></h2>
+<div class="section" id="examples">
+<h2><a class="toc-backref" href="#id35">5.2&nbsp;&nbsp;&nbsp;Examples</a></h2>
 <p>Note that in the examples below, case and <em>especially whitespace</em> are
 significant.</p>
 <ul>
@@ -229,8 +394,19 @@ using python
     ;
 </pre>
 </li>
+<li><p class="first">If you have downloaded the Python sources and built both the
+normal and the “<a class="reference internal" href="#id19">python debugging</a>” builds from source on
+Windows, you might see:</p>
+<pre class="literal-block">
+using python : 2.5 : C:\\src\\Python-2.5\\PCBuild\\python ;
+using python : 2.5 : C:\\src\\Python-2.5\\PCBuild\\python_d
+  : # includes
+  : # libs
+  : &lt;python-debugging&gt;on ;
+</pre>
+</li>
 <li><p class="first">You can set up your user-config.jam so a bjam built under Windows
-can build/test both Windows and <a class="reference" href="http://cygwin.com">Cygwin</a> python extensions.  Just pass
+can build/test both Windows and <a class="reference external" href="http://cygwin.com">Cygwin</a> python extensions.  Just pass
 <tt class="docutils literal"><span class="pre">&lt;target-os&gt;cygwin</span></tt> in the <tt class="docutils literal"><span class="pre">condition</span></tt> parameter
 for the cygwin python installation:</p>
 <pre class="literal-block">
@@ -241,16 +417,16 @@ using python ;
 using python : : c:\\cygwin\\bin\\python2.5 : : : &lt;target-os&gt;cygwin ;
 </pre>
 <p>when you put target-os=cygwin in your build request, it should build
-with the cygwin version of python:<a class="footnote-reference" href="#flavor" id="id11" name="id11"><sup>5</sup></a></p>
+with the cygwin version of python:<a class="footnote-reference" href="#flavor" id="id15"><sup>5</sup></a></p>
 <blockquote>
 <p>bjam target-os=cygwin toolset=gcc</p>
 </blockquote>
 <p>This is supposed to work the other way, too (targeting windows
-python with a <a class="reference" href="http://cygwin.com">Cygwin</a> bjam) but it seems as though the support in
+python with a <a class="reference external" href="http://cygwin.com">Cygwin</a> bjam) but it seems as though the support in
 Boost.Build's toolsets for building that way is broken at the
 time of this writing.</p>
 </li>
-<li><p class="first">Note that because of <a class="reference" href="http://zigzag.cs.msu.su/boost.build/wiki/AlternativeSelection">the way Boost.Build currently selects target
+<li><p class="first">Note that because of <a class="reference external" href="http://zigzag.cs.msu.su/boost.build/wiki/AlternativeSelection">the way Boost.Build currently selects target
 alternatives</a>, you might have be very explicit in your build
 requests.  For example, given:</p>
 <pre class="literal-block">
@@ -269,35 +445,35 @@ bjam target-os=cygwin/python=2.4
 </ul>
 </div>
 </div>
-<div class="section">
-<h1><a class="toc-backref" href="#id31" id="choosing-a-boost-python-library-binary" name="choosing-a-boost-python-library-binary">8&nbsp;&nbsp;&nbsp;Choosing a Boost.Python Library Binary</a></h1>
-<p>If—instead of letting Boost.Build construct and link withthe right
+<div class="section" id="choosing-a-boost-python-library-binary">
+<h1><a class="toc-backref" href="#id36">6&nbsp;&nbsp;&nbsp;Choosing a Boost.Python Library Binary</a></h1>
+<p>If—instead of letting Boost.Build construct and link with the right
 libraries automatically—you choose to use a pre-built Boost.Python
 library, you'll need to think about which one to link with.  The
 Boost.Python binary comes in both static and dynamic flavors.  Take
-care to choose the right flavor for your application.<a class="footnote-reference" href="#naming" id="id13" name="id13"><sup>2</sup></a></p>
-<div class="section">
-<h2><a class="toc-backref" href="#id32" id="the-dynamic-binary" name="the-dynamic-binary">8.1&nbsp;&nbsp;&nbsp;The Dynamic Binary</a></h2>
+care to choose the right flavor for your application.<a class="footnote-reference" href="#naming" id="id17"><sup>2</sup></a></p>
+<div class="section" id="the-dynamic-binary">
+<h2><a class="toc-backref" href="#id37">6.1&nbsp;&nbsp;&nbsp;The Dynamic Binary</a></h2>
 <p>The dynamic library is the safest and most-versatile choice:</p>
 <ul class="simple">
 <li>A single copy of the library code is used by all extension
-modules built with a given toolset.<a class="footnote-reference" href="#toolset-specific" id="id14" name="id14"><sup>3</sup></a></li>
+modules built with a given toolset.<a class="footnote-reference" href="#toolset-specific" id="id18"><sup>3</sup></a></li>
 <li>The library contains a type conversion registry.  Because one
 registry is shared among all extension modules, instances of a
 class exposed to Python in one dynamically-loaded extension
 module can be passed to functions exposed in another such module.</li>
 </ul>
 </div>
-<div class="section">
-<h2><a class="toc-backref" href="#id33" id="the-static-binary" name="the-static-binary">8.2&nbsp;&nbsp;&nbsp;The Static Binary</a></h2>
+<div class="section" id="the-static-binary">
+<h2><a class="toc-backref" href="#id38">6.2&nbsp;&nbsp;&nbsp;The Static Binary</a></h2>
 <p>It might be appropriate to use the static Boost.Python library in
 any of the following cases:</p>
 <ul class="simple">
-<li>You are <a class="reference" href="http://www.python.org/doc/current/ext/intro.html">extending</a> python and the types exposed in your
+<li>You are <a class="reference external" href="http://www.python.org/doc/current/ext/intro.html">extending</a> python and the types exposed in your
 dynamically-loaded extension module don't need to be used by any
 other Boost.Python extension modules, and you don't care if the
 core library code is duplicated among them.</li>
-<li>You are <a class="reference" href="http://www.python.org/doc/current/ext/embedding.html">embedding</a> python in your application and either:<ul>
+<li>You are <a class="reference external" href="http://www.python.org/doc/current/ext/embedding.html">embedding</a> python in your application and either:<ul>
 <li>You are targeting a Unix variant OS other than MacOS or AIX,
 where the dynamically-loaded extension modules can “see” the
 Boost.Python library symbols that are part of the executable.</li>
@@ -311,22 +487,73 @@ modules (and vice-versa).</li>
 </ul>
 </div>
 </div>
-<div class="section">
-<h1><a class="toc-backref" href="#id34" id="notes-for-mingw-and-cygwin-with-mno-cygwin-gcc-users" name="notes-for-mingw-and-cygwin-with-mno-cygwin-gcc-users">9&nbsp;&nbsp;&nbsp;Notes for MinGW (and Cygwin with -mno-cygwin) GCC Users</a></h1>
+<div class="section" id="include-issues">
+<h1><a class="toc-backref" href="#id39">7&nbsp;&nbsp;&nbsp;<tt class="docutils literal"><span class="pre">#include</span></tt> Issues</a></h1>
+<ol class="arabic simple">
+<li>If you should ever have occasion to <tt class="docutils literal"><span class="pre">#include</span> <span class="pre">&quot;python.h&quot;</span></tt>
+directly in a translation unit of a program using Boost.Python,
+use <tt class="docutils literal"><span class="pre">#include</span> <span class="pre">&quot;boost/python/detail/wrap_python.hpp&quot;</span></tt> instead.
+It handles several issues necessary for use with Boost.Python,
+one of which is mentioned in the next section.</li>
+<li>Be sure not to <tt class="docutils literal"><span class="pre">#include</span></tt> any system headers before
+<tt class="docutils literal"><span class="pre">wrap_python.hpp</span></tt>.  This restriction is actually imposed by
+Python, or more properly, by Python's interaction with your
+operating system.  See
+<a class="reference external" href="http://docs.python.org/ext/simpleExample.html">http://docs.python.org/ext/simpleExample.html</a> for details.</li>
+</ol>
+</div>
+<div class="section" id="python-debugging-builds">
+<span id="id19"></span><span id="python-debugging"></span><h1><a class="toc-backref" href="#id40">8&nbsp;&nbsp;&nbsp;Python Debugging Builds</a></h1>
+<p>Python can be built in a special “python debugging” configuration
+that adds extra checks and instrumentation that can be very useful
+for developers of extension modules.  The data structures used by
+the debugging configuration contain additional members, so <strong>a
+Python executable built with python debugging enabled cannot be
+used with an extension module or library compiled without it, and
+vice-versa.</strong></p>
+<p>Since pre-built “python debugging” versions of the Python
+executable and libraries are not supplied with most distributions
+of Python,<a class="footnote-reference" href="#get-debug-build" id="id20"><sup>7</sup></a> and we didn't want to force our users
+to build them, Boost.Build does not automatically enable python
+debugging in its <tt class="docutils literal"><span class="pre">debug</span></tt> build variant (which is the default).
+Instead there is a special build property called
+<tt class="docutils literal"><span class="pre">python-debugging</span></tt> that, when used as a build property, will
+define the right preprocessor symbols and select the right
+libraries to link with.</p>
+<p>On unix-variant platforms, the debugging versions of Python's data
+structures will only be used if the symbol <tt class="docutils literal"><span class="pre">Py_DEBUG</span></tt> is defined.
+On many windows compilers, when extension modules are built with
+the preprocessor symbol <tt class="docutils literal"><span class="pre">_DEBUG</span></tt>, Python defaults to force
+linking with a special debugging version of the Python DLL.  Since
+that symbol is very commonly used even when Python is not present,
+Boost.Python temporarily undefines _DEBUG when Python.h
+is #included from <tt class="docutils literal"><span class="pre">boost/python/detail/wrap_python.hpp</span></tt> - unless
+<tt class="docutils literal"><span class="pre">BOOST_DEBUG_PYTHON</span></tt> is defined.  The upshot is that if you want
+“python debugging”and you aren't using Boost.Build, you should make
+sure <tt class="docutils literal"><span class="pre">BOOST_DEBUG_PYTHON</span></tt> is defined, or python debugging will be
+suppressed.</p>
+</div>
+<div class="section" id="testing-boost-python">
+<h1><a class="toc-backref" href="#id41">9&nbsp;&nbsp;&nbsp;Testing Boost.Python</a></h1>
+<p>To run the full test suite for Boost.Python, invoke <tt class="docutils literal"><span class="pre">bjam</span></tt> in the
+<tt class="docutils literal"><span class="pre">libs/python/test</span></tt> subdirectory of your Boost distribution.</p>
+</div>
+<div class="section" id="notes-for-mingw-and-cygwin-with-mno-cygwin-gcc-users">
+<h1><a class="toc-backref" href="#id42">10&nbsp;&nbsp;&nbsp;Notes for MinGW (and Cygwin with -mno-cygwin) GCC Users</a></h1>
 <p>If you are using a version of Python prior to 2.4.1 with a MinGW
 prior to 3.0.0 (with binutils-2.13.90-20030111-1), you will need to
 create a MinGW-compatible version of the Python library; the one
 shipped with Python will only work with a Microsoft-compatible
 linker. Follow the instructions in the “Non-Microsoft” section of
-the “Building Extensions: Tips And Tricks” chapter in <a class="reference" href="http://www.python.org/doc/current/inst/index.html">Installing
+the “Building Extensions: Tips And Tricks” chapter in <a class="reference external" href="http://www.python.org/doc/current/inst/index.html">Installing
 Python Modules</a> to create <tt class="docutils literal"><span class="pre">libpythonXX.a</span></tt>, where <tt class="docutils literal"><span class="pre">XX</span></tt>
 corresponds to the major and minor version numbers of your Python
 installation.</p>
 <hr class="docutils" />
-<table class="docutils footnote" frame="void" id="id16" rules="none">
+<table class="docutils footnote" frame="void" id="id22" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id2" name="id16">[1]</a></td><td>Note that although we tested earlier versions of
+<tr><td class="label"><a class="fn-backref" href="#id2">[1]</a></td><td>Note that although we tested earlier versions of
 Boost.Python with Python 2.2, and we don't <em>think</em> we've done
 anything to break compatibility, this release of Boost.Python
 may not have been tested with versions of Python earlier than
@@ -337,11 +564,11 @@ supported.</td></tr>
 <table class="docutils footnote" frame="void" id="naming" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id13" name="naming">[2]</a></td><td><p class="first">Information about how to identify the
+<tr><td class="label"><a class="fn-backref" href="#id17">[2]</a></td><td><p class="first">Information about how to identify the
 static and dynamic builds of Boost.Python:</p>
 <ul class="simple">
-<li><a class="reference" href="../../../more/getting_started/windows.html#library-naming">on Windows</a></li>
-<li><a class="reference" href="../../../more/getting_started/unix-variants.html#library-naming">on Unix variants</a></li>
+<li><a class="reference external" href="../../../more/getting_started/windows.html#library-naming">on Windows</a></li>
+<li><a class="reference external" href="../../../more/getting_started/unix-variants.html#library-naming">on Unix variants</a></li>
 </ul>
 <p class="last">Be sure to read this section even if your compiler supports
 auto-linking, as Boost.Python does not yet take advantage of
@@ -352,9 +579,9 @@ that feature.</p>
 <table class="docutils footnote" frame="void" id="toolset-specific" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id14" name="toolset-specific">[3]</a></td><td>Because of the way most *nix platforms
-share symbols among dynamically-loaded objects, I'm not
-certainextension modules built with different compiler toolsets
+<tr><td class="label"><a class="fn-backref" href="#id18">[3]</a></td><td>Because of the way most *nix platforms
+share symbols among dynamically-loaded objects, I'm not certain
+that extension modules built with different compiler toolsets
 will always use different copies of the Boost.Python library
 when loaded into the same Python instance.  Not using different
 libraries could be a good thing if the compilers have compatible
@@ -369,7 +596,7 @@ happens.</td></tr>
 <table class="docutils footnote" frame="void" id="overwrite" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id7" name="overwrite">[4]</a></td><td><tt class="docutils literal"><span class="pre">configure</span></tt> overwrites the existing
+<tr><td class="label"><a class="fn-backref" href="#id13">[4]</a></td><td><tt class="docutils literal"><span class="pre">configure</span></tt> overwrites the existing
 <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> in your home directory
 (if any) after making a backup of the old version.</td></tr>
 </tbody>
@@ -377,38 +604,43 @@ happens.</td></tr>
 <table class="docutils footnote" frame="void" id="flavor" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id11" name="flavor">[5]</a></td><td>Note that the <tt class="docutils literal"><span class="pre">&lt;target-os&gt;cygwin</span></tt> feature is
+<tr><td class="label"><a class="fn-backref" href="#id15">[5]</a></td><td>Note that the <tt class="docutils literal"><span class="pre">&lt;target-os&gt;cygwin</span></tt> feature is
 different from the <tt class="docutils literal"><span class="pre">&lt;flavor&gt;cygwin</span></tt> subfeature of the <tt class="docutils literal"><span class="pre">gcc</span></tt>
 toolset, and you might need handle both explicitly if you also
 have a MinGW GCC installed.</td></tr>
 </tbody>
 </table>
-<table class="docutils footnote" frame="void" id="user-config-jam" rules="none">
-<colgroup><col class="label" /><col /></colgroup>
-<tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id9" name="user-config-jam">[6]</a></td><td>Create the <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file if you don't
-already have one.</td></tr>
-</tbody>
-</table>
 <table class="docutils footnote" frame="void" id="home-dir" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
-<tr><td class="label"><a name="home-dir">[7]</a></td><td><em>(<a class="fn-backref" href="#id5">1</a>, <a class="fn-backref" href="#id8">2</a>)</em> <p>Windows users, your home directory can be
+<tr><td class="label"><a class="fn-backref" href="#id11">[6]</a></td><td><p class="first">Windows users, your home directory can be
 found by typing:</p>
 <pre class="literal-block">
 ECHO %HOMEDRIVE%%HOMEPATH%
 </pre>
-<p class="last">into a <a class="reference" href="../../../more/getting_started/windows.html#or-build-from-the-command-prompt">Windows command prompt</a></p>
+<p class="last">into a <a class="reference external" href="../../../more/getting_started/windows.html#command-prompt">command prompt</a> window.</p>
 </td></tr>
 </tbody>
 </table>
+<table class="docutils footnote" frame="void" id="get-debug-build" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label"><a class="fn-backref" href="#id20">[7]</a></td><td>On Unix and similar platforms, a debugging
+python and associated libraries are built by adding
+<tt class="docutils literal"><span class="pre">--with-pydebug</span></tt> when configuring the Python build. On
+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>
+</tbody>
+</table>
 </div>
 </div>
 <div class="footer">
 <hr class="footer" />
-<a class="reference" href="./building.rst">View document source</a>.
-Generated on: 2007-04-05 20:04 UTC.
-Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
+<a class="reference external" href="./building.rst">View document source</a>.
+Generated on: 2007-05-07 18:58 UTC.
+Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.

 </div>
 </body>
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -7,7 +7,7 @@
 |(logo)|__ Boost.Python Build and Test HOWTO
 ==============================================

-.. |(logo)| image:: ../boost.png
+.. |(logo)| image:: ../../../boost.png
   :alt: Boost C++ Libraries:
   :class: boost-logo

@@ -31,36 +31,6 @@ Boost.Python requires `Python 2.2`_ [#2.2]_ *or* |newer|__.
 .. _Python 2.2: http://www.python.org/2.2
 __ http://www.python.org

-No-Install Quickstart
-=====================
-
-There is no need to install Boost in order to get started using
-Boost.Python.  These instructions use Boost.Build_ projects,
-which will build those binaries as soon as they're needed.  Your
-first tests may take a little longer while you wait for
-Boost.Python to build, but doing things this way will save you from
-worrying about build intricacies like which library binaries to use
-for a specific compiler configuration.
-
-.. Note:: Of course it's possible to use other build systems to
-   build Boost.Python and its extensions, but they are not
-   officially supported by Boost.  Moreover **99% of all “I can't
-   build Boost.Python” problems come from trying to use another
-   build system**.
-
-   If you want to use another system anyway, we suggest that you
-   follow these instructions, and then invoke ``bjam`` with the
-   ``-a -o``\ *filename* option to dump the build commands it executes
-   to a file, so you can see what your build system needs to do.
-
-1. Get Boost; see sections 1 and 2 of the Boost `Getting Started Guide`_.
-2. Get the ``bjam`` build driver.  See sections 5.2.1-5.2.3 of the
-   Boost `Getting Started Guide`_.
-3. cd into the ``libs/python/test/example`` directory.   
-
-.. _Getting Started Guide: ../../../more/getting_started/index.html
-
-
 Background
 ==========

@@ -81,7 +51,7 @@ There are two basic models for combining C++ and Python:
 .. _embedding: http://www.python.org/doc/current/ext/embedding.html

 The key distinction between extending and embedding is the location
-of C++' ``main()`` function: in the Python interpreter executable,
+of the C++ ``main()`` function: in the Python interpreter executable,
 or in some other program, respectively.  Note that even when
 embedding Python in another program, `extension modules are often
 the best way to make C/C++ functionality accessible to Python
@@ -95,8 +65,252 @@ dynamically-loaded libraries with a single entry point, which means
 you can change them without rebuilding either the other extension
 modules or the executable containing ``main()``.

-Getting Boost.Python Binaries
-=============================
+No-Install Quickstart
+=====================
+
+There is no need to “install Boost” in order to get started using
+Boost.Python.  These instructions use Boost.Build_ projects,
+which will build those binaries as soon as they're needed.  Your
+first tests may take a little longer while you wait for
+Boost.Python to build, but doing things this way will save you from
+worrying about build intricacies like which library binaries to use
+for a specific compiler configuration and figuring out the right
+compiler options to use yourself.
+
+.. .. raw:: html
+
+   <div style="width:50%">
+
+.. Note:: Of course it's possible to use other build systems to
+   build Boost.Python and its extensions, but they are not
+   officially supported by Boost.  Moreover **99% of all “I can't
+   build Boost.Python” problems come from trying to use another
+   build system** without first following these instructions.
+
+   If you want to use another system anyway, we suggest that you
+   follow these instructions, and then invoke ``bjam`` with the
+
+   .. parsed-literal::
+
+     ``-a -o``\ *filename* 
+
+   options to dump the build commands it executes to a file, so
+   you can see what your alternate build system needs to do.
+
+.. .. raw:: html
+ 
+   </div>
+
+.. _Boost.Build: ../../../tools/build/index.html
+
+Basic Procedure
+---------------
+
+1. Get Boost; see sections 1 and 2 [`Unix/Linux`__, `Windows`__\ ] of the
+   Boost `Getting Started Guide`_.
+
+   __ ../../../more/getting_started/unix-variants.html#get-boost
+   __ ../../../more/getting_started/windows.html#get-boost
+
+2. Get the ``bjam`` build driver.  See section 5 [`Unix/Linux`__,
+   `Windows`__\ ] of the Boost `Getting Started Guide`_.
+
+   __ ../../../more/getting_started/unix-variants.html#prepare-to-use-a-boost-library-binary
+   __ ../../../more/getting_started/windows.html#prepare-to-use-a-boost-library-binary
+
+
+3. cd into the ``libs/python/example/quickstart/`` directory of your
+   Boost installation, which contains a small example project.
+
+4. Invoke ``bjam``.  Replace the “\ ``stage``\ “ argument from the
+   example invocation from section 5 of the `Getting Started
+   Guide`_ with “\ ``test``\ ,“ to build all the test targets.  Also add
+   the argument “\ ``--verbose-test``\ ” to see the output generated by
+   the tests when they are run.
+
+   On Windows, your ``bjam`` invocation might look something like:
+
+   .. parsed-literal::
+
+     C:\\boost_1_34_0\\…\\quickstart> **bjam toolset=msvc --verbose-test test**
+
+   and on Unix variants, perhaps,
+
+   .. parsed-literal::
+
+     ~/boost_1_34_0/…/quickstart$ **bjam toolset=gcc --verbose-test test**
+
+.. Admonition:: Note to Windows Users
+
+   For the sake of concision, the rest of this guide will use
+   unix-style forward slashes in pathnames instead of the
+   backslashes with which you may be more familiar.  The forward
+   slashes should work everywhere except in `Command Prompt`_
+   windows, where you should use backslashes.
+
+   .. _Command Prompt: ../../../more/getting_started/windows.html#command-prompt
+
+If you followed this procedure successfully, you will have built an
+extension module called ``extending`` and tested it by running a
+Python script called ``test_extending.py``.  You will also have
+built and run a simple application called ``embedding`` that embeds
+python.
+
+.. _Getting Started Guide: ../../../more/getting_started/index.html
+
+In Case of Trouble
+------------------
+
+If you're seeing lots of compiler and/or linker error messages,
+it's probably because Boost.Build is having trouble finding your
+Python installation.  You might want to pass the
+``--debug-configuration`` option to ``bjam`` the first few times
+you invoke it, to make sure that Boost.Build is correctly locating
+all the parts of your Python installation.  If it isn't, consider
+`Configuring Boost.Build`_ as detailed below.
+
+If you're still having trouble, Someone on one of the following
+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
+
+In Case Everything Seemed to Work
+---------------------------------
+
+Rejoice!  If you're new to Boost.Python, at this point it might be
+a good idea to ignore build issues for a while and concentrate on
+learning the library by going through the tutorial_ and perhaps
+some of the `reference documentation`_, trying out what you've
+learned about the API by modifying the quickstart project.
+
+.. _reference documentation: v2/reference.html
+.. _tutorial: tutorial/index.html
+
+Modifying the Example Project
+-----------------------------
+
+If you're content to keep your extension module forever in one
+source file called |extending.cpp|_, inside your Boost
+distribution, and import it forever as ``extending``, then you can
+stop here.  However, it's likely that you will want to make a few
+changes.  There are a few things you can do without having to learn
+Boost.Build_ in depth.
+
+The project you just built is specified in two files in the current
+directory: |boost-build.jam|_, which tells ``bjam`` where it can
+find the interpreted code of the Boost build system, and
+|Jamroot|_, which describes the targets you just built.  These
+files are heavily commented, so they should be easy to modify.
+Take care, however, to preserve whitespace.  Punctuation such as
+``;`` will not be recognized as intended by ``bjam`` if it is not
+surrounded by whitespace.
+
+.. |boost-build.jam| replace:: ``boost-build.jam``
+.. _boost-build.jam: ../example/quickstart/boost-build.jam
+
+.. |Jamroot| replace:: ``Jamroot``
+.. _Jamroot: ../example/quickstart/Jamroot
+
+.. |extending.cpp| replace:: ``extending.cpp``
+.. _extending.cpp: ../example/quickstart/extending.cpp
+
+Relocate the Project
+....................
+
+You'll probably want to copy this project elsewhere so you can
+change it without modifying your Boost distribution.  To do that,
+simply
+
+a. copy the entire ``libs/python/example/quickstart/`` directory
+   into a new directory.
+
+b. In the new copies of |boost-build.jam|_ and |Jamroot|_, locate
+   the relative path near the top of the file that is clearly
+   marked by a comment, and edit that path so that it refers to the
+   same directory your Boost distribution as it referred to when
+   the file was in its original location in the
+   ``libs/python/example/quickstart/`` directory.
+
+For example, if you moved the project from
+``/home/dave/boost_1_34_0/libs/python/example/quickstart`` to
+``/home/dave/my-project``, you could change the first path in
+|boost-build.jam|_ from
+
+.. parsed-literal::
+
+  **../../../..**\ /tools/build/v2
+
+to
+
+.. parsed-literal::
+
+  **/home/dave/boost_1_34_0**\ /tools/build/v2
+
+and change the first path in |Jamroot|_ from
+
+.. parsed-literal::
+
+  **../../../..**
+
+to
+
+.. parsed-literal::
+
+  **/home/dave/boost_1_34_0**
+
+Add New or Change Names of Existing Source Files
+................................................
+
+The names of additional source files involved in building your
+extension module or embedding application can be listed in
+|Jamroot|_ right alongside ``extending.cpp`` or ``embedding.cpp``
+respectively.  Just be sure to leave whitespace around each
+filename::
+
+  … file1.cpp file2.cpp file3.cpp …
+
+Naturally, if you want to change the name of a source file you can
+tell Boost.Build about it by editing the name in |Jamroot|_.
+
+Change the Name of your Extension Module
+........................................
+
+The name of the extension module is determined by two things:
+
+1. the name in |Jamroot|_ immediately following ``python-extension``, and 
+2. the name passed to ``BOOST_PYTHON_MODULE`` in |extending.cpp|_.
+
+To change the name of the extension module from ``extending`` to
+``hello``, you'd edit |Jamroot|_, changing
+
+.. parsed-literal::
+
+  python-extension **extending** : extending.cpp ;
+
+to
+
+.. parsed-literal::
+
+  python-extension **hello** : extending.cpp ;
+
+and you'd edit extending.cpp, changing
+
+.. parsed-literal::
+
+  BOOST_PYTHON_MODULE(\ **extending**\ )
+
+to
+
+.. parsed-literal::
+
+  BOOST_PYTHON_MODULE(\ **hello**\ )
+
+Installing Boost.Python on your System
+======================================

 Since Boost.Python is a separately-compiled (as opposed to
 `header-only`_) library, its user relies on the services of a
@@ -104,25 +318,35 @@ Boost.Python library binary.

 .. _header-only: ../../../more/getting_started/windows.html#header-only-libraries

-Installing Boost.Python on your System
--------------------------------------
-
-If you need a regular, installation of the Boost.Python library
+If you need a regular installation of the Boost.Python library
 binaries on your system, the Boost `Getting Started Guide`_ will
-walk you through the steps of installing one.  If building binaries
+walk you through the steps of creating one.  If building binaries
 from source, you might want to supply the ``--with-python``
 argument to ``bjam`` (or the ``--with-libraries=python`` argument
 to ``configure``), so only the Boost.Python binary will be built,
 rather than all the Boost binaries.

+.. Admonition:: Windows Users: No Auto-Link Support
+
+  Boost.Python does not yet support the `auto-link`_ feature, so if
+  you're not using the quickstart_ method, you'll have to pay
+  attention to the names of generated libraries and add extra link
+  arguments not shown in the `Getting Started Guide`_ to select the
+  right library.
+
+.. _auto-link: ../../../more/getting_started/windows.html#link-your-program-to-a-boost-library
+
+.. _quickstart: `no-install quickstart`_
+
 Configuring Boost.Build
 =======================

 As described in the `Boost.Build reference manual`__, a file called
-``user-config.jam`` in your home
-directory [#home-dir]_ is used to
-describe the build resources available to the build system.  You'll
-need to tell it about your Python installation.
+``user-config.jam`` in your home directory [#home-dir]_ is used to
+specify the tools and libraries available to the build system. You
+may need to create or edit ``user-config.jam`` to tell Boost.Build
+how to invoke Python, ``#include`` its headers, and link with its
+libraries.

 __ http://www.boost.orgdoc/html/bbv2/advanced.html#bbv2.advanced.configuration

@@ -135,66 +359,58 @@ __ http://www.boost.orgdoc/html/bbv2/advanced.html#bbv2.advanced.configuration
   were built, your ``user-config.jam`` file is probably already
   correct.

-If you have a fairly “standard” python installation for your
-platform, there's very little you need to do to describe it.
-Simply having ::
+If you have one fairly “standard” python installation for your
+platform, you might not need to do anything special to describe it.  If
+you haven't configured python in ``user-config.jam`` (and you don't
+specify ``--without-python`` on the Boost.Build command line),
+Boost.Build will automatically execute the equivalent of ::

-  
  import toolset : using ; 
  using python ;

-in a ``user-config.jam`` file in your home directory [#home-dir]_ 
-should be enough. [#user-config.jam]_  For more complicated setups,
-see `Advanced Configuration`_.
+which automatically looks for Python in the most likely places.
+However, that only happens when using the Boost.Python project file
+(e.g. when referred to by another project as in the quickstart_
+method).  If instead you are linking against separately-compiled
+Boost.Python binaries, you should set up a ``user-config.jam`` file
+with at least the minimal incantation above.

-.. Note:: You might want to pass the ``--debug-configuration``
-   option to ``bjam`` the first few times you invoke it, to make
-   sure that Boost.Build is correctly locating all the parts of
-   your Python installation.  If it isn't, consider passing some of
-   the optional `Python configuration parameters`_ detailed below.
-
-Building an Extension Module
-============================
-
-
-Testing
-=======
-
-
-Advanced Configuration
-======================
+Python Configuration Parameters
+-------------------------------

 If you have several versions of Python installed, or Python is
 installed in an unusual way, you may want to supply any or all of
 the following optional parameters to ``using python``.

-Python Configuration Parameters
-------------------------------
-
 version
  the version of Python to use.  Should be in Major.Minor
  format, for example, ``2.3``.  Do not include the subminor
  version (i.e. *not* ``2.5.1``).  If you have multiple Python
  versions installed, the version will usually be the only
-  additional argument required.
+  configuration argument required.

 cmd-or-prefix
-  preferably, a command that invokes a Python
-  interpreter.  Alternatively, the installation prefix for Python
-  libraries and header files.  Use the alternative formulation if
-  there is no appropriate Python executable available.
+  preferably, a command that invokes a Python interpreter.
+  Alternatively, the installation prefix for Python libraries and
+  header files.  Only use the alternative formulation if there is
+  no appropriate Python executable available.

 includes
-  the ``#include`` path for Python headers. 
+  the ``#include`` paths for Python headers.  Normally the correct
+  path(s) will be automatically deduced from ``version`` and/or
+  ``cmd-or-prefix``.  

 libraries
  the path to Python library binaries.  On MacOS/Darwin,
-  you can also pass the path of the Python framework.
+  you can also pass the path of the Python framework.  Normally the
+  correct path(s) will be automatically deduced from ``version``
+  and/or ``cmd-or-prefix``. 

 condition
  if specified, should be a set of Boost.Build
  properties that are matched against the build configuration when
-  Boost.Build selects a Python configuration to use.  
+  Boost.Build selects a Python configuration to use.  See examples
+  below for details.

 extension-suffix
  A string to append to the name of extension
@@ -202,10 +418,12 @@ extension-suffix
  don't need to use this.  Usually this suffix is only used when
  targeting a Windows debug build of Python, and will be set
  automatically for you based on the value of the
-  ``<python-debugging>`` feature.  However, at least one Linux
+  |python-debugging|_ feature.  However, at least one Linux
  distribution (Ubuntu Feisty Fawn) has a specially configured
  `python-dbg`__ package that claims to use such a suffix.

+.. |python-debugging| replace:: ``<python-debugging>``
+
 __ https://wiki.ubuntu.com/PyDbgBuilds


@@ -247,6 +465,17 @@ significant.
         : <toolset>intel # condition
         ;

+
+- If you have downloaded the Python sources and built both the
+  normal and the “\ `python debugging`_\ ” builds from source on
+  Windows, you might see::
+
+    using python : 2.5 : C:\\src\\Python-2.5\\PCBuild\\python ;
+    using python : 2.5 : C:\\src\\Python-2.5\\PCBuild\\python_d
+      : # includes
+      : # libs
+      : <python-debugging>on ;
+
 - You can set up your user-config.jam so a bjam built under Windows 
  can build/test both Windows and Cygwin_ python extensions.  Just pass
  ``<target-os>cygwin`` in the ``condition`` parameter
@@ -290,7 +519,7 @@ __ http://zigzag.cs.msu.su/boost.build/wiki/AlternativeSelection
 Choosing a Boost.Python Library Binary
 ======================================

-If—instead of letting Boost.Build construct and link withthe right
+If—instead of letting Boost.Build construct and link with the right
 libraries automatically—you choose to use a pre-built Boost.Python
 library, you'll need to think about which one to link with.  The
 Boost.Python binary comes in both static and dynamic flavors.  Take
@@ -332,6 +561,64 @@ any of the following cases:
    use the types exposed by your statically-linked extension
    modules (and vice-versa).

+``#include`` Issues
+===================
+
+1. If you should ever have occasion to ``#include "python.h"``
+   directly in a translation unit of a program using Boost.Python,
+   use ``#include "boost/python/detail/wrap_python.hpp"`` instead.
+   It handles several issues necessary for use with Boost.Python,
+   one of which is mentioned in the next section.
+
+2. Be sure not to ``#include`` any system headers before
+   ``wrap_python.hpp``.  This restriction is actually imposed by
+   Python, or more properly, by Python's interaction with your
+   operating system.  See
+   http://docs.python.org/ext/simpleExample.html for details.
+
+.. _python-debugging:
+.. _python debugging:
+
+Python Debugging Builds
+=======================
+
+Python can be built in a special “python debugging” configuration
+that adds extra checks and instrumentation that can be very useful
+for developers of extension modules.  The data structures used by
+the debugging configuration contain additional members, so **a
+Python executable built with python debugging enabled cannot be
+used with an extension module or library compiled without it, and
+vice-versa.**
+
+Since pre-built “python debugging” versions of the Python
+executable and libraries are not supplied with most distributions
+of Python, [#get-debug-build]_ and we didn't want to force our users
+to build them, Boost.Build does not automatically enable python
+debugging in its ``debug`` build variant (which is the default).
+Instead there is a special build property called
+``python-debugging`` that, when used as a build property, will
+define the right preprocessor symbols and select the right
+libraries to link with.
+
+On unix-variant platforms, the debugging versions of Python's data
+structures will only be used if the symbol ``Py_DEBUG`` is defined.
+On many windows compilers, when extension modules are built with
+the preprocessor symbol ``_DEBUG``, Python defaults to force
+linking with a special debugging version of the Python DLL.  Since
+that symbol is very commonly used even when Python is not present,
+Boost.Python temporarily undefines _DEBUG when Python.h
+is #included from ``boost/python/detail/wrap_python.hpp`` - unless
+``BOOST_DEBUG_PYTHON`` is defined.  The upshot is that if you want
+“python debugging”and you aren't using Boost.Build, you should make
+sure ``BOOST_DEBUG_PYTHON`` is defined, or python debugging will be
+suppressed.
+
+Testing Boost.Python
+====================
+
+To run the full test suite for Boost.Python, invoke ``bjam`` in the
+``libs/python/test`` subdirectory of your Boost distribution.
+
 Notes for MinGW (and Cygwin with -mno-cygwin) GCC Users
 =======================================================

@@ -370,8 +657,8 @@ __ http://www.python.org/doc/current/inst/index.html
   that feature.

 .. [#toolset-specific] Because of the way most \*nix platforms
-   share symbols among dynamically-loaded objects, I'm not
-   certainextension modules built with different compiler toolsets
+   share symbols among dynamically-loaded objects, I'm not certain
+   that extension modules built with different compiler toolsets
   will always use different copies of the Boost.Python library
   when loaded into the same Python instance.  Not using different
   libraries could be a good thing if the compilers have compatible
@@ -391,14 +678,17 @@ __ http://www.python.org/doc/current/inst/index.html
   toolset, and you might need handle both explicitly if you also
   have a MinGW GCC installed.

-.. [#user-config.jam] Create the ``user-config.jam`` file if you don't
-   already have one.  
-
 .. [#home-dir] Windows users, your home directory can be
   found by typing::

     ECHO %HOMEDRIVE%%HOMEPATH%

-   into a `Windows command prompt`__
+   into a `command prompt`_ window.

-__ ../../../more/getting_started/windows.html#or-build-from-the-command-prompt
+.. [#get-debug-build] On Unix and similar platforms, a debugging
+   python and associated libraries are built by adding
+   ``--with-pydebug`` when configuring the Python build. On
+   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
@@ -147,7 +147,9 @@

      <dt><a href="v2/faq.html">Frequently Asked Questions (FAQs)</a></dt>
      
-      <dt><a href="../pyste/index.html">Pyste (Boost.Python code generator)</a></dt>
+      <dt><a href="http://www.language-binding.net/pyplusplus/pyplusplus.html">Py++ Boost.Python code generator</a></dt>
+
+      <dt><a href="../pyste/index.html">Pyste Boost.Python code generator (no longer maintained)</a></dt>

      <dt><a href="internals.html">Internals Documentation</a></dt>

--- a/doc/tutorial/doc/html/index.html
+++ b/doc/tutorial/doc/html/index.html
@@ -1,11 +1,14 @@
+<!-- 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">
 <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">
+<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%">
@@ -31,7 +34,7 @@
 <div><p class="copyright">Copyright © 2002-2005 Joel
      de Guzman, David Abrahams</p></div>
 <div><div class="legalnotice">
-<a name="id2632684"></a><p>
+<a name="id376848"></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 +96,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="id2595112"></a>
+<a name="quickstart.hello_world"></a><h2>
+<a name="id447173"></a>
      Hello World
-    </h3>
+    </h2>
 <p>
      Following C/C++ tradition, let's start with the "hello, world". A
      C++ Function:
@@ -132,20 +135,14 @@
 </pre>
 <p>
    </p>
-<div class="blockquote"><blockquote class="blockquote">
-<p>
-        </p>
-<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>
-<p>
-      </p>
-</blockquote></div>
+<div class="blockquote"><blockquote class="blockquote"><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></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:46:01 GMT</p></small></td>
+<td align="left"><small><p>Last revised: August 31, 2006 at 05:59:58 GMT</p></small></td>
 <td align="right"><small></small></td>
 </tr></table>
 <hr>
--- a/doc/tutorial/doc/html/python/embedding.html
+++ b/doc/tutorial/doc/html/python/embedding.html
@@ -1,12 +1,15 @@
+<!-- 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">
 <title>Embedding</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<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">
@@ -39,28 +42,30 @@
      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="id2654982"></a>
+<a name="embedding.building_embedded_programs"></a><h2>
+<a name="id462650"></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.
+      To be able to use embedding in your programs, they have to be linked to both
+      Boost.Python's and Python's static link 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
-      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.
+      Boost.Python's static link library comes in two variants. Both are located
+      in Boost's <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 static link 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,171 +86,295 @@ 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="id2655076"></a>
+<a name="embedding.getting_started"></a><h2>
+<a name="id462747"></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><br><br>
 </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>
+        to start the interpreter and create the <tt class="literal"><span class="underline">_main</span>_</tt>
        module.<br><br>
 </li>
 <li>
        Call other Python C API routines to use the interpreter.<br><br>
 </li>
+<li>
+        Call <a href="http://www.python.org/doc/current/api/initialization.html#l2h-656" target="_top">Py_Finalize</a>()
+        to stop the interpreter and release its resources.
+      </li>
 </ol></div>
-<div class="sidebar">
-<p class="title"><b></b></p>
-<p>
-      <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>
-    </p>
-</div>
 <p>
      (Of course, there can be other C++ code between all of these steps.)
    </p>
-<div class="blockquote"><blockquote class="blockquote">
-<p>
-        </p>
-<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>
-<p>
-      </p>
-</blockquote></div>
+<div class="blockquote"><blockquote class="blockquote"><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></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<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
+        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
        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="id2655255"></a>
-        Running Python code
-      </h3>
+<a name="using_the_interpreter.reference_counting_handles_and_objects"></a><h2>
+<a name="id462914"></a>
+        Reference-counting handles and objects
+      </h2>
 <p>
-        Boost.python provides three related functions to run Python code from C++.
+        There are two ways in which a function in the Python/C API can return a
+        <tt class="literal">PyObject*</tt>: as a <span class="emphasis"><em>borrowed reference</em></span>
+        or as a <span class="emphasis"><em>new reference</em></span>. Which of these a function uses,
+        is listed in that function's documentation. The two require slightely different
+        approaches to reference-counting but both can be 'handled' by Boost.Python.
+      </p>
+<p>
+        For a function returning a <span class="emphasis"><em>borrowed reference</em></span> we'll
+        have to tell the <tt class="literal">handle</tt> that the <tt class="literal">PyObject*</tt>
+        is borrowed with the aptly named <a href="../../../../v2/handle.html#borrowed-spec" target="_top">borrowed</a>
+        function. Two functions returning borrowed references are <a href="http://www.python.org/doc/current/api/importing.html#l2h-125" target="_top">PyImport_AddModule</a>
+        and <a href="http://www.python.org/doc/current/api/moduleObjects.html#l2h-594" target="_top">PyModule_GetDict</a>.
+        The former returns a reference to an already imported module, the latter
+        retrieves a module's namespace dictionary. Let's use them to retrieve the
+        namespace of the <tt class="literal"><span class="underline">_main</span>_</tt>
+        module:
      </p>
 <pre class="programlisting">
-<span class="identifier">object</span> <span class="identifier">eval</span><span class="special">(</span><span class="identifier">str</span> <span class="identifier">expression</span><span class="special">,</span> <span class="identifier">object</span> <span class="identifier">globals</span> <span class="special">=</span> <span class="identifier">object</span><span class="special">(),</span> <span class="identifier">object</span> <span class="identifier">locals</span> <span class="special">=</span> <span class="identifier">object</span><span class="special">())</span>
-<span class="identifier">object</span> <span class="identifier">exec</span><span class="special">(</span><span class="identifier">str</span> <span class="identifier">code</span><span class="special">,</span> <span class="identifier">object</span> <span class="identifier">globals</span> <span class="special">=</span> <span class="identifier">object</span><span class="special">(),</span> <span class="identifier">object</span> <span class="identifier">locals</span> <span class="special">=</span> <span class="identifier">object</span><span class="special">())</span>
-<span class="identifier">object</span> <span class="identifier">exec_file</span><span class="special">(</span><span class="identifier">str</span> <span class="identifier">filename</span><span class="special">,</span> <span class="identifier">object</span> <span class="identifier">globals</span> <span class="special">=</span> <span class="identifier">object</span><span class="special">(),</span> <span class="identifier">object</span> <span class="identifier">locals</span> <span class="special">=</span> <span class="identifier">object</span><span class="special">())</span>
+<span class="identifier">object</span> <span class="identifier">main_module</span><span class="special">((</span>
+    <span class="identifier">handle</span><span class="special">&lt;&gt;(</span><span class="identifier">borrowed</span><span class="special">(</span><a href="http://www.python.org/doc/current/api/importing.html#l2h-125" target="_top">PyImport_AddModule</a><span class="special">(</span><span class="string">"__main__"</span><span class="special">)))));</span>
+
+<span class="identifier">object</span> <span class="identifier">main_namespace</span> <span class="special">=</span> <span class="identifier">main_module</span><span class="special">.</span><span class="identifier">attr</span><span class="special">(</span><span class="string">"__dict__"</span><span class="special">);</span>
 </pre>
 <p>
-        eval evaluates the given expression and returns the resulting value. exec
-        executes the given code (typically a set of statements) returning the result,
-        and exec_file executes the code contained in the given file.
+        For a function returning a <span class="emphasis"><em>new reference</em></span> we can just
+        create a <tt class="literal">handle</tt> out of the raw <tt class="literal">PyObject*</tt>
+        without wrapping it in a call to borrowed. One such function that returns
+        a new reference is <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55" target="_top">PyRun_String</a>
+        which we'll discuss in the next section.
+      </p>
+<p class="blurb">
+        <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> <span class="bold"><b>Handle is a class <span class="emphasis"><em>template</em></span>,
+        so why haven't we been using any template parameters?</b></span><br> <br>
+        <tt class="literal">handle</tt> has a single template parameter specifying the
+        type of the managed object. This type is <tt class="literal">PyObject</tt> 99%
+        of the time, so the parameter was defaulted to <tt class="literal">PyObject</tt>
+        for convenience. Therefore we can use the shorthand <tt class="literal">handle&lt;&gt;</tt>
+        instead of the longer, but equivalent, <tt class="literal">handle&lt;PyObject&gt;</tt>.
+      </p>
+<a name="using_the_interpreter.running_python_code"></a><h2>
+<a name="id463241"></a>
+        Running Python code
+      </h2>
+<p>
+        To run Python code from C++ there is a family of functions in the API starting
+        with the PyRun prefix. You can find the full list of these functions <a href="http://www.python.org/doc/current/api/veryhigh.html" target="_top">here</a>. They
+        all work similarly so we will look at only one of them, namely:
+      </p>
+<pre class="programlisting">
+<span class="identifier">PyObject</span><span class="special">*</span> <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55" target="_top">PyRun_String</a><span class="special">(</span><span class="keyword">char</span> <span class="special">*</span><span class="identifier">str</span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">start</span><span class="special">,</span> <span class="identifier">PyObject</span> <span class="special">*</span><span class="identifier">globals</span><span class="special">,</span> <span class="identifier">PyObject</span> <span class="special">*</span><span class="identifier">locals</span><span class="special">)</span>
+</pre>
+<p>
+        <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55" target="_top">PyRun_String</a>
+        takes the code to execute as a null-terminated (C-style) string in its <tt class="literal">str</tt>
+        parameter. The function returns a new reference to a Python object. Which
+        object is returned depends on the <tt class="literal">start</tt> paramater.
      </p>
 <p>
-        The <code class="literal">globals</code> and <code class="literal">locals</code> 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>
+        The <tt class="literal">start</tt> parameter is the start symbol from the Python
+        grammar to use for interpreting the code. The possible values are:
+      </p>
+<div class="informaltable">
+<h4>
+<a name="id463420"></a>
+          <span class="table-title">Start symbols</span>
+        </h4>
+<table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th><a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-58" target="_top">Py_eval_input</a></th>
+<th>for
+              interpreting isolated expressions</th>
+</tr></thead>
+<tbody>
+<tr>
+<td><a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-59" target="_top">Py_file_input</a></td>
+<td>for
+              interpreting sequences of statements</td>
+</tr>
+<tr>
+<td><a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-60" target="_top">Py_single_input</a></td>
+<td>for
+              interpreting a single statement</td>
+</tr>
+</tbody>
+</table>
+</div>
+<p>
+        When using <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-58" target="_top">Py_eval_input</a>,
+        the input string must contain a single expression and its result is returned.
+        When using <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-59" target="_top">Py_file_input</a>,
+        the string can contain an abitrary number of statements and None is returned.
+        <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-60" target="_top">Py_single_input</a>
+        works in the same way as <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-59" target="_top">Py_file_input</a>
+        but only accepts a single statement.
+      </p>
+<p>
+        Lastly, 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 <tt class="literal"><span class="underline">_main</span>_</tt>
        module for both parameters.
      </p>
 <p>
-        Boost.python provides a function to import a module:
+        We have already seen how to get the <tt class="literal"><span class="underline">_main</span>_</tt>
+        module's namespace so let's run some Python code in it:
      </p>
 <pre class="programlisting">
-<span class="identifier">object</span> <span class="identifier">import</span><span class="special">(</span><span class="identifier">str</span> <span class="identifier">name</span><span class="special">)</span>
-</pre>
-<p>
-        import imports a python module (potentially loading it into the running process
-        first), and returns it.
-      </p>
-<p>
-        Let's import the <code class="literal"><span class="underline">_main</span>_</code>
-        module and run some Python code in its namespace:
-      </p>
-<pre class="programlisting">
-<span class="identifier">object</span> <span class="identifier">main_module</span> <span class="special">=</span> <span class="identifier">import</span><span class="special">(</span><span class="string">"__main__"</span><span class="special">);</span>
+<span class="identifier">object</span> <span class="identifier">main_module</span><span class="special">((</span>
+    <span class="identifier">handle</span><span class="special">&lt;&gt;(</span><span class="identifier">borrowed</span><span class="special">(</span><a href="http://www.python.org/doc/current/api/importing.html#l2h-125" target="_top">PyImport_AddModule</a><span class="special">(</span><span class="string">"__main__"</span><span class="special">)))));</span>
+
 <span class="identifier">object</span> <span class="identifier">main_namespace</span> <span class="special">=</span> <span class="identifier">main_module</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="identifier">object</span> <span class="identifier">ignored</span> <span class="special">=</span> <span class="identifier">exec</span><span class="special">(</span><span class="string">"hello = file('hello.txt', 'w')\n"</span>
-                      <span class="string">"hello.write('Hello world!')\n"</span>
-                      <span class="string">"hello.close()"</span><span class="special">,</span>
-                      <span class="identifier">main_namespace</span><span class="special">);</span>
+<span class="identifier">handle</span><span class="special">&lt;&gt;</span> <span class="identifier">ignored</span><span class="special">((</span><a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55" target="_top">PyRun_String</a><span class="special">(</span>
+
+    <span class="string">"hello = file('hello.txt', 'w')\n"</span>
+    <span class="string">"hello.write('Hello world!')\n"</span>
+    <span class="string">"hello.close()"</span>
+
+  <span class="special">,</span> <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-59" target="_top">Py_file_input</a>
+  <span class="special">,</span> <span class="identifier">main_namespace</span><span class="special">.</span><span class="identifier">ptr</span><span class="special">()</span>
+  <span class="special">,</span> <span class="identifier">main_namespace</span><span class="special">.</span><span class="identifier">ptr</span><span class="special">())</span>
+<span class="special">));</span>
 </pre>
+<p>
+        Because the Python/C API doesn't know anything about <tt class="literal">object</tt>s,
+        we used the object's <tt class="literal">ptr</tt> member function to retrieve the
+        <tt class="literal">PyObject*</tt>.
+      </p>
 <p>
        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="id2655783"></a>
-        Manipulating Python objects
-      </h3>
+<p class="blurb">
+        <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> <span class="bold"><b>Note</b></span> that we wrap
+        the return value of <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55" target="_top">PyRun_String</a>
+        in a (nameless) <tt class="literal">handle</tt> even though we are not interested
+        in it. If we didn't do this, the the returned object would be kept alive
+        unnecessarily. Unless you want to be a Dr. Frankenstein, always wrap <tt class="literal">PyObject*</tt>s
+        in <tt class="literal">handle</tt>s.
+      </p>
+<a name="using_the_interpreter.beyond_handles"></a><h2>
+<a name="id463926"></a>
+        Beyond handles
+      </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>.
+        It's nice that <tt class="literal">handle</tt> manages the reference counting details
+        for us, but other than that it doesn't do much. Often we'd like to have a
+        more useful 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 <tt class="literal">object</tt> class and it's 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">
-<span class="identifier">object</span> <span class="identifier">main_module</span> <span class="special">=</span> <span class="identifier">import</span><span class="special">(</span><span class="string">"__main__"</span><span class="special">);</span>
+<span class="identifier">object</span> <span class="identifier">main_module</span><span class="special">((</span>
+     <span class="identifier">handle</span><span class="special">&lt;&gt;(</span><span class="identifier">borrowed</span><span class="special">(</span><a href="http://www.python.org/doc/current/api/importing.html#l2h-125" target="_top">PyImport_AddModule</a><span class="special">(</span><span class="string">"__main__"</span><span class="special">)))));</span>
+
 <span class="identifier">object</span> <span class="identifier">main_namespace</span> <span class="special">=</span> <span class="identifier">main_module</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="identifier">object</span> <span class="identifier">ignored</span> <span class="special">=</span> <span class="identifier">exec</span><span class="special">(</span><span class="string">"result = 5 ** 2"</span><span class="special">,</span> <span class="identifier">main_namespace</span><span class="special">);</span>
+
+<span class="identifier">handle</span><span class="special">&lt;&gt;</span> <span class="identifier">ignored</span><span class="special">((</span><a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55" target="_top">PyRun_String</a><span class="special">(</span>
+
+    <span class="string">"result = 5 ** 2"</span>
+
+    <span class="special">,</span> <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-59" target="_top">Py_file_input</a>
+    <span class="special">,</span> <span class="identifier">main_namespace</span><span class="special">.</span><span class="identifier">ptr</span><span class="special">()</span>
+    <span class="special">,</span> <span class="identifier">main_namespace</span><span class="special">.</span><span class="identifier">ptr</span><span class="special">())</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">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:
+        is to let <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55" target="_top">PyRun_String</a>
+        return the result directly with <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-58" target="_top">Py_eval_input</a>:
      </p>
 <pre class="programlisting">
-<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="identifier">object</span> <span class="identifier">result</span><span class="special">((</span><span class="identifier">handle</span><span class="special">&lt;&gt;(</span>
+    <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55" target="_top">PyRun_String</a><span class="special">(</span><span class="string">"5 ** 2"</span>
+        <span class="special">,</span> <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-58" target="_top">Py_eval_input</a>
+        <span class="special">,</span> <span class="identifier">main_namespace</span><span class="special">.</span><span class="identifier">ptr</span><span class="special">()</span>
+        <span class="special">,</span> <span class="identifier">main_namespace</span><span class="special">.</span><span class="identifier">ptr</span><span class="special">()))</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="id2656116"></a>
+<p class="blurb">
+        <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> <span class="bold"><b>Note</b></span> that <tt class="literal">object</tt>'s
+        member function to return the wrapped <tt class="literal">PyObject*</tt> is called
+        <tt class="literal">ptr</tt> instead of <tt class="literal">get</tt>. This makes sense
+        if you take into account the different functions that <tt class="literal">object</tt>
+        and <tt class="literal">handle</tt> perform.
+      </p>
+<a name="using_the_interpreter.exception_handling"></a><h2>
+<a name="id464549"></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:
+        If an exception occurs in the execution of some Python code, the <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55" target="_top">PyRun_String</a>
+        function returns a null pointer. Constructing a <tt class="literal">handle</tt>
+        out of this null pointer throws <a href="../../../../v2/errors.html#error_already_set-spec" target="_top">error_already_set</a>,
+        so basically, the Python exception is automatically translated into a C++
+        exception when using <tt class="literal">handle</tt>:
      </p>
 <pre class="programlisting">
 <span class="keyword">try</span>
 <span class="special">{</span>
-    <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/0"</span><span class="special">);</span>
+    <span class="identifier">object</span> <span class="identifier">result</span><span class="special">((</span><span class="identifier">handle</span><span class="special">&lt;&gt;(</span><a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55" target="_top">PyRun_String</a><span class="special">(</span>
+        <span class="string">"5/0"</span>
+      <span class="special">,</span> <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-58" target="_top">Py_eval_input</a>
+      <span class="special">,</span> <span class="identifier">main_namespace</span><span class="special">.</span><span class="identifier">ptr</span><span class="special">()</span>
+      <span class="special">,</span> <span class="identifier">main_namespace</span><span class="special">.</span><span class="identifier">ptr</span><span class="special">()))</span>
+    <span class="special">));</span>
+
    <span class="comment">// execution will never get here:
 </span>    <span class="keyword">int</span> <span class="identifier">five_divided_by_zero</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>
 <span class="special">}</span>
-<span class="keyword">catch</span><span class="special">(</span><span class="identifier">error_already_set</span> <span class="keyword">const</span> <span class="special">&amp;)</span>
+<span class="keyword">catch</span><span class="special">(</span><span class="identifier">error_already_set</span><span class="special">)</span>
 <span class="special">{</span>
    <span class="comment">// handle the exception in some way
 </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<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
+        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
        exceptions</a>:
      </p>
 <pre class="programlisting">
-<span class="keyword">catch</span><span class="special">(</span><span class="identifier">error_already_set</span> <span class="keyword">const</span> <span class="special">&amp;)</span>
+<span class="keyword">catch</span><span class="special">(</span><span class="identifier">error_already_set</span><span class="special">)</span>
 <span class="special">{</span>
    <span class="keyword">if</span> <span class="special">(</span><span class="identifier">PyErr_ExceptionMatches</span><span class="special">(</span><span class="identifier">PyExc_ZeroDivisionError</span><span class="special">))</span>
    <span class="special">{</span>
@@ -262,6 +391,23 @@ exe embedded_program # name of the executable
        (To retrieve even more information from the exception you can use some of
        the other exception handling functions listed <a href="http://www.python.org/doc/api/exceptionHandling.html" target="_top">here</a>.)
      </p>
+<p>
+        If you'd rather not have <tt class="literal">handle</tt> throw a C++ exception
+        when it is constructed, you can use the <a href="../../../../v2/handle.html#allow_null-spec" target="_top">allow_null</a>
+        function in the same way you'd use borrowed:
+      </p>
+<pre class="programlisting">
+<span class="identifier">handle</span><span class="special">&lt;&gt;</span> <span class="identifier">result</span><span class="special">((</span><span class="identifier">allow_null</span><span class="special">(</span><a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55" target="_top">PyRun_String</a><span class="special">(</span>
+    <span class="string">"5/0"</span>
+   <span class="special">,</span> <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-58" target="_top">Py_eval_input</a>
+   <span class="special">,</span> <span class="identifier">main_namespace</span><span class="special">.</span><span class="identifier">ptr</span><span class="special">()</span>
+   <span class="special">,</span> <span class="identifier">main_namespace</span><span class="special">.</span><span class="identifier">ptr</span><span class="special">()))));</span>
+
+<span class="keyword">if</span> <span class="special">(!</span><span class="identifier">result</span><span class="special">)</span>
+    <span class="comment">// Python exception occurred
+</span><span class="keyword">else</span>
+    <span class="comment">// everything went okay, it's safe to use the result
+</span></pre>
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
--- a/doc/tutorial/doc/html/python/exception.html
+++ b/doc/tutorial/doc/html/python/exception.html
@@ -1,13 +1,16 @@
+<!-- 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">
-<title>Exception Translation</title>
+<title> Exception Translation</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<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%">
--- a/doc/tutorial/doc/html/python/exposing.html
+++ b/doc/tutorial/doc/html/python/exposing.html
@@ -1,12 +1,15 @@
+<!-- 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">
-<title>Exposing Classes</title>
+<title> Exposing Classes</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<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">
@@ -64,9 +67,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 +85,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 +109,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 +127,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 +145,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 +161,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 +173,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 +194,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 +227,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 +248,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 +276,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 +285,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 +293,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 +310,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 shall 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,11 +326,11 @@
 <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
+        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 shall see more of Boost.Python <a href="functions.html#python.call_policies" title="Call Policies">call
        policies</a> later.
      </p>
@@ -343,7 +346,7 @@
 <p>
        In this section, we shall 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 +359,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,25 +377,21 @@
 <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="sidebar">
-<p class="title"><b></b></p>
-<p>
-        <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>.
-      </p>
-</div>
-<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>.
+<p class="blurb">
+        <span class="inlinemediaobject"><img src="../images/alert.png" alt="alert"></span> <span class="bold"><b>MSVC6/7 Workaround</b></span><br>
+        <br> If you are using Microsoft Visual C++ 6 or 7, you have to write <tt class="computeroutput"><span class="identifier">f</span></tt> as:<br> <br> <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>
 <p>
-        Finally, exposing <code class="computeroutput"><span class="identifier">Base</span></code>:
+        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>
@@ -400,25 +399,22 @@
    <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="sidebar">
-<p class="title"><b></b></p>
-<p>
-        <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>
+<p class="blurb">
+        <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> <span class="bold"><b>member function and methods</b></span><br>
+        <br> 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>
 </div>
-</div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="python.virtual_functions_with_default_implementations"></a>Virtual Functions with Default Implementations</h3></div></div></div>
 <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 +429,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,19 +456,15 @@
 <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="sidebar">
-<p class="title"><b></b></p>
-<p>
-        <span class="inlinemediaobject"><img src="../images/alert.png" alt="alert"></span> <span class="bold"><strong>MSVC6/7 Workaround</strong></span><br>
+<p class="blurb">
+        <span class="inlinemediaobject"><img src="../images/alert.png" alt="alert"></span> <span class="bold"><b>MSVC6/7 Workaround</b></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>.
+        the line with the <tt class="computeroutput"><span class="special">*</span><span class="identifier">note</span><span class="special">*</span></tt> as:<br> <br> <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>
@@ -482,10 +474,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:
@@ -501,14 +493,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>
@@ -518,17 +510,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="id2646169"></a>
+<a name="class_operators_special_functions.python_operators"></a><h2>
+<a name="id453009"></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>
@@ -561,16 +553,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="id2646853"></a>
+<a name="class_operators_special_functions.special_methods"></a><h2>
+<a name="id453761"></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
@@ -596,17 +588,14 @@
 <p>
        Need we say more?
      </p>
-<div class="sidebar">
-<p class="title"><b></b></p>
-<p>
-        <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>.
+<p class="blurb">
+        <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> 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>
 </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
--- a/doc/tutorial/doc/html/python/functions.html
+++ b/doc/tutorial/doc/html/python/functions.html
@@ -1,13 +1,16 @@
+<!-- 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">
 <title>Functions</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<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%">
@@ -38,18 +41,12 @@
      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>
-        </p>
-<p>
-          <span class="emphasis"><em>Read on...</em></span>
-        </p>
-<p>
-      </p>
-</blockquote></div>
+<div class="blockquote"><blockquote class="blockquote"><p>
+        <span class="emphasis"><em>Read on...</em></span>
+      </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
@@ -68,7 +65,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!
@@ -96,9 +93,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="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">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">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="preprocessor"># 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="identifier">CRASH</span><span class="special">!</span>
 </pre>
 <p>
        What's the problem?
@@ -126,19 +123,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:
@@ -168,16 +165,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="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>
+<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>
 </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>
@@ -191,33 +188,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="id2648560"></a>
+<a name="call_policies.call_policies"></a><h2>
+<a name="id455614"></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">
@@ -226,27 +223,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
@@ -263,45 +260,42 @@ 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><br> Ties lifetimes
          of the arguments
        </li>
 <li>
-<span class="bold"><strong>with_custodian_and_ward_postcall</strong></span><br>
+<span class="bold"><b>with_custodian_and_ward_postcall</b></span><br>
          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><br> 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>
+<span class="bold"><b>return_value_policy&lt;T&gt; with T one of:</b></span><br>
 </li>
 <li>
-<span class="bold"><strong>reference_existing_object</strong></span><br> naive
+<span class="bold"><b>reference_existing_object</b></span><br> naive
          (dangerous) approach
        </li>
 <li>
-<span class="bold"><strong>copy_const_reference</strong></span><br> Boost.Python
+<span class="bold"><b>copy_const_reference</b></span><br> Boost.Python
          v1 approach
        </li>
 <li>
-<span class="bold"><strong>copy_non_const_reference</strong></span><br>
+<span class="bold"><b>copy_non_const_reference</b></span><br>
 </li>
 <li>
-<span class="bold"><strong>manage_new_object</strong></span><br> Adopt a pointer
+<span class="bold"><b>manage_new_object</b></span><br> Adopt a pointer
          and hold the instance
        </li>
 </ul></div>
-<div class="sidebar">
-<p class="title"><b></b></p>
-<p>
-        <span class="inlinemediaobject"><img src="../images/smiley.png" alt="smiley"></span> <span class="bold"><strong>Remember the Zen, Luke:</strong></span><br>
+<p class="blurb">
+        <span class="inlinemediaobject"><img src="../images/smiley.png" alt="smiley"></span> <span class="bold"><b>Remember the Zen, Luke:</b></span><br>
        <br> "Explicit is better than implicit"<br> "In the face
        of ambiguity, refuse the temptation to guess"<br>
      </p>
 </div>
-</div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="python.overloading"></a>Overloading</h3></div></div></div>
@@ -362,21 +356,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">
@@ -410,10 +404,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="id2650414"></a>
+<a name="default_arguments.boost_python_function_overloads"></a><h2>
+<a name="id457647"></a>
        BOOST_PYTHON_FUNCTION_OVERLOADS
-      </h3>
+      </h2>
 <p>
        Boost.Python now has a way to make it easier. For instance, given a function:
      </p>
@@ -431,19 +425,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="id2650701"></a>
+<a name="default_arguments.boost_python_member_function_overloads"></a><h2>
+<a name="id457963"></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
@@ -452,7 +446,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>
@@ -473,11 +467,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>
@@ -486,13 +480,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="id2651031"></a>
+<a name="default_arguments.init_and_optional"></a><h2>
+<a name="id458323"></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">
@@ -509,7 +503,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>
@@ -517,8 +511,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>
@@ -560,24 +554,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="id2651734"></a>
+<a name="auto_overloading.manual_wrapping"></a><h2>
+<a name="id459095"></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">
--- a/doc/tutorial/doc/html/python/hello.html
+++ b/doc/tutorial/doc/html/python/hello.html
@@ -1,13 +1,16 @@
+<!-- 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">
-<title>Building Hello World</title>
+<title> Building Hello World</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<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%">
@@ -25,29 +28,26 @@
 <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="id2595436"></a>
+<a name="hello.from_start_to_finish"></a><h2>
+<a name="id377427"></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>.
+      every boost distribution: <span class="bold"><b>bjam</b></span>.
    </p>
-<div class="sidebar">
-<p class="title"><b></b></p>
-<p>
-      <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> <span class="bold"><strong>Building without bjam</strong></span><br>
+<p class="blurb">
+      <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> <span class="bold"><b>Building without bjam</b></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>
+      There are of course other build tools apart from <tt class="literal">bjam</tt>.<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.
    </p>
-</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
@@ -78,7 +78,7 @@
      if you are on Unix.
    </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">
@@ -90,20 +90,20 @@
      </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
+      The <tt class="literal">hello.cpp</tt> file is our C++ hello world example. The
+      <tt class="literal">Jamfile</tt> is a minimalist <span class="emphasis"><em>bjam</em></span> script
      that builds the DLLs for us.
    </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="id2595623"></a>
+<a name="hello.let_s_jam_"></a><h2>
+<a name="id377613"></a>
      Let's Jam!
-    </h3>
+    </h2>
 <p>
      <span class="inlinemediaobject"><img src="../images/jam.png" alt="jam"></span>
    </p>
@@ -123,13 +123,13 @@ extension hello                     # Declare a Python extension called hello
 </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.
+      <tt class="literal">project-root</tt> 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
+      and tweak the <tt class="literal">path-global BOOST_ROOT</tt> to where your boost
      root directory is. The file has <a href="../../../../../example/tutorial/Jamrules" target="_top">detailed
      instructions</a> you can follow.
    </p>
@@ -139,7 +139,7 @@ extension hello                     # Declare a Python extension called hello
 <pre class="programlisting">import python ;
 </pre>
 <p>
-      Finally we declare our <code class="literal">hello</code> extension:
+      Finally we declare our <tt class="literal">hello</tt> extension:
    </p>
 <pre class="programlisting">extension hello                     # Declare a Python extension called hello
 :   hello.cpp                       # source
@@ -151,26 +151,20 @@ extension hello                     # Declare a Python extension called hello
 <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="id2595752"></a>
+<a name="hello.running_bjam"></a><h2>
+<a name="id377751"></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>
-        </p>
-<p>
-          Start it up.
-        </p>
-<p>
-      </p>
-</blockquote></div>
+<div class="blockquote"><blockquote class="blockquote"><p>
+        Start it up.
+      </p></blockquote></div>
 <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
+      With MSVC, that would mean running the <tt class="literal">Vcvars32.bat</tt> batch
      file. For instance:
    </p>
 <pre class="programlisting">C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat
@@ -183,24 +177,21 @@ extension hello                     # Declare a Python extension called hello
 set PYTHON_VERSION=2.2
 </pre>
 <p>
-      The above assumes that the Python installation is in <code class="literal">c:/dev/tools/python</code>
+      The above assumes that the Python installation is in <tt class="literal">c:/dev/tools/python</tt>
      and that we are using Python version 2.2. You'll have to tweak these appropriately.
    </p>
-<div class="sidebar">
-<p class="title"><b></b></p>
-<p>
-      <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
+<p 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"><b>not</b></span> "2.2.1", even if that's the version you
      have.
    </p>
-</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.
    </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">"Jamfile"</tt>
      is situated.
    </p>
 <p>
@@ -263,8 +254,8 @@ b and object bin\tutorial\hello.pyd\vc-7_1\debug\threading-multi\hello.exp
      if you are on Unix.
    </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
+      <tt class="literal">boost_python.dll</tt> and <tt class="literal">hello.pyd</tt> can be
+      found somewhere in your project's <tt class="literal">bin</tt> 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
@@ -282,15 +273,9 @@ b and object bin\tutorial\hello.pyd\vc-7_1\debug\threading-multi\hello.exp
 </pre>
 <p>
    </p>
-<div class="blockquote"><blockquote class="blockquote">
-<p>
-        </p>
-<p>
-          <span class="bold"><strong>There you go... Have fun!</strong></span>
-        </p>
-<p>
-      </p>
-</blockquote></div>
+<div class="blockquote"><blockquote class="blockquote"><p>
+        <span class="bold"><b>There you go... Have fun!</b></span>
+      </p></blockquote></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
--- a/doc/tutorial/doc/html/python/iterators.html
+++ b/doc/tutorial/doc/html/python/iterators.html
@@ -1,13 +1,16 @@
+<!-- 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">
 <title>Iterators</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<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%">
@@ -30,7 +33,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 +48,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 +62,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 +77,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 +94,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 +122,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 +155,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 +181,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>
--- a/doc/tutorial/doc/html/python/object.html
+++ b/doc/tutorial/doc/html/python/object.html
@@ -1,9 +1,12 @@
+<!-- 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">
-<title>Object Interface</title>
+<title> Object Interface</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<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">
@@ -35,13 +38,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 shall 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 +54,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 +102,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 +126,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,18 +175,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="sidebar">
-<p class="title"><b></b></p>
-<p>
-        <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.
+<p class="blurb">
+        <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>
@@ -198,12 +198,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="id2653534"></a>
+<a name="derived_object_types.class__lt_t_gt__as_objects"></a><h2>
+<a name="id461067"></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>
@@ -225,15 +225,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">
@@ -243,14 +243,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>
@@ -260,7 +260,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">
@@ -273,8 +273,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:
@@ -293,19 +293,16 @@
 </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="sidebar">
-<p class="title"><b></b></p>
-<p>
-        <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> <span class="bold"><strong>what is a scope?</strong></span><br>
+<p class="blurb">
+        <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> <span class="bold"><b>what is a scope?</b></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>.
      </p>
-</div>
 <p>
        You can access those values in Python as
      </p>
--- a/doc/tutorial/doc/html/python/techniques.html
+++ b/doc/tutorial/doc/html/python/techniques.html
@@ -1,12 +1,15 @@
+<!-- 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">
-<title>General Techniques</title>
+<title> General Techniques</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<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%">
@@ -50,7 +53,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,18 +96,15 @@
 <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="sidebar">
-<p class="title"><b></b></p>
-<p>
-        <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> The extension <code class="literal">.pyd</code> is used for python
+<p class="blurb">
+        <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> 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 <code class="literal">.so</code> for Unix and <code class="literal">.dll</code>
+        your system, like <tt class="literal">.so</tt> for Unix and <tt class="literal">.dll</tt>
        for Windows, works just as well.
      </p>
-</div>
 <p>
        Now, we create this directory structure for our Python package:
      </p>
@@ -115,12 +115,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>
@@ -159,7 +159,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>
@@ -167,12 +167,12 @@
    __init__.py
    core/
        __init__.py
-        <span class="underline">core.pyd
+        _core.pyd
    filters/
-        \</span>_init__.py
-        <span class="underline">filters.pyd
+        __init__.py
+        _filters.pyd
    io/
-        \</span>_init__.py
+        __init__.py
        _io.pyd
 </pre>
 <p>
@@ -187,11 +187,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>
@@ -208,10 +208,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">
@@ -222,14 +222,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>
@@ -263,7 +263,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>
@@ -277,7 +277,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>
@@ -292,7 +292,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">
@@ -391,7 +391,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">
@@ -427,17 +427,12 @@
        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="sidebar">
-<p class="title"><b></b></p>
-<p>
+<p 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
+        take a look at the <tt class="literal">--multiple</tt> option, that generates the
        wrappers in various files as demonstrated here.
      </p>
-</div>
-<div class="sidebar">
-<p class="title"><b></b></p>
-<p>
+<p 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
@@ -445,7 +440,6 @@
      </p>
 </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
--- a/doc/tutorial/doc/tutorial.qbk
+++ b/doc/tutorial/doc/tutorial.qbk
@@ -1365,6 +1365,11 @@ create a new scope around a class:

 [def Py_Initialize          [@http://www.python.org/doc/current/api/initialization.html#l2h-652  Py_Initialize]]
 [def Py_Finalize            [@http://www.python.org/doc/current/api/initialization.html#l2h-656  Py_Finalize]]
+[def PyRun_String           [@http://www.python.org/doc/current/api/veryhigh.html#l2h-55         PyRun_String]]
+[def PyRun_File             [@http://www.python.org/doc/current/api/veryhigh.html#l2h-56         PyRun_File]]
+[def Py_eval_input          [@http://www.python.org/doc/current/api/veryhigh.html#l2h-58         Py_eval_input]]
+[def Py_file_input          [@http://www.python.org/doc/current/api/veryhigh.html#l2h-59         Py_file_input]]
+[def Py_single_input        [@http://www.python.org/doc/current/api/veryhigh.html#l2h-60         Py_single_input]]
 [def Py_XINCREF             [@http://www.python.org/doc/current/api/countingRefs.html#l2h-65     Py_XINCREF]]
 [def Py_XDECREF             [@http://www.python.org/doc/current/api/countingRefs.html#l2h-67     Py_XDECREF]]
 [def PyImport_AppendInittab [@http://www.python.org/doc/current/api/importing.html#l2h-137       PyImport_AppendInittab]]
@@ -1391,17 +1396,17 @@ all. So stay tuned... :-)

 [h2 Building embedded programs]

-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.
+To be able to use embedding in your programs, they have to be linked to
+both Boost.Python's and Python's static link library.

-Boost.Python's library comes in two variants. Both are located
+Boost.Python's static link library comes in two variants. Both are located
 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.

-Python's library can be found in the [^/libs] subdirectory of
+Python's static link library can be found in the [^/libs] subdirectory of
 your Python directory. On Windows it is called pythonXY.lib where X.Y is
 your major Python version number.

@@ -1439,11 +1444,7 @@ steps:

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

-[/ # 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
-interpreter. This may be fixed in a future version of boost.python.]
-]
+# Call Py_Finalize() to stop the interpreter and release its resources.

 (Of course, there can be other C++ code between all of these steps.)

@@ -1460,76 +1461,171 @@ 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.

+[h2 Reference-counting handles and objects]
+
+There are two ways in which a function in the Python/C API can return a
+[^PyObject*]: as a ['borrowed reference] or as a ['new reference]. Which of
+these a function uses, is listed in that function's documentation. The two
+require slightely different approaches to reference-counting but both can
+be 'handled' by Boost.Python.
+
+For a function returning a ['borrowed reference] we'll have to tell the
+[^handle] that the [^PyObject*] is borrowed with the aptly named
+[@../../../v2/handle.html#borrowed-spec borrowed] function. Two functions
+returning borrowed references are PyImport_AddModule and PyModule_GetDict.
+The former returns a reference to an already imported module, the latter
+retrieves a module's namespace dictionary. Let's use them to retrieve the
+namespace of the [^__main__] module:
+
+    object main_module((
+        handle<>(borrowed(PyImport_AddModule("__main__")))));
+
+    object main_namespace = main_module.attr("__dict__");
+
+For a function returning a ['new reference] we can just create a [^handle]
+out of the raw [^PyObject*] without wrapping it in a call to borrowed. One
+such function that returns a new reference is PyRun_String which we'll
+discuss in the next section.
+
+[blurb __note__ [*Handle is a class ['template], so why haven't we been using any template parameters?]\n
+\n
+[^handle] has a single template parameter specifying the type of the managed object. This type is [^PyObject] 99% of the time, so the parameter was defaulted to [^PyObject] for convenience. Therefore we can use the shorthand [^handle<>] instead of the longer, but equivalent, [^handle<PyObject>].
+]
+
 [h2 Running Python code]

-Boost.python provides three related functions to run Python code from C++.
+To run Python code from C++ there is a family of functions in the API
+starting with the PyRun prefix. You can find the full list of these
+functions [@http://www.python.org/doc/current/api/veryhigh.html here]. They
+all work similarly so we will look at only one of them, namely:

-    object eval(str expression, object globals = object(), object locals = object())
-    object exec(str code, object globals = object(), object locals = object())
-    object exec_file(str filename, object globals = object(), object locals = object())
+    PyObject* PyRun_String(char *str, int start, PyObject *globals, PyObject *locals)

-eval evaluates the given expression and returns the resulting value.
-exec executes the given code (typically a set of statements) returning the result,
-and exec_file executes the code contained in the given file.
+PyRun_String takes the code to execute as a null-terminated (C-style)
+string in its [^str] parameter. The function returns a new reference to a
+Python object. Which object is returned depends on the [^start] paramater.

-The [^globals] and [^locals] parameters are Python dictionaries
+The [^start] parameter is the start symbol from the Python grammar to use
+for interpreting the code. The possible values are:
+
+[table Start symbols
+
+    [[Py_eval_input]   [for interpreting isolated expressions]]
+    [[Py_file_input]   [for interpreting sequences of statements]]
+    [[Py_single_input] [for interpreting a single statement]]
+]
+
+When using Py_eval_input, the input string must contain a single expression
+and its result is returned. When using Py_file_input, the string can
+contain an abitrary number of statements and None is returned.
+Py_single_input works in the same way as Py_file_input but only accepts a
+single statement.
+
+Lastly, the [^globals] and [^locals] 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
 [^__main__] module for both parameters.

-Boost.python provides a function to import a module:
+We have already seen how to get the [^__main__] module's namespace so let's
+run some Python code in it:

-    object import(str name)
+    object main_module((
+        handle<>(borrowed(PyImport_AddModule("__main__")))));

-import imports a python module (potentially loading it into the running process
-first), and returns it.
-
-Let's import the [^__main__] module and run some Python code in its namespace:
-
-    object main_module = import("__main__");
    object main_namespace = main_module.attr("__dict__");

-    object ignored = exec("hello = file('hello.txt', 'w')\n"
-                          "hello.write('Hello world!')\n"
-                          "hello.close()",
-                          main_namespace);
+    handle<> ignored((PyRun_String(
+
+        "hello = file('hello.txt', 'w')\n"
+        "hello.write('Hello world!')\n"
+        "hello.close()"
+
+      , Py_file_input
+      , main_namespace.ptr()
+      , main_namespace.ptr())
+    ));
+
+Because the Python/C API doesn't know anything about [^object]s, we used
+the object's [^ptr] member function to retrieve the [^PyObject*].

 This should create a file called 'hello.txt' in the current directory
 containing a phrase that is well-known in programming circles.

-[h2 Manipulating Python objects]
+[blurb
+    __note__ [*Note] that we wrap the return value of PyRun_String in a
+    (nameless) [^handle] even though we are not interested in it. If we didn't
+    do this, the the returned object would be kept alive unnecessarily. Unless
+    you want to be a Dr. Frankenstein, always wrap [^PyObject*]s in [^handle]s.
+]

-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:
+[h2 Beyond handles]
+
+It's nice that [^handle] manages the reference counting details for us, but
+other than that it doesn't do much. Often we'd like to have a more useful
+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 it's derivatives. We've already seen that they
+can be constructed from a [^handle]. The following examples should further
+illustrate this fact:
+
+    object main_module((
+         handle<>(borrowed(PyImport_AddModule("__main__")))));

-    object main_module = import("__main__");
    object main_namespace = main_module.attr("__dict__");
-    object ignored = exec("result = 5 ** 2", main_namespace);
+
+    handle<> ignored((PyRun_String(
+
+        "result = 5 ** 2"
+
+        , Py_file_input
+        , main_namespace.ptr()
+        , main_namespace.ptr())
+    ));
+
    int five_squared = extract<int>(main_namespace["result"]);

 Here we create a dictionary object for the [^__main__] 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:
+the dictionary. Another way to achieve the same result is to let
+PyRun_String return the result directly with Py_eval_input:
+
+    object result((handle<>(
+        PyRun_String("5 ** 2"
+            , Py_eval_input
+            , main_namespace.ptr()
+            , main_namespace.ptr()))
+    ));

-    object result = eval("5 ** 2");
    int five_squared = extract<int>(result);

+[blurb
+    __note__ [*Note] that [^object]'s member function to return the wrapped
+    [^PyObject*] is called [^ptr] instead of [^get]. This makes sense if you
+    take into account the different functions that [^object] and [^handle]
+    perform.
+]
+
 [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:
+If an exception occurs in the execution of some Python code, the PyRun_String
+function returns a null pointer. Constructing a [^handle] out of this null
+pointer throws [@../../../v2/errors.html#error_already_set-spec error_already_set],
+so basically, the Python exception is automatically translated into a
+C++ exception when using [^handle]:

    try
    {
-        object result = eval("5/0");
+        object result((handle<>(PyRun_String(
+            "5/0"
+          , Py_eval_input
+          , main_namespace.ptr()
+          , main_namespace.ptr()))
+        ));
+
        // execution will never get here:
        int five_divided_by_zero = extract<int>(result);
    }
-    catch(error_already_set const &)
+    catch(error_already_set)
    {
        // handle the exception in some way
    }
@@ -1543,7 +1639,7 @@ print the exception's traceback to the console, or comparing the type of the
 exception with those of the [@http://www.python.org/doc/api/standardExceptions.html
 standard exceptions]:

-    catch(error_already_set const &)
+    catch(error_already_set)
    {
        if (PyErr_ExceptionMatches(PyExc_ZeroDivisionError))
        {
@@ -1559,6 +1655,21 @@ standard exceptions]:
 (To retrieve even more information from the exception you can use some of the other
 exception handling functions listed [@http://www.python.org/doc/api/exceptionHandling.html here].)

+If you'd rather not have [^handle] throw a C++ exception when it is constructed, you
+can use the [@../../../v2/handle.html#allow_null-spec allow_null] function in the same
+way you'd use borrowed:
+
+    handle<> result((allow_null(PyRun_String(
+        "5/0"
+       , Py_eval_input
+       , main_namespace.ptr()
+       , main_namespace.ptr()))));
+
+    if (!result)
+        // Python exception occurred
+    else
+        // everything went okay, it's safe to use the result
+
 [endsect]
 [endsect] [/ Embedding]

--- a/doc/v2/exec.html
+++ b/doc/v2/exec.html
@@ -38,7 +38,6 @@

      <dd>
        <dl class="page-index">
-          <dt><a href="#eval-spec"><code>eval</code></a></dt>
          <dt><a href="#exec-spec"><code>exec</code></a></dt>
          <dt><a href="#exec_file-spec"><code>exec_file</code></a></dt>
        </dl>
@@ -53,23 +52,6 @@

    <h2><a name="functions"></a>Functions</h2>

-    <h3><a name="eval-spec"></a><code>eval</code></h3>
-    <pre>
-object eval(str expression,
-            object globals = object(),
-            object locals = object());
-    </pre>
-    <dl class="function-semantics">
-      <dt><b>Effects:</b>
-        Evaluate Python expression from <code>expression</code> in the context 
-        specified by the dictionaries <code>globals</code> and <code>locals</code>.
-      </dt>
-      <dt><b>Returns:</b>
-        An instance of <a href="object.html#object-spec">object</a> 
-        which holds the value of the expression.
-      </dt>
-    </dl>
-
    <h3><a name="exec-spec"></a><code>exec</code></h3>
    <pre>
 object exec(str code,
@@ -127,7 +109,7 @@ void greet()

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

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

 <pre>
-def greet():
+def greet(self):
   return 'Hello from Python!'
 </pre>
    <para>... and execute that instead.</para>
--- a/doc/v2/operators.html
+++ b/doc/v2/operators.html
@@ -214,9 +214,6 @@ 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
@@ -768,15 +765,6 @@ 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>
--- a/doc/v2/reference.html
+++ b/doc/v2/reference.html
@@ -977,7 +977,6 @@

          <dd>
            <dl class="index">
-              <dt><a href="exec.html#eval-spec">eval</a></dt>
              <dt><a href="exec.html#exec-spec">exec</a></dt>
              <dt><a href="exec.html#exec_file-spec">exec_file</a></dt>
            </dl>
--- a/example/project.zip
+++ b/example/project.zip
--- a/example/quickstart/Jamroot
+++ b/example/quickstart/Jamroot
@@ -0,0 +1,33 @@
+# 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)
+
+# Specify the path to the Boost project.  If you move this project,
+# adjust the path to refer to the Boost root directory.
+use-project boost 
+  : ../../../.. ;
+
+# Set up the project-wide requirements that everything uses the
+# boost_python library defined in the project whose global ID is
+# /boost/python.
+project
+  : requirements <library>/boost/python//boost_python ;
+
+# Declare a Python extension called hello.
+python-extension extending : extending.cpp ;
+
+# Declare an executable called embedding that embeds Python
+exe embedding : embedding.cpp /python//python ;
+
+import testing ;
+
+# Declare a test of the extension module
+testing.make-test run-pyd : extending test_extending.py : : test_ext ;
+
+# Declare a test of the embedding application
+testing.run embedding 
+  :              # any ordinary arguments
+  : script.py    # any arguments that should be treated as relative paths
+  :              # requirements
+  : test_embed ; # name of test
+
--- a/example/quickstart/boost-build.jam
+++ b/example/quickstart/boost-build.jam
@@ -0,0 +1,7 @@
+# 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)
+
+# Edit this path to point at the tools/build/v2 subdirectory of your
+# Boost installation.  Absolute paths work, too.
+boost-build ../../../../tools/build/v2 ;
--- a/example/quickstart/embedding.cpp
+++ b/example/quickstart/embedding.cpp
@@ -0,0 +1,154 @@
+// Copyright Stefan Seefeld 2005.
+// 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)
+
+#include <boost/python.hpp>
+
+#include <boost/detail/lightweight_test.hpp>
+#include <iostream>
+
+namespace python = boost::python;
+
+// An abstract base class
+class Base : public boost::noncopyable
+{
+public:
+  virtual ~Base() {};
+  virtual std::string hello() = 0;
+};
+
+// C++ derived class
+class CppDerived : public Base
+{
+public:
+  virtual ~CppDerived() {}
+  virtual std::string hello() { return "Hello from C++!";}
+};
+
+// Familiar Boost.Python wrapper class for Base
+struct BaseWrap : Base, python::wrapper<Base>
+{
+  virtual std::string hello() 
+  {
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    // workaround for VC++ 6.x or 7.0, see
+    // http://boost.org/libs/python/doc/tutorial/doc/html/python/exposing.html#python.class_virtual_functions
+    return python::call<std::string>(this->get_override("hello").ptr());
+#else
+    return this->get_override("hello")();
+#endif
+  }
+};
+
+// Pack the Base class wrapper into a module
+BOOST_PYTHON_MODULE(embedded_hello)
+{
+  python::class_<BaseWrap, boost::noncopyable> base("Base");
+}
+
+
+void exec_test()
+{
+    std::cout << "registering extension module embedded_hello..." << std::endl;
+    
+  // Register the module with the interpreter
+  if (PyImport_AppendInittab("embedded_hello", initembedded_hello) == -1)
+    throw std::runtime_error("Failed to add embedded_hello to the interpreter's "
+                 "builtin modules");
+
+  std::cout << "defining Python class derived from Base..." << std::endl;
+  
+  // Retrieve the main module
+  python::object main = python::import("__main__");
+  
+  // Retrieve the main module's namespace
+  python::object global(main.attr("__dict__"));
+
+  // Define the derived class in Python.
+  python::object result = python::exec(
+    "from embedded_hello import *        \n"
+    "class PythonDerived(Base):          \n"
+    "    def hello(self):                \n"
+    "        return 'Hello from Python!' \n",
+    global, global);
+
+  python::object PythonDerived = global["PythonDerived"];
+
+  // Creating and using instances of the C++ class is as easy as always.
+  CppDerived cpp;
+  BOOST_TEST(cpp.hello() == "Hello from C++!");
+
+  std::cout << "testing derived class from C++..." << std::endl;
+  
+  // But now creating and using instances of the Python class is almost
+  // as easy!
+  python::object py_base = PythonDerived();
+  Base& py = python::extract<Base&>(py_base) BOOST_EXTRACT_WORKAROUND;
+
+  // Make sure the right 'hello' method is called.
+  BOOST_TEST(py.hello() == "Hello from Python!");
+
+  std::cout << "success!" << std::endl;
+}
+
+void exec_file_test(std::string const &script)
+{
+    std::cout << "running file " << script << "..." << std::endl;
+    
+    // Run a python script in an empty environment.
+    python::dict global;
+    python::object result = python::exec_file(script.c_str(), global, global);
+
+    // Extract an object the script stored in the global dictionary.
+    BOOST_TEST(python::extract<int>(global["number"]) ==  42);
+    
+    std::cout << "success!" << std::endl;
+}
+
+void exec_test_error()
+{
+    std::cout << "intentionally causing a python exception..." << std::endl;
+    
+    // Execute a statement that raises a python exception.
+    python::dict global;
+    python::object result = python::exec("print unknown \n", global, global);
+
+    std::cout << "Oops! This statement should be skipped due to an exception" << std::endl;
+}
+
+int main(int argc, char **argv)
+{
+  BOOST_TEST(argc == 2);
+  std::string script = argv[1];
+  // Initialize the interpreter
+  Py_Initialize();
+
+  bool error_expected = false;
+  
+  if (
+      python::handle_exception(exec_test)
+      || python::handle_exception(boost::bind(exec_file_test, script))
+      || (
+          (error_expected = true)
+          && python::handle_exception(exec_test_error)
+      )
+
+  )
+  {
+    if (PyErr_Occurred())
+    {
+        if (!error_expected)
+            BOOST_ERROR("Python Error detected");
+        PyErr_Print();
+    }
+    else
+    {
+        BOOST_ERROR("A C++ exception was thrown  for which "
+                    "there was no exception translator registered.");
+    }
+  }
+  
+  // Boost.Python doesn't support Py_Finalize yet, so don't call it!
+  return boost::report_errors();
+}
--- a/example/quickstart/extending.cpp
+++ b/example/quickstart/extending.cpp
@@ -0,0 +1,41 @@
+// Copyright Ralf W. Grosse-Kunstleve 2002-2004. 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)
+
+#include <boost/python/class.hpp>
+#include <boost/python/module.hpp>
+#include <boost/python/def.hpp>
+#include <iostream>
+#include <string>
+
+namespace { // Avoid cluttering the global namespace.
+
+  // A friendly class.
+  class hello
+  {
+    public:
+      hello(const std::string& country) { this->country = country; }
+      std::string greet() const { return "Hello from " + country; }
+    private:
+      std::string country;
+  };
+
+  // A function taking a hello object as an argument.
+  std::string invite(const hello& w) {
+    return w.greet() + "! Please come soon!";
+  }
+}
+
+BOOST_PYTHON_MODULE(extending)
+{
+    using namespace boost::python;
+    class_<hello>("hello", init<std::string>())
+        // Add a regular member function.
+        .def("greet", &hello::greet)
+        // Add invite() as a member of hello!
+        .def("invite", invite)
+        ;
+    
+    // Also add invite() as a regular function to the module.
+    def("invite", invite);
+}
--- a/example/quickstart/script.py
+++ b/example/quickstart/script.py
@@ -0,0 +1,6 @@
+# Copyright Stefan Seefeld 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)
+
+print 'Hello World !'
+number = 42
--- a/example/quickstart/test_extending.py
+++ b/example/quickstart/test_extending.py
@@ -0,0 +1,36 @@
+# Copyright Ralf W. Grosse-Kunstleve 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)
+
+# Using the doctest module here to ensure that the results are as expected.
+r'''>>> from extending import *
+    >>> hi = hello('California')
+    >>> hi.greet()
+    'Hello from California'
+    >>> invite(hi)
+    'Hello from California! Please come soon!'
+    >>> hi.invite()
+    'Hello from California! Please come soon!'
+
+    >>> class wordy(hello):
+    ...     def greet(self):
+    ...         return hello.greet(self) + ', where the weather is fine'
+    ...
+    >>> hi2 = wordy('Florida')
+    >>> hi2.greet()
+    'Hello from Florida, where the weather is fine'
+    >>> invite(hi2)
+    'Hello from Florida! Please come soon!'
+'''
+
+def run(args = None):
+    if args is not None:
+        import sys
+        sys.argv = args
+    import doctest, test_extending
+    return doctest.testmod(test_extending, verbose=True)
+
+if __name__ == '__main__':
+    import sys
+    sys.exit(run()[0])
+
--- a/include/boost/python/converter/registrations.hpp
+++ b/include/boost/python/converter/registrations.hpp
@@ -34,7 +34,6 @@ struct BOOST_PYTHON_DECL registration
 {
 public: // member functions
    explicit registration(type_info target, bool is_shared_ptr = false);
-   ~registration();
    
    // Convert the appropriately-typed data to Python
    PyObject* to_python(void const volatile*) const;
--- a/include/boost/python/detail/operator_id.hpp
+++ b/include/boost/python/detail/operator_id.hpp
@@ -47,8 +47,7 @@ enum operator_id
    op_ixor,
    op_ior,
    op_complex,
-    op_nonzero,
-    op_repr
+    op_nonzero
 };

 }}} // namespace boost::python::detail
--- a/include/boost/python/exec.hpp
+++ b/include/boost/python/exec.hpp
@@ -13,25 +13,18 @@ namespace boost
 namespace python 
 {

-// Evaluate python expression from str.
-// global and local are the global and local scopes respectively,
-// used during evaluation.
-object 
-BOOST_PYTHON_DECL
-eval(str string, object global = object(), object local = object());
-
 // Execute python source code from str.
 // global and local are the global and local scopes respectively,
 // used during execution.
 object 
-BOOST_PYTHON_DECL
+BOOST_PYTHON_DECL 
 exec(str string, object global = object(), object local = object());

 // Execute python source code from file filename.
 // global and local are the global and local scopes respectively,
 // used during execution.
 object 
-BOOST_PYTHON_DECL
+BOOST_PYTHON_DECL 
 exec_file(str filename, object global = object(), object local = object());

 }
--- a/include/boost/python/make_constructor.hpp
+++ b/include/boost/python/make_constructor.hpp
@@ -23,7 +23,6 @@
 # include <boost/mpl/int.hpp>
 # include <boost/mpl/push_front.hpp>
 # include <boost/mpl/pop_front.hpp>
-# include <boost/mpl/assert.hpp>

 namespace boost { namespace python {

@@ -104,14 +103,12 @@ namespace detail
      
      // If the BasePolicy_ supplied a result converter it would be
      // ignored; issue an error if it's not the default.
-      BOOST_MPL_ASSERT_MSG(
-         (is_same<
+      BOOST_STATIC_ASSERT((
+          is_same<
              typename BasePolicy_::result_converter
            , default_result_converter
-          >::value)
-        , MAKE_CONSTRUCTOR_SUPPLIES_ITS_OWN_RESULT_CONVERTER_THAT_WOULD_OVERRIDE_YOURS
-        , (typename BasePolicy_::result_converter)
-      );
+          >::value
+      ));
      
      typedef constructor_result_converter result_converter;
      typedef offset_args<typename BasePolicy_::argument_package, mpl::int_<1> > argument_package;
--- a/include/boost/python/opaque_pointer_converter.hpp
+++ b/include/boost/python/opaque_pointer_converter.hpp
@@ -1,4 +1,4 @@
-// Copyright Gottfried Ganßauge 2003..2006.
+// Copyright Gottfried Ganßauge 2003..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)
--- a/include/boost/python/operators.hpp
+++ b/include/boost/python/operators.hpp
@@ -347,7 +347,6 @@ BOOST_PYTHON_UNARY_OPERATOR(long, PyLong_FromLong, long_)
 BOOST_PYTHON_UNARY_OPERATOR(float, double, float_)
 BOOST_PYTHON_UNARY_OPERATOR(complex, std::complex<double>, complex_)
 BOOST_PYTHON_UNARY_OPERATOR(str, lexical_cast<std::string>, str)
-BOOST_PYTHON_UNARY_OPERATOR(repr, lexical_cast<std::string>, repr)
 # undef BOOST_PYTHON_UNARY_OPERATOR

 }} // namespace boost::python
@@ -359,7 +358,6 @@ using boost::python::self_ns::long_;
 using boost::python::self_ns::float_;
 using boost::python::self_ns::complex_;
 using boost::python::self_ns::str;
-using boost::python::self_ns::repr;
 using boost::python::self_ns::pow;
 # endif

--- a/src/converter/registry.cpp
+++ b/src/converter/registry.cpp
@@ -57,24 +57,6 @@ BOOST_PYTHON_DECL PyObject* registration::to_python(void const volatile* source)
        : this->m_to_python(const_cast<void*>(source));
 }

-namespace
-{
-  template< typename T >
-  void delete_node( T* node )
-  {
-      if( !!node && !!node->next )
-          delete_node( node->next );
-      delete node;
-  }
-}
-
-registration::~registration()
-{
-  delete_node(lvalue_chain);
-  delete_node(rvalue_chain);
-}
-
-
 namespace // <unnamed>
 {
  typedef registration entry;
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -13,15 +13,6 @@ namespace boost
 namespace python 
 {

-object BOOST_PYTHON_DECL eval(str string, object global, object local)
-{
-  // should be 'char const *' but older python versions don't use 'const' yet.
-  char *s = python::extract<char *>(string);
-  PyObject* result = PyRun_String(s, Py_eval_input, global.ptr(), local.ptr());
-  if (!result) throw_error_already_set();
-  return object(detail::new_reference(result));
-}
-
 object BOOST_PYTHON_DECL exec(str string, object global, object local)
 {
  // should be 'char const *' but older python versions don't use 'const' yet.
--- a/src/object/class.cpp
+++ b/src/object/class.cpp
@@ -532,10 +532,6 @@ namespace objects
      if (scope().ptr() != Py_None)
          scope().attr(name) = result;

-      // For pickle. Will lead to informative error messages if pickling
-      // is not enabled.
-      result.attr("__reduce__") = object(make_instance_reduce_function());
-
      return result;
    }
  }
@@ -633,6 +629,7 @@ namespace objects

  void class_base::enable_pickling_(bool getstate_manages_dict)
  {
+      setattr("__reduce__", object(make_instance_reduce_function()));
      setattr("__safe_for_unpickling__", object(true));
      
      if (getstate_manages_dict)
--- a/src/object/enum.cpp
+++ b/src/object/enum.cpp
@@ -32,11 +32,10 @@ extern "C"
 {
    static PyObject* enum_repr(PyObject* self_)
    {
-        const char *mod = PyString_AsString(PyObject_GetAttrString( self_, "__module__"));
        enum_object* self = downcast<enum_object>(self_);
        if (!self->name)
        {
-            return PyString_FromFormat("%s.%s(%ld)", mod, self_->ob_type->tp_name, PyInt_AS_LONG(self_));
+            return PyString_FromFormat("%s(%ld)", self_->ob_type->tp_name, PyInt_AS_LONG(self_));
        }
        else
        {
@@ -44,7 +43,7 @@ extern "C"
            if (name == 0)
                return 0;
            
-            return PyString_FromFormat("%s.%s.%s", mod, self_->ob_type->tp_name, name);
+            return PyString_FromFormat("%s.%s", self_->ob_type->tp_name, name);
        }
    }

@@ -142,9 +141,10 @@ namespace

      object module_name = module_prefix();
      if (module_name)
-         d["__module__"] = module_name;
+          module_name += '.';
      
-      object result = (object(metatype))(name, make_tuple(base), d);
+      object result = (object(metatype))(
+          module_name + name, make_tuple(base), d);
      
      scope().attr(name) = result;

--- a/src/object/function.cpp
+++ b/src/object/function.cpp
@@ -507,8 +507,7 @@ void function::add_to_namespace(
    {
        if (   PyObject_HasAttrString(mutable_attribute.ptr(), "__doc__")
            && mutable_attribute.attr("__doc__")) {
-            mutable_attribute.attr("__doc__") += (
-              mutable_attribute.attr("__doc__")[-1] != "\n" ? "\n\n" : "\n");
+            mutable_attribute.attr("__doc__") += "\n";
        }
        else {
            mutable_attribute.attr("__doc__") = "";
--- a/src/object/pickle_support.cpp
+++ b/src/object/pickle_support.cpp
@@ -8,7 +8,6 @@
 #include <boost/python/tuple.hpp>
 #include <boost/python/list.hpp>
 #include <boost/python/dict.hpp>
-#include <boost/python/str.hpp>

 namespace boost { namespace python {

@@ -20,22 +19,6 @@ namespace {
      object instance_class(instance_obj.attr("__class__"));
      result.append(instance_class);
      object none;
-      if (!getattr(instance_obj, "__safe_for_unpickling__", none))
-      {
-          str type_name(getattr(instance_class, "__name__"));
-          str module_name(getattr(instance_class, "__module__", object("")));
-          if (module_name)
-              module_name += ".";
-
-          PyErr_SetObject(
-               PyExc_RuntimeError,
-               ( "Pickling of \"%s\" instances is not enabled"
-                 " (http://www.boost.org/libs/python/doc/v2/pickle.html)"
-                  % (module_name+type_name)).ptr()
-          );
-
-          throw_error_already_set();
-      }
      object getinitargs = getattr(instance_obj, "__getinitargs__", none);
      tuple initargs;
      if (getinitargs.ptr() != none.ptr()) {
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -27,25 +27,33 @@ rule py-compile-fail ( sources * )
 }


-
-#template py-unit-test
-#  :
-#  : $(PYTHON_PROPERTIES) <define>BOOST_PYTHON_SUPPRESS_REGISTRY_INITIALIZATION
-#    [ difference $(PYTHON_PROPERTIES) : <define>BOOST_PYTHON_DYNAMIC_LIB ] <define>BOOST_PYTHON_STATIC_LIB
-#      ;
-  
-
 test-suite python
  :

  [
    run exec.cpp ../build//boost_python/<link>static /python//python
+      : # program args
+      : exec.py # input files
+      : # requirements
+      : # target-name
+  ]
+
+  [
+    run exec.cpp ../build//boost_python/<link>shared /python//python
      : # program args
      : exec.py
      : # requirements
-        <define>BOOST_PYTHON_STATIC_MODULE
+      : exec-dynamic # target-name
  ]

+#   [
+#     run import_.cpp ../build//boost_python /python//python
+#       : # program args
+#       : import_.py # input files
+#       : # requirements
+#       : # target-name
+#   ]
+
 [
 bpl-test crossmod_exception
  : crossmod_exception.py crossmod_exception_a.cpp crossmod_exception_b.cpp
@@ -68,7 +76,7 @@ bpl-test crossmod_exception
 [ bpl-test minimal ]
 [ bpl-test args ]
 [ bpl-test raw_ctor ]
-[ bpl-test numpy : printer.py numeric_tests.py numarray_tests.py numpy.py numpy.cpp ]
+[ bpl-test numpy : numpy.py printer.py numeric_tests.py numarray_tests.py numpy.cpp ]
 [ bpl-test enum ]
 [ bpl-test exception_translator ]
 [ bpl-test pearu1 : test_cltree.py cltree.cpp ]
@@ -77,12 +85,11 @@ bpl-test crossmod_exception
 [ bpl-test keywords : keywords.cpp keywords_test.py ]
   

-[ python-extension builtin_converters.ext : test_builtin_converters.cpp /boost/python//boost_python ]
-[ bpl-test builtin_converters : test_builtin_converters.py builtin_converters.ext ]
+[ python-extension builtin_converters_ext : test_builtin_converters.cpp /boost/python//boost_python ]
+[ bpl-test builtin_converters : test_builtin_converters.py builtin_converters_ext ]

 [ bpl-test test_pointer_adoption ]
 [ bpl-test operators ]
- [ bpl-test operators_wrapper ]
 [ bpl-test callbacks ]
 [ bpl-test defaults ]

@@ -145,14 +152,13 @@ bpl-test crossmod_opaque
    # Whenever the cause for the failure of the polymorphism test is found
    # and fixed, this should be retested.
    <toolset>hp_cxx:<build>no ]
-
+      
 [ python-extension map_indexing_suite_ext
    : map_indexing_suite.cpp int_map_indexing_suite.cpp
    /boost/python//boost_python ]
 [ bpl-test  
    map_indexing_suite : map_indexing_suite.py map_indexing_suite_ext ]
-[ py-run import_.cpp : import_.py ]
-
+      
 # if $(TEST_BIENSTMAN_NON_BUGS)
 # {
 #     bpl-test bienstman4 ;
--- a/test/args.py
+++ b/test/args.py
@@ -84,24 +84,22 @@
 (2, 4.25, 'wow')
 >>> q.f1()
 (1, 4.25, 'wow')
->>> q.f2.__doc__.splitlines()[-4]
-"f2's docstring"

->>> X.f.__doc__.splitlines()[:3]
-["This is X.f's docstring", '', 'C++ signature:']
+>>> X.f.__doc__.splitlines()[:2]
+["This is X.f's docstring", 'C++ signature:']

 >>> xfuncs = (X.inner0, X.inner1, X.inner2, X.inner3, X.inner4, X.inner5)
 >>> for f in xfuncs:
 ...    print f(q,1).value(),
 ...    print f(q, n = 1).value(),
 ...    print f(q, n = 0).value(),
-...    print f.__doc__.splitlines()[:3]
-1 1 0 ['docstring', '', 'C++ signature:']
-1 1 0 ['docstring', '', 'C++ signature:']
-1 1 0 ['docstring', '', 'C++ signature:']
-1 1 0 ['docstring', '', 'C++ signature:']
-1 1 0 ['docstring', '', 'C++ signature:']
-1 1 0 ['docstring', '', 'C++ signature:']
+...    print f.__doc__.splitlines()[:2]
+1 1 0 ['docstring', 'C++ signature:']
+1 1 0 ['docstring', 'C++ signature:']
+1 1 0 ['docstring', 'C++ signature:']
+1 1 0 ['docstring', 'C++ signature:']
+1 1 0 ['docstring', 'C++ signature:']
+1 1 0 ['docstring', 'C++ signature:']

 >>> x = X(a1 = 44, a0 = 22)
 >>> x.inner0(0).value()
--- a/test/callbacks.cpp
+++ b/test/callbacks.cpp
@@ -12,7 +12,6 @@
 #include <boost/python/reference_existing_object.hpp>
 #include <boost/python/call.hpp>
 #include <boost/python/object.hpp>
-#define BOOST_ENABLE_ASSERT_HANDLER
 #include <boost/assert.hpp>

 using namespace boost::python;
--- a/test/defaults.py
+++ b/test/defaults.py
@@ -113,7 +113,7 @@
 ...   doc = obj.__doc__.splitlines()
 ...   return "\\n".join(["|"+doc[i] for i in args])

->>> print selected_doc(X.__init__, 0, 3, 6, 9, 11, 12, 14, 17)
+>>> print selected_doc(X.__init__, 0, 2, 4, 6, 8, 9, 10, 12)
 |C++ signature:
 |C++ signature:
 |C++ signature:
@@ -123,11 +123,11 @@
 |C++ signature:
 |C++ signature:

->>> print selected_doc(Y.__init__, 0, 2)
+>>> print selected_doc(Y.__init__, 0, 1)
 |doc of Y init
 |C++ signature:

->>> print selected_doc(X.bar2, 0, 3, 6, 9, 11, 12, 14)
+>>> print selected_doc(X.bar2, 0, 2, 4, 6, 8, 9, 10)
 |C++ signature:
 |C++ signature:
 |C++ signature:
--- a/test/docstring.py
+++ b/test/docstring.py
@@ -8,23 +8,23 @@
 ...   doc = obj.__doc__.splitlines()
 ...   return "\\n".join(["|"+doc[i] for i in args])

->>> print selected_doc(X.__init__, 0, 1, 3)
+>>> print selected_doc(X.__init__, 0, 1, 2)
 |this is the __init__ function
 |its documentation has two lines.
 |C++ signature:

->>> print selected_doc(X.value, 0, 2, 4, 5, 7)
+>>> print selected_doc(X.value, 0, 1, 3, 4, 5)
 |gets the value of the object
 |C++ signature:
 |
 |also gets the value of the object
 |C++ signature:

->>> print selected_doc(create, 0, 2)
+>>> print selected_doc(create, 0, 1)
 |creates a new X object
 |C++ signature:

->>> print selected_doc(fact, 0, 2)
+>>> print selected_doc(fact, 0, 1)
 |compute the factorial
 |C++ signature:

@@ -33,8 +33,8 @@
 >>> print selected_doc(fact_usr_off_1, 0)
 |C++ signature:
 >>> len(fact_usr_on_1.__doc__.splitlines())
-4
->>> print selected_doc(fact_usr_on_1, 0, 2)
+3
+>>> print selected_doc(fact_usr_on_1, 0, 1)
 |usr on 1
 |C++ signature:
 >>> len(fact_usr_off_2.__doc__.splitlines())
@@ -42,8 +42,8 @@
 >>> print selected_doc(fact_usr_off_2, 0)
 |C++ signature:
 >>> len(fact_usr_on_2.__doc__.splitlines())
-4
->>> print selected_doc(fact_usr_on_2, 0, 2)
+3
+>>> print selected_doc(fact_usr_on_2, 0, 1)
 |usr on 2
 |C++ signature:

@@ -52,8 +52,8 @@
 >>> print selected_doc(fact_sig_off_1, 0)
 |sig off 1
 >>> len(fact_sig_on_1.__doc__.splitlines())
-4
->>> print selected_doc(fact_sig_on_1, 0, 2)
+3
+>>> print selected_doc(fact_sig_on_1, 0, 1)
 |sig on 1
 |C++ signature:
 >>> len(fact_sig_off_2.__doc__.splitlines())
@@ -61,16 +61,16 @@
 >>> print selected_doc(fact_sig_off_2, 0)
 |sig off 2
 >>> len(fact_sig_on_2.__doc__.splitlines())
-4
->>> print selected_doc(fact_sig_on_2, 0, 2)
+3
+>>> print selected_doc(fact_sig_on_2, 0, 1)
 |sig on 2
 |C++ signature:

 >>> print fact_usr_off_sig_off_1.__doc__
 None
 >>> len(fact_usr_on_sig_on_1.__doc__.splitlines())
-4
->>> print selected_doc(fact_usr_on_sig_on_1, 0, 2)
+3
+>>> print selected_doc(fact_usr_on_sig_on_1, 0, 1)
 |usr on sig on 1
 |C++ signature:
 >>> len(fact_usr_on_sig_off_1.__doc__.splitlines())
@@ -78,8 +78,8 @@ None
 >>> print selected_doc(fact_usr_on_sig_off_1, 0)
 |usr on sig off 1
 >>> len(fact_usr_on_sig_on_2.__doc__.splitlines())
-4
->>> print selected_doc(fact_usr_on_sig_on_2, 0, 2)
+3
+>>> print selected_doc(fact_usr_on_sig_on_2, 0, 1)
 |usr on sig on 2
 |C++ signature:
 >>> print fact_usr_off_sig_off_2.__doc__
--- a/test/enum.py
+++ b/test/enum.py
@@ -48,27 +48,14 @@ enum_ext.color.red
 enum_ext.color.green
 '''

-# pickling of enums only works with Python 2.3 or higher
-exercise_pickling = '''
->>> import pickle
->>> p = pickle.dumps(color.green, pickle.HIGHEST_PROTOCOL)
->>> l = pickle.loads(p)
->>> identity(l)
-enum_ext.color.green
-'''
-
 def run(args = None):
    import sys
    import doctest
-    import pickle

    if args is not None:
        sys.argv = args
-    self = sys.modules.get(__name__)
-    if (hasattr(pickle, "HIGHEST_PROTOCOL")):
-      self.__doc__ += exercise_pickling
-    return doctest.testmod(self)
-
+    return doctest.testmod(sys.modules.get(__name__))
+    
 if __name__ == '__main__':
    print "running..."
    import sys
--- a/test/exec.cpp
+++ b/test/exec.cpp
@@ -49,13 +49,6 @@ BOOST_PYTHON_MODULE(embedded_hello)
 }


-void eval_test()
-{
-  python::object result = python::eval("'abcdefg'.upper()");
-  std::string value = python::extract<std::string>(result) BOOST_EXTRACT_WORKAROUND;
-  BOOST_TEST(value == "ABCDEFG");
-}
-
 void exec_test()
 {
  // Register the module with the interpreter
@@ -115,8 +108,7 @@ int main(int argc, char **argv)
  // Initialize the interpreter
  Py_Initialize();

-  if (python::handle_exception(eval_test) ||
-      python::handle_exception(exec_test) ||
+  if (python::handle_exception(exec_test) ||
      python::handle_exception(boost::bind(exec_file_test, script)))
  {
    if (PyErr_Occurred())
--- a/test/import_.cpp
+++ b/test/import_.cpp
@@ -4,15 +4,28 @@
 // http://www.boost.org/LICENSE_1_0.txt)

 #include <boost/python.hpp>
-
+#include <boost/bind.hpp>
 #include <boost/detail/lightweight_test.hpp>
 #include <iostream>
 #include <sstream>

 namespace bpl = boost::python;

-void import_test()
+void import_test( char** argv )
 {
+  // Retrieve the main module
+  bpl::object main = bpl::import("__main__");
+  
+  // Retrieve the main module's namespace
+  bpl::object global(main.attr("__dict__"));
+
+  // Inject search path for import_ module
+  std::ostringstream script;
+  script << "import sys, os\n"
+         << "path = os.path.dirname('" << argv[1] << "')\n"
+         << "sys.path.insert(0, path)\n";
+  bpl::exec(bpl::str(script.str()), global, global);
+  
  // Retrieve the main module
  bpl::object import_ = bpl::import("import_");
  int value = bpl::extract<int>(import_.attr("value")) BOOST_EXTRACT_WORKAROUND;
@@ -27,19 +40,7 @@ int main(int argc, char **argv)
  // Initialize the interpreter
  Py_Initialize();
  
-  // Retrieve the main module
-  bpl::object main = bpl::import("__main__");
-  
-  // Retrieve the main module's namespace
-  bpl::object global(main.attr("__dict__"));
-
-  // Inject search path for import_ module
-  std::ostringstream script;
-  script << "import sys, os.path\n"
-         << "path = os.path.dirname('" << argv[1] << "')\n"
-         << "sys.path.insert(0, path)\n";
-  bpl::object result = bpl::exec(bpl::str(script.str()), global, global);
-  if (bpl::handle_exception(import_test))
+  if (bpl::handle_exception(boost::bind(import_test, argv)))
  {
    if (PyErr_Occurred())
    {
--- a/test/keywords.cpp
+++ b/test/keywords.cpp
@@ -103,7 +103,6 @@ BOOST_PYTHON_MODULE(keywords)
               , init<optional<int, double, const std::string &> >()
   )
      .def("set", &Bar::set, bar_set())
-      .def("set2", &Bar::set, bar_set("set2's docstring"))
      .def("seta", &Bar::seta, arg("a"))
       
      .def("a", &Bar::geta)
--- a/test/keywords_test.py
+++ b/test/keywords_test.py
@@ -80,8 +80,6 @@
 >>> f.set(1,1.0,"1")
 >>> f.a(), f.b(), f.n()
 (1, 1.0, '1')
->>> f.set2.__doc__.splitlines()[-4]
-"set2's docstring"
 '''


--- a/test/list.cpp
+++ b/test/list.cpp
@@ -9,7 +9,6 @@
 #include <boost/python/list.hpp>
 #include <boost/python/make_function.hpp>
 #include <boost/lexical_cast.hpp>
-#define BOOST_ENABLE_ASSERT_HANDLER
 #include <boost/assert.hpp>
 #include "test_class.hpp"

@@ -144,4 +143,3 @@ BOOST_PYTHON_MODULE(list_ext)
        ;
 }

-#include "module_tail.cpp"
--- a/test/map_indexing_suite.cpp
+++ b/test/map_indexing_suite.cpp
@@ -26,62 +26,6 @@ std::string x_value(X const& x)
    return "gotya " + x.s;
 }

-struct A
-{
-  int value;
-  A() : value(0){};
-  A(int v) : value(v) {};
-};
-
-bool operator==(const A& v1, const A& v2)
-{
-  return (v1.value == v2.value);
-}
-
-struct B
-{
-  A a;
-};
-
-// Converter from A to python int
-struct AToPython
-{
-  static PyObject* convert(const A& s)
-  {
-    return boost::python::incref(boost::python::object((int)s.value).ptr());
-  }
-};
-
-// Conversion from python int to A
-struct AFromPython
-{
-  AFromPython()
-  {
-    boost::python::converter::registry::push_back(
-        &convertible,
-        &construct,
-        boost::python::type_id< A >());
-  }
-
-  static void* convertible(PyObject* obj_ptr)
-  {
-    if (!PyInt_Check(obj_ptr)) return 0;
-    return obj_ptr;
-  }
-
-  static void construct(
-      PyObject* obj_ptr,
-      boost::python::converter::rvalue_from_python_stage1_data* data)
-  {
-    void* storage = (
-        (boost::python::converter::rvalue_from_python_storage< A >*)
-        data)-> storage.bytes;
-
-    new (storage) A((int)PyInt_AsLong(obj_ptr));
-    data->convertible = storage;
-  }
-};
-
 BOOST_PYTHON_MODULE(map_indexing_suite_ext)
 {
    class_<X>("X")
@@ -114,18 +58,6 @@ BOOST_PYTHON_MODULE(map_indexing_suite_ext)
    class_<std::map<std::string, boost::shared_ptr<X> > >("TestMap")
        .def(map_indexing_suite<std::map<std::string, boost::shared_ptr<X> >, true>())
    ;
-
-  to_python_converter< A , AToPython >();
-  AFromPython();
-
-  class_< std::map<int, A> >("AMap")
-    .def(map_indexing_suite<std::map<int, A>, true >())
-    ;
-
-  class_< B >("B")
-    .add_property("a", make_getter(&B::a, return_value_policy<return_by_value>()),
-        make_setter(&B::a, return_value_policy<return_by_value>()))
-    ;
 }

 #include "module_tail.cpp"
--- a/test/map_indexing_suite.py
+++ b/test/map_indexing_suite.py
@@ -11,7 +11,6 @@
 >>> assert "map_indexing_suite_IntMap_entry" in dir()
 >>> assert "map_indexing_suite_TestMap_entry" in dir()
 >>> assert "map_indexing_suite_XMap_entry" in dir()
->>> assert "map_indexing_suite_AMap_entry" in dir()
 >>> x = X('hi')
 >>> x
 hi
@@ -202,18 +201,6 @@ kiwi
 ...     dom = el.data()
 joel kimpo

-#####################################################################
-# Test custom converter...
-#####################################################################
-
->>> am = AMap()
->>> am[3] = 4
->>> am[3]
-4
->>> for i in am:
-...     i.data()
-4
-
 #####################################################################
 # END.... 
 #####################################################################
--- a/test/module_tail.cpp
+++ b/test/module_tail.cpp
@@ -32,7 +32,7 @@ extern "C" void (*old_translator)(unsigned, EXCEPTION_POINTERS*)
 #include <boost/python/str.hpp>
 struct test_failure : std::exception
 {
-    test_failure(char const* expr, char const* /*function*/, char const* file, unsigned line)
+    test_failure(char const* expr, char const* function, char const* file, unsigned line)
      : msg(file + boost::python::str(":%s:") % line + ": Boost.Python assertion failure: " + expr)
    {}

--- a/test/pickle1.cpp
+++ b/test/pickle1.cpp
@@ -45,8 +45,6 @@ namespace {
    }
  };

-  // To support test of "pickling not enabled" error message.
-  struct noop {};
 }

 BOOST_PYTHON_MODULE(pickle1_ext)
@@ -56,7 +54,4 @@ BOOST_PYTHON_MODULE(pickle1_ext)
      .def("greet", &world::greet)
      .def_pickle(world_pickle_suite())
      ;
-
-  // To support test of "pickling not enabled" error message.
-  class_<noop>("noop");
 }
--- a/test/pickle1.py
+++ b/test/pickle1.py
@@ -18,11 +18,6 @@ r'''>>> import pickle1_ext
    Hello from California!
    >>> print wl.greet()
    Hello from California!
-
-    >>> noop = pickle1_ext.noop()
-    >>> try: pickle.dumps(noop)
-    ... except RuntimeError, e: print str(e)[:55]
-    Pickling of "pickle1_ext.noop" instances is not enabled
 '''

 def run(args = None):
--- a/test/staticmethod.cpp
+++ b/test/staticmethod.cpp
@@ -9,7 +9,6 @@
 #include <boost/python/call_method.hpp>
 #include <boost/ref.hpp>
 #include <boost/utility.hpp>
-#define BOOST_ENABLE_ASSERT_HANDLER
 #include <boost/assert.hpp>

 using namespace boost::python;
--- a/test/test_builtin_converters.cpp
+++ b/test/test_builtin_converters.cpp
@@ -57,7 +57,7 @@ char const* rewrap_value_mutable_cstring(char* x) { return x; }

 object identity_(object x) { return x; }

-BOOST_PYTHON_MODULE(builtin_converters)
+BOOST_PYTHON_MODULE(builtin_converters_ext)
 {    
    def("get_type", get_type);
    def("return_null_handle", return_null_handle);
--- a/test/test_builtin_converters.py
+++ b/test/test_builtin_converters.py
@@ -2,7 +2,7 @@
 # Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 r"""
->>> from builtin_converters import *
+>>> from builtin_converters_ext import *

 # Synthesize idendity functions in case long long not supported
 >>> if not 'rewrap_value_long_long' in dir():
@@ -250,9 +250,9 @@ Check that classic classes also work
 def run(args = None):
    import sys
    import doctest
-    import builtin_converters
+    import builtin_converters_ext
    
-    if 'rewrap_value_long_long' in dir(builtin_converters):
+    if 'rewrap_value_long_long' in dir(builtin_converters_ext):
        print 'LONG_LONG supported, testing...'
    else:
        print 'LONG_LONG not supported, skipping those tests...'
--- a/test/vector_indexing_suite.cpp
+++ b/test/vector_indexing_suite.cpp
@@ -53,10 +53,5 @@ BOOST_PYTHON_MODULE(vector_indexing_suite_ext)
    class_<std::vector<bool> >("BoolVec")
        .def(vector_indexing_suite<std::vector<bool> >())
    ;
-    
-    // vector of strings
-    class_<std::vector<std::string> >("StringVec")
-        .def(vector_indexing_suite<std::vector<std::string> >())
-    ;
 }

--- a/test/vector_indexing_suite.py
+++ b/test/vector_indexing_suite.py
@@ -321,14 +321,6 @@ e
 >>> print_xvec(v)
 [ a b c d e f g h i j ]

-#####################################################################
-# vector of strings
-#####################################################################
->>> sv = StringVec()
->>> sv.append('a')
->>> print sv[0]
-a
-
 #####################################################################
 # END.... 
 #####################################################################
Author	SHA1	Message	Date
nobody	94fc9474b8	This commit was manufactured by cvs2svn to create tag 'Version_1_34_0'. [SVN r37679]	2007-05-12 21:59:40 +00:00
Dave Abrahams	13432b504f	Jamfile had extra bogus tst executable target Build/test instructions were outdated somehow; a checkin must've failed. [SVN r37620]	2007-05-07 19:00:01 +00:00
Dave Abrahams	0739bb7df8	Added reference to Py++ [SVN r37586]	2007-05-04 01:08:54 +00:00
Dave Abrahams	c253c5cc9c	Updated build-and-test howto [SVN r37585]	2007-05-04 00:56:22 +00:00
Dave Abrahams	8f263e1fdb	Progress on the build docs [SVN r37551]	2007-05-01 16:14:39 +00:00
Ralf W. Grosse-Kunstleve	a6125a3632	merged from trunk [SVN r37520]	2007-04-27 22:16:47 +00:00
nobody	a784bfc0f8	This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r37419]	2007-04-11 23:35:09 +00:00
Dave Abrahams	b8937d0bae	Relieve need to explicitly configure Python [SVN r37382]	2007-04-06 18:17:43 +00:00
Dave Abrahams	4827ae73d5	Trivial change to force a rebuild on incremental testers' machines. [SVN r37327]	2007-04-02 00:54:48 +00:00
Dave Abrahams	8eddc7aa37	Support for --with-pydebug builds. python.jam: Support for the specification of "_d" extension suffix. In compute-default-paths, fixed the check for residence in a "PCBuild.*" directory so we can build against Windows Python built in a source distribution. common.jam: Fixed generation of the "y" tag to look for <python-debugging>on rather than the whole debug-python build variant. Fixed some grammar and spelling. virtual-target.jam: Added the ability to forego the prepending of "." to a generated-target-suffix by specifying the suffix enclosed in <...> libs/python/build/Jamfile.v2: #define BOOST_DEBUG_PYTHON when <python-debugging>on [SVN r37326]	2007-04-02 00:51:15 +00:00
Stefan Seefeld	98a468dadc	Fix reference counting error. [SVN r37312]	2007-03-28 18:12:08 +00:00
Dave Abrahams	ea4e6c0a4c	Trivial change to force a rebuild on incremental testers' machines. [SVN r37311]	2007-03-28 12:44:57 +00:00
Dave Abrahams	7cd7f6d8ee	Trivial change to force a rebuild on incremental testers' machines. [SVN r37287]	2007-03-26 15:47:05 +00:00
Dave Abrahams	4c39e8c990	Making a trivial change to trigger a test run from incremental testers [SVN r37278]	2007-03-24 18:57:19 +00:00
Dave Abrahams	6c6f654fbe	Add commented-out test for import_ so it's easy to reinstate [SVN r37256]	2007-03-21 17:44:57 +00:00
Dave Abrahams	b7eaea096e	Eliminate import_ test, as it doesn't work consistently on Windows and Linux. [SVN r37250]	2007-03-21 05:09:21 +00:00
Dave Abrahams	904ae8604c	fix builtin_converters test so it can work (BBv1 allowed the duplication of main target names; BBv2 does not) [SVN r37216]	2007-03-17 20:26:21 +00:00
Dave Abrahams	44d53c448b	libs/python/build/Jamfile.v2: remove needless <define> property. libs/python/test/Jamfile.v2: * add dynamically-linked embedding test * fix builtin_converters test so it can work (BBv1 allowed the duplication of main target names; BBv2 does not) libs/python/test/import_.cpp: move some more of the Python code within a handle_exception callback so at least we can better diagnose failures. [SVN r37214]	2007-03-17 20:17:56 +00:00
Stefan Seefeld	e61401d27e	Fix import_ failure. [SVN r37141]	2007-03-05 18:44:45 +00:00
Stefan Seefeld	be7ca7d269	Add copyright notice. [SVN r37132]	2007-03-02 17:16:51 +00:00
Stefan Seefeld	47b4b4efbb	Fix boost::python::import. [SVN r37123]	2007-03-01 18:31:10 +00:00
nobody	4fa07f2b3d	This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r37121]	2007-03-01 15:17:30 +00:00
Dave Abrahams	c880e7d69d	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). or changing BOOST_TEST to BOOST_CHECK where the integer library was clearly using Boost.Test and not returning report_errors(). [SVN r37063]	2007-02-25 15:28:02 +00:00
Dave Abrahams	c73ad50286	Roll back improved error message because it causes problems for vc6/7 [SVN r36435]	2006-12-16 22:00:35 +00:00
Dave Abrahams	0910710ac4	Correct class/function mismatches for MSVC and bring across documentation tweaks from HEAD. [SVN r36355]	2006-12-13 15:08:26 +00:00
Dave Abrahams	04c528138b	Fully switch to BBv2 [SVN r36327]	2006-12-11 05:22:04 +00:00
nobody	1b66cd9643	This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r36324]	2006-12-11 05:02:35 +00:00
Dave Abrahams	c2dd9fa833	Fix auto-link to look at the right variable. [SVN r36319]	2006-12-11 03:00:26 +00:00
Dave Abrahams	b085121369	merged from trunk [SVN r36292]	2006-12-07 17:45:17 +00:00
Beman Dawes	fa219bce9b	Merged copyright and license addition [SVN r35907]	2006-11-07 19:27:00 +00:00
Rene Rivera	10b85d67e7	Remove obsolete Boost.Build v1 files. [SVN r35880]	2006-11-06 17:10:46 +00:00
Stefan Seefeld	ca91dc828e	Fix symbol visibility. [SVN r35754]	2006-10-27 21:19:47 +00:00
Dave Abrahams	3a53c1dec0	Add fixes somehow missed for darwin [SVN r35612]	2006-10-14 19:10:30 +00:00
nobody	da8e309957	This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r35598]	2006-10-13 21:34:27 +00:00
Dave Abrahams	2bd9141d4a	make numpy tests portable to Darwin with older docutils [SVN r35597]	2006-10-13 21:34:26 +00:00
Dave Abrahams	c3bda6a903	Fix some problems with testing on old docutils installations [SVN r35594]	2006-10-13 19:35:28 +00:00
Dave Abrahams	d61909d3ea	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	1755dad7e6	merged from trunk [SVN r35569]	2006-10-12 06:42:20 +00:00
Dave Abrahams	3b392c99be	Adjust tests to account for numarray behavior differences [SVN r35539]	2006-10-10 22:44:09 +00:00
Dave Abrahams	24ba93607b	Try for backward compatibility with older versions of doctest [SVN r35535]	2006-10-10 18:12:43 +00:00
Dave Abrahams	49d4aac8ec	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	545be29ad3	(hopefully) grab the last bit of logic from HEAD for a bugfix I've been trying to apply to the branch for days(!) [SVN r35436]	2006-10-01 18:25:44 +00:00
Dave Abrahams	8553c109c7	merged from HEAD [SVN r35429]	2006-09-29 22:27:57 +00:00
Dave Abrahams	315c3d50ee	Apply missing elements of previously-"applied" bug fix. [SVN r35421]	2006-09-29 15:45:29 +00:00
Dave Abrahams	d5219979a4	Fix bugs uncovered by Roman Yakovenko [SVN r35410]	2006-09-29 02:09:13 +00:00
Dave Abrahams	d42054f3a0	Cleans up license/copyright warnings [SVN r35409]	2006-09-29 02:08:32 +00:00
nobody	72b06e70ee	This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r35366]	2006-09-28 14:41:02 +00:00
Dave Abrahams	375cc3aa93	Fix broken links [SVN r35330]	2006-09-26 04:25:49 +00:00
Ralf W. Grosse-Kunstleve	4eb286a034	ssize_t patches merged from HEAD [SVN r35327]	2006-09-26 00:48:44 +00:00
nobody	a824230155	This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r35326]	2006-09-26 00:25:08 +00:00
Gottfried Ganßauge	1bc3750ab3	repaired broken links [SVN r35315]	2006-09-25 07:35:57 +00:00
Dave Abrahams	36abcee847	merged from HEAD [SVN r35277]	2006-09-22 15:13:30 +00:00
Gottfried Ganßauge	b8b7768eb7	Test for cross module support of opaque [SVN r35256]	2006-09-21 16:47:49 +00:00
Gottfried Ganßauge	7ad9dc6c64	Changed references to opaque_pointer_converter.html to point to opaque.html instead [SVN r35255]	2006-09-21 16:47:31 +00:00
Gottfried Ganßauge	decc34551a	Renamed to opaque.html because class name changed [SVN r35254]	2006-09-21 16:47:00 +00:00
Gottfried Ganßauge	5acb44ede0	Renamed from opaque_pointer_converter.html because class name changed [SVN r35253]	2006-09-21 16:46:42 +00:00
Gottfried Ganßauge	ef62f87963	type object gets initialized. Cross module support works [SVN r35252]	2006-09-21 16:46:21 +00:00
Joel de Guzman	b5c893381f	merge from head [SVN r35246]	2006-09-21 10:52:01 +00:00
Vladimir Prus	815969bf8b	Merge: Add tests [SVN r35245]	2006-09-21 07:27:11 +00:00
nobody	0d57e9e808	This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r35243]	2006-09-21 07:07:15 +00:00
Dave Abrahams	7ba6a00617	Apply Boost license, with permission from Prabhu Ramachandran. [SVN r35240]	2006-09-21 03:43:59 +00:00
Dave Abrahams	e70bbe4791	Fix license/copyright. Also port some "glaringly obvious" bugfixes from HEAD. Hope it doesn't cause problems. [SVN r35237]	2006-09-20 22:49:18 +00:00
Stefan Seefeld	7ff0f62729	Fix copyright issues. [SVN r35236]	2006-09-20 22:30:39 +00:00
Dave Abrahams	95f0b39c90	merged from HEAD [SVN r35185]	2006-09-18 22:22:31 +00:00
nobody	23057688f9	This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r35170]	2006-09-18 19:56:20 +00:00
Dave Abrahams	029618f719	merged from HEAD [SVN r35165]	2006-09-18 18:25:57 +00:00
Dave Abrahams	38f7a4e9b6	merge from HEAD [SVN r35141]	2006-09-17 02:42:51 +00:00
Dave Abrahams	326c871224	attempt unverified workaround for http://tinyurl.com/gvrgd [SVN r35103]	2006-09-13 22:47:11 +00:00
Dave Abrahams	924eeccd53	merged from trunk [SVN r35080]	2006-09-13 00:02:56 +00:00
Dave Abrahams	4a63cf4843	Move definition of BOOST_PYTHON_SUPPRESS_REGISTRY_INITIALIZATION back where it belongs. [SVN r35076]	2006-09-12 22:37:09 +00:00
Dave Abrahams	1d65b74273	Add missing license/copyright [SVN r35070]	2006-09-11 22:27:29 +00:00
Dave Abrahams	3c1ae689a7	merged from trunk [SVN r34943]	2006-08-24 19:04:23 +00:00
Dave Abrahams	a99bd50e52	merged from trunk [SVN r34940]	2006-08-24 13:05:30 +00:00
Dave Abrahams	8b178594ff	merged from trunk [SVN r34915]	2006-08-22 11:51:18 +00:00
Dave Abrahams	786aeef998	merged from trunk [SVN r34872]	2006-08-11 15:51:09 +00:00
Dave Abrahams	45e4cf506f	merged from trunk [SVN r34865]	2006-08-11 00:48:19 +00:00
Gennaro Prota	8fb6e1f48d	(merge from head) removed tabs (inspect tool) [SVN r34723]	2006-07-24 22:28:41 +00:00
Gennaro Prota	ecf70b05f2	(merge from head) removed tabs (inspect tool) [SVN r34721]	2006-07-24 22:21:39 +00:00
Gennaro Prota	c54acdb9db	(merge from head) minor fix: violation of min/max guidelines [SVN r34718]	2006-07-24 22:06:09 +00:00
Vladimir Prus	489dae2b58	Clarify comment [SVN r34668]	2006-07-22 12:53:49 +00:00
Vladimir Prus	f852ce6f7b	Windows [SVN r34667]	2006-07-22 12:28:43 +00:00
Vladimir Prus	e500919d25	Merge: Don't link Boost.Python to python library [SVN r34663]	2006-07-22 07:16:18 +00:00
Markus Schöpflin	7a645a6d8a	Merged header inclusion order fix from trunk to release branch. [SVN r34195]	2006-06-06 09:44:35 +00:00
Markus Schöpflin	fa2185e5ab	Merged header inclusion order fix from trunk to release branch. [SVN r34194]	2006-06-06 09:39:16 +00:00
Vladimir Prus	5cc33461dd	Merge from trunk [SVN r33626]	2006-04-10 09:02:57 +00:00
Markus Schöpflin	7b93f2fdc5	Merged fix from HEAD for Tru64/CXX compilation error. [SVN r33455]	2006-03-23 09:40:38 +00:00
nobody	219743964d	This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r33417]	2006-03-21 02:26:31 +00:00