Index: libs/python/doc/tutorial/doc/tutorial.qbk =================================================================== --- libs/python/doc/tutorial/doc/tutorial.qbk (revision 69326) +++ libs/python/doc/tutorial/doc/tutorial.qbk (working copy) @@ -77,15 +77,15 @@ 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 will outline the steps necessary to achieve that. We will use the build tool that comes bundled -with every boost distribution: [*bjam]. +with every boost distribution: [*Boost.Build]. -[note [*Building without bjam] +[note [*Building without Boost.Build] -Besides bjam, there are of course other ways to get your module built. +Besides Boost.Build, there are of course other ways to get your module built. What's written here should not be taken as "the one and only way". -There are of course other build tools apart from [^bjam]. +There are of course other build tools apart from Boost.Build. -Take note however that the preferred build tool for Boost.Python is bjam. +Take note however that the preferred build tool for Boost.Python is Boost.Build. 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. @@ -94,7 +94,7 @@ We will skip over the details. Our objective will be to simply create the hello world module and run it in Python. For a complete reference to building Boost.Python, check out: [@../../../building.html -building.html]. After this brief ['bjam] tutorial, we should have built +building.html]. After this brief ['Boost.Build] tutorial, we should have built the DLLs and run a python program using the extension. The tutorial example can be found in the directory: @@ -105,15 +105,14 @@ * Jamroot The [^hello.cpp] file is our C++ hello world example. The [^Jamroot] is -a minimalist ['bjam] script that builds the DLLs for us. Finally, +a minimalist ['Boost.Build] script that builds the DLLs for us. Finally, [^hello.py] is our Python program that uses the extension in [^hello.cpp]. -Before anything else, you should have the bjam executable in your boost +Before anything else, you should have Boost.Build's [^bjam] executable in your boost directory or somewhere in your path such that [^bjam] 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 -[@http://sourceforge.net/project/showfiles.php?group_id=7586 here]. +the command line. If you haven't, please follow Boost.Build's +[@boost:doc/html/bbv2/installation.html installation instructions]. [h2 Let's Jam!] __jam__ @@ -125,9 +124,9 @@ The comments contained in the Jamrules file above should be sufficient to get you going. -[h2 Running bjam] +[h2 Running Boost.Build] -['bjam] is run using your operating system's command line interpreter. +Boost.Build is run using your operating system's command line interpreter. [:Start it up.]