diff --git a/v2/doc/src/tutorial.xml b/v2/doc/src/tutorial.xml index 41b4c988e..45bee7724 100644 --- a/v2/doc/src/tutorial.xml +++ b/v2/doc/src/tutorial.xml @@ -224,7 +224,7 @@ exe hello2 : hello.cpp ; Project Hierarchies So far we've only considered examples with one project - (i.e. with one user-written Boost.Jam file, + —a. with one user-written Boost.Jam file, Jamroot). A typical large codebase would be composed of many projects organized into a tree. The top of the tree is called the project root. Every @@ -253,9 +253,7 @@ top/ . `-- bar.cpp - the project root is top/. Because there is - no Jamfile in - top/util/, the projects in + the project root is top/. The projects in top/app/ and top/util/foo/ are immediate children of the root project. @@ -276,19 +274,19 @@ top/ Projects inherit all attributes (such as requirements) from their parents. Inherited requirements are combined with - any requirements specified by the sub-project. + any requirements specified by the subproject. For example, if top/Jamroot has <include>/home/ghost/local - in its requirements, then all of its sub-projects will have it + in its requirements, then all of its subprojects will have it in their requirements, too. Of course, any project can add include paths to those specified by its parents. Many features will be overridden, - rather than added-to, in sub-projects. See for more information @@ -298,9 +296,9 @@ top/ Invoking bjam without explicitly specifying - any targets on the command-line builds the project rooted in the + any targets on the command line builds the project rooted in the current directory. Building a project does not automatically - cause its sub-projects to be built unless the parent project's + cause its subprojects to be built unless the parent project's Jamfile explicitly requests it. In our example, top/Jamroot might contain: @@ -494,7 +492,7 @@ lib l : l.cpp : <link>static ; exe important : main.cpp helpers/<link>static ; No matter what arguments are specified on the bjam - command-line, important will only be linked with + command line, important will only be linked with the static version of helpers.