Skip to content

Commit

Permalink
Fix spelling issues
Browse files Browse the repository at this point in the history
  • Loading branch information
liberforce committed Sep 25, 2018
1 parent cec6bc0 commit 36923ac
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ Check https://github.com/conan-io/conan for issues and more details about develo
1.7.4 (18-September-2018)
-------------------------

- Bugfix: Fixed a bug in apiv2.
- Fix: Disabled apiv2 by default until it gets more stability.
- Bugfix: Fixed a bug in `apiv2`.
- Fix: Disabled `apiv2` by default until it gets more stability.


1.7.3 (6-September-2018)
Expand Down
8 changes: 4 additions & 4 deletions reference/generators/b2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ For each requirement ``conanbuildinfo-XXX.cmake`` file declares the following
constants. ``variation`` is the name of the package and variation. That
``YYY`` variation takes the form of a comma separated list of: package name,
address-model, architecture, target-os, toolset with version, and variant
(debug, release, relwithdebinfo, and minsizerel). All are lower case and use
the values of the corresponding ``B2`` features. For example a boost_predef
(``debug``, ``release``, ``relwithdebinfo``, and ``minsizerel``). All are lower case and use
the values of the corresponding ``B2`` features. For example a ``boost_predef``
package dependency when building with apple-clang 9.0 and debug would be:
``boost_predef,64,x86,darwin,clang-9.0,debug``.

Expand Down Expand Up @@ -181,9 +181,9 @@ other constants.

- **Global declared constants**

The generator also defines an corresponding set of constants that aggregate
The generator also defines a corresponding set of constants that aggregate
the values of all the package requirements. The constants for this are the same
as the package specific ones buth with "conan" as the name of the project.
as the package-specific ones but with "conan" as the name of the project.

- **Constants from user_info**

Expand Down

0 comments on commit 36923ac

Please sign in to comment.