diff --git a/doc/src/overview.xml b/doc/src/overview.xml index 1c2310b96..37bae1c96 100644 --- a/doc/src/overview.xml +++ b/doc/src/overview.xml @@ -107,7 +107,7 @@ a.o: a.c add_program ("a", "a.c") - This is a function call that creates the targets necessary to create a executable file + This is a function call that creates the targets necessary to create an executable file from the source file a.c. Depending on configured properties, different command lines may be used. However, add_program is higher-level, but rather thin level. All targets are created immediately when the build description @@ -675,7 +675,7 @@ b2 toolset=gcc variant=debug optimization=space Changes the build directories for all project roots being built. When this option is specified, all Jamroot files must declare a project name. - The build directory for the project root will be computed by concatanating + The build directory for the project root will be computed by concatenating the value of the option, the project name specified in Jamroot, and the build dir specified in Jamroot (or bin, if none is specified). @@ -782,12 +782,12 @@ b2 toolset=gcc variant=debug optimization=space - Enable cummulative debugging levels from 1 to n. Values are: + Enable cumulative debugging levels from 1 to n. Values are: Show the actions taken for building targets, as they are executed (the default). Show "quiet" actions and display all action text, as they are executed. Show dependency analysis, and target/source timestamps/paths. - Show arguments and timming of shell invocations. + Show arguments and timing of shell invocations. Show rule invocations and variable expansions. Show directory/header file/archive scans, and attempts at binding to targets. Show variable settings. @@ -1595,7 +1595,7 @@ b2 app1 lib1//lib1 gcc debug optimization=full Selecting the main target alternative to use. For each alternative we look how many properties are present both in alternative's requirements, and in build request. The - alternative with large number of matching properties is selected. + alternative with largest number of matching properties is selected. Determining "common" properties. diff --git a/doc/src/reference.xml b/doc/src/reference.xml index 0275f9fe1..98b8e857b 100644 --- a/doc/src/reference.xml +++ b/doc/src/reference.xml @@ -50,7 +50,7 @@ boost-build build-system ; automatically find the build system. The default bootstrap.jam, after loading some standard - definitions, loads two site-config.jam and user-config.jam. + definitions, loads both site-config.jam and user-config.jam. @@ -165,7 +165,7 @@ lib tools : [ glob *.cpp ] ; It is possible to also pass a second argument—the list of exclude patterns. The result will then include the list of - files patching any of include patterns, and not matching any + files matching any of include patterns, and not matching any of the exclude patterns. For example: lib tools : [ glob *.cpp : file_to_exclude.cpp bad*.cpp ] ; @@ -567,7 +567,7 @@ path-constant DATA : data/a.txt ; The value of those features is passed without modification to the corresponding tools. For cflags that is both the C and - C++ compilers, for cxxflags that is the C++ compiler + C++ compilers, for cxxflags that is the C++ compiler, and for linkflags that is the linker. The features are handy when you are trying to do something special that cannot be achieved by a higher-level feature in Boost.Build. @@ -672,7 +672,7 @@ path-constant DATA : data/a.txt ; Allowed values: on, off. The debug-symbols feature specifies if - produced object files, executables and libraries should include + produced object files, executables, and libraries should include debug information. Typically, the value of this feature is implicitly set by the variant feature, but it can be explicitly @@ -686,8 +686,8 @@ path-constant DATA : data/a.txt ; Allowed values: on, off. - The runtime-debugging feature specifies if - produced object files, executables and libraries should include + The runtime-debugging feature specifies + whether produced object files, executables, and libraries should include behaviour useful only for debugging, such as asserts. Typically, the value of this feature is implicitly set by the variant feature, but it can be explicitly @@ -937,7 +937,7 @@ using gcc : &toolset_ops; ; Specifies the archiver command that is used to produce static libraries. Normally, it is autodetected using gcc -print-prog-name option or defaulted to ar, - but in some cases you might want to override it, for example to expliitly + but in some cases you might want to override it, for example to explicitly use a system version instead of one included with gcc. @@ -949,7 +949,7 @@ using gcc : &toolset_ops; ; Specifies the ranlib command that is used to generated symbol table for static libraries. Normally, it is autodetected using gcc -print-prog-name option or defaulted to ranlib, - but in some cases you might want to override it, for example to expliitly + but in some cases you might want to override it, for example to explicitly use a system version instead of one included with gcc. @@ -1021,6 +1021,9 @@ using gcc : &toolset_ops; ; C++ command-line tools on Microsoft Windows. The supported products and versions of command line tools are listed below: + Visual Studio 2015—14.0 + Visual Studio 2013—12.0 + Visual Studio 2012—11.0 Visual Studio 2010—10.0 Visual Studio 2008—9.0 Visual Studio 2005—8.0 diff --git a/doc/src/tasks.xml b/doc/src/tasks.xml index 8ff82f0b8..48f611a28 100644 --- a/doc/src/tasks.xml +++ b/doc/src/tasks.xml @@ -520,7 +520,7 @@ unit-test helpers_test By default, the executable is run directly. Sometimes, it is desirable to run the executable using some helper command. You - should use the this property to specify the name of the helper + should use this property to specify the name of the helper command. For example, if you write: unit-test helpers_test @@ -575,7 +575,7 @@ unit-test helpers_test Boost.Build's virtual targets. This is higher-level than the file names that the make rule operates with and allows you to create more than one target, create differently named targets depending on - properties or use more than one tool. + properties, or use more than one tool. @@ -764,7 +764,7 @@ exe main : main.cpp pch ; "parser.y". The latter source is converted into "parser.c" and "parser.h". Then, if "app.cpp" includes "parser.h", Boost.Build will detect this dependency. Moreover, since "parser.h" will be generated into a build - directory, the path to that directory will automatically added to include + directory, the path to that directory will automatically be added to the include path. @@ -800,14 +800,14 @@ using gcc : arm : arm-none-linux-gnueabi-g++ ; After that, if the host and target os are the same, for example Linux, you can - just request that this compiler version to be used: + just request that this compiler version be used: b2 toolset=gcc-arm - If you want to target different operating system from the host, you need + If you want to target a different operating system from the host, you need to additionally specify the value for the target-os feature, for example: @@ -823,7 +823,7 @@ b2 toolset=gcc-mingw target-os=windows - When using the msvc compiler, it's only possible to cross-compiler to a 64-bit system + When using the msvc compiler, it's only possible to cross-compile to a 64-bit system on a 32-bit host. Please see for details. diff --git a/doc/src/tutorial.xml b/doc/src/tutorial.xml index 3227a6718..e36ac1402 100644 --- a/doc/src/tutorial.xml +++ b/doc/src/tutorial.xml @@ -179,7 +179,7 @@ exe hello See - augments) the build request. + augment) the build request. @@ -384,7 +384,7 @@ project lib foo : foo.cpp ; Usage requirements are applied not to the target being declared but to its - dependants. In this case, <include>. will be + dependents. In this case, <include>. will be applied to all targets that directly depend on foo. @@ -417,7 +417,7 @@ exe app : app.cpp /library-example/foo//bar ; If you want all applications in some project to link to a certain - library, you can avoid having to specify it directly the sources of + library, you can avoid having to specify directly the sources of every target by using the <library> property. For example, if /boost/filesystem//fs should be linked to all applications in your project, you can add @@ -433,7 +433,7 @@ project
- Static and shared libaries + Static and shared libraries Libraries can be either static, which means they are @@ -621,8 +621,8 @@ lib lib2 exe app : app.cpp ../util/lib2//lib2 ; As with any target, the alternative selected depends on the properties - propagated from lib2's dependants. If we build the - release and debug versions of app will be linked + propagated from lib2's dependents. If we build the + release and debug versions of app it will be linked with lib2_release.a and lib2_debug.a , respectively.