diff options
Diffstat (limited to 'docs/markdown')
| -rw-r--r-- | docs/markdown/Build-options.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Builtin-options.md | 2 | ||||
| -rw-r--r-- | docs/markdown/CMake-module.md | 4 | ||||
| -rw-r--r-- | docs/markdown/Continuous-Integration.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Contributing.md | 4 | ||||
| -rw-r--r-- | docs/markdown/Dependencies.md | 6 | ||||
| -rw-r--r-- | docs/markdown/Design-rationale.md | 2 | ||||
| -rw-r--r-- | docs/markdown/FAQ.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Kconfig-module.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Localisation.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Pkg-config-files.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Reference-manual.md | 4 | ||||
| -rw-r--r-- | docs/markdown/Rewriter.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Unit-tests.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Vala.md | 2 |
15 files changed, 20 insertions, 20 deletions
diff --git a/docs/markdown/Build-options.md b/docs/markdown/Build-options.md index 9e7fe19ee..8b29afdf0 100644 --- a/docs/markdown/Build-options.md +++ b/docs/markdown/Build-options.md @@ -94,7 +94,7 @@ if d.found() endif ``` -If the value of a `feature` option is set to `auto`, that value is overriden by +If the value of a `feature` option is set to `auto`, that value is overridden by the global `auto_features` option (which defaults to `auto`). This is intended to be used by packagers who want to have full control on which dependencies are required and which are disabled, and not rely on build-deps being installed diff --git a/docs/markdown/Builtin-options.md b/docs/markdown/Builtin-options.md index 4172f1a97..61857c9ae 100644 --- a/docs/markdown/Builtin-options.md +++ b/docs/markdown/Builtin-options.md @@ -55,7 +55,7 @@ particularly the paths section may be necessary. ### Core options -Options that are labled "per machine" in the table are set per machine. +Options that are labeled "per machine" in the table are set per machine. Prefixing the option with `build.` just affects the build machine configuration, while unprefixed just affects the host machine configuration, respectively. Using the option as-is with no prefix affects all machines. For example: diff --git a/docs/markdown/CMake-module.md b/docs/markdown/CMake-module.md index 94f470821..4cd62a5f7 100644 --- a/docs/markdown/CMake-module.md +++ b/docs/markdown/CMake-module.md @@ -86,14 +86,14 @@ and supports the following methods: - `dependency(target)` returns a dependency object for any CMake target. - `include_directories(target)` returns a meson `include_directories()` - object for the specified target. Using this function is not neccessary + object for the specified target. Using this function is not necessary if the dependency object is used. - `target(target)` returns the raw build target. - `target_type(target)` returns the type of the target as a string - `target_list()` returns a list of all target *names*. - `get_variable(name)` fetches the specified variable from inside the subproject. Usually `dependency()` or `target()` should be - prefered to extract build targets. + preferred to extract build targets. ## CMake configuration files diff --git a/docs/markdown/Continuous-Integration.md b/docs/markdown/Continuous-Integration.md index 5eec67d3f..6565c6e9b 100644 --- a/docs/markdown/Continuous-Integration.md +++ b/docs/markdown/Continuous-Integration.md @@ -74,7 +74,7 @@ install: - cmd: if %arch%==x86 (set PYTHON_ROOT=C:\python37) else (set PYTHON_ROOT=C:\python37-x64) # Print out dependency paths - cmd: echo Using Python at %PYTHON_ROOT% - # Add neccessary paths to PATH variable + # Add necessary paths to PATH variable - cmd: set PATH=%cd%;C:\ninja-build;%PYTHON_ROOT%;%PYTHON_ROOT%\Scripts;%PATH% # Install meson - cmd: pip install meson diff --git a/docs/markdown/Contributing.md b/docs/markdown/Contributing.md index a7ddd6c4e..95324d66e 100644 --- a/docs/markdown/Contributing.md +++ b/docs/markdown/Contributing.md @@ -38,7 +38,7 @@ Every new feature requires some extra steps, namely: into `run_unittests.py`. - Must be registered with the [FeatureChecks framework](Release-notes-for-0.47.0.md#feature-detection-based-on-meson_version-in-project) that will warn the user if they try to use a new feature while - targetting an older meson version. + targeting an older meson version. - Needs a release note snippet inside `docs/markdown/snippets/` with a heading and a brief paragraph explaining what the feature does with an example. @@ -84,7 +84,7 @@ In a simplified list form the split would look like the following: ## Strategy for merging pull requests to trunk -Meson's merge strategy should fullfill the following guidelines: +Meson's merge strategy should fulfill the following guidelines: - preserve as much history as possible diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md index a3ae1997e..39b7ccb93 100644 --- a/docs/markdown/Dependencies.md +++ b/docs/markdown/Dependencies.md @@ -137,7 +137,7 @@ of all the work behind the scenes to make this work. You can use the keyword `method` to let meson know what method to use when searching for the dependency. The default value is `auto`. -Aditional dependencies methods are `pkg-config`, `config-tool`, `cmake`, +Additional dependencies methods are `pkg-config`, `config-tool`, `cmake`, `system`, `sysconfig`, `qmake`, `extraframework` and `dub`. ```meson @@ -159,11 +159,11 @@ to use both the old-style `<NAME>_LIBRARIES` variables as well as imported targets. It is possible to manually specify a list of CMake targets that should -be used with the `modules` property. Howerver, this step is optional +be used with the `modules` property. However, this step is optional since meson tries to automatically guess the correct target based on the name of the dependency. -Depending on the dependency it may be neccessary to explicitly specify +Depending on the dependency it may be necessary to explicitly specify a CMake target with the `modules` property if meson is unable to guess it automatically. diff --git a/docs/markdown/Design-rationale.md b/docs/markdown/Design-rationale.md index 1c65fa8ed..57aaee470 100644 --- a/docs/markdown/Design-rationale.md +++ b/docs/markdown/Design-rationale.md @@ -226,7 +226,7 @@ First we build a shared library named foobar. It is marked installable, so running `ninja install` installs it to the library directory (the system knows which one so the user does not have to care). Then we build a test executable which is linked against the -library. It will no tbe installed, but instead it is added to the list +library. It will not be installed, but instead it is added to the list of unit tests, which can be run with the command `ninja test`. Above we mentioned precompiled headers as a feature not supported by diff --git a/docs/markdown/FAQ.md b/docs/markdown/FAQ.md index 7625361cf..45255e911 100644 --- a/docs/markdown/FAQ.md +++ b/docs/markdown/FAQ.md @@ -324,7 +324,7 @@ that Windows developers should be able to contribute using nothing but Visual Studio. At the time of writing (April 2018) there are only three languages -that could fullfill these requirements: +that could fulfill these requirements: - C - C++ diff --git a/docs/markdown/Kconfig-module.md b/docs/markdown/Kconfig-module.md index c361b5b65..5807f8d9a 100644 --- a/docs/markdown/Kconfig-module.md +++ b/docs/markdown/Kconfig-module.md @@ -14,7 +14,7 @@ configurations in meson projects. **Note**:Â this does not provide kconfig frontend tooling to generate a configuration. You still need something such as kconfig frontends (see link below) to parse your Kconfig files, and then (after you've -choosen the configuration options), output a ".config" file. +chosen the configuration options), output a ".config" file. [kconfig-frontends]: http://ymorin.is-a-geek.org/projects/kconfig-frontends diff --git a/docs/markdown/Localisation.md b/docs/markdown/Localisation.md index 517b64251..ce9e3b671 100644 --- a/docs/markdown/Localisation.md +++ b/docs/markdown/Localisation.md @@ -7,7 +7,7 @@ short-description: Localization with GNU Gettext Localising your application with GNU gettext takes a little effort but is quite straightforward. We'll create a `po` subdirectory at your project root directory for all the localisation info. ## Generating .pot and .po files -In your main meson.build file include the `po` subdirectory in the build proces. +In your main meson.build file include the `po` subdirectory in the build process. subdir('po') diff --git a/docs/markdown/Pkg-config-files.md b/docs/markdown/Pkg-config-files.md index 305a6d8cd..3aa8897a3 100644 --- a/docs/markdown/Pkg-config-files.md +++ b/docs/markdown/Pkg-config-files.md @@ -18,4 +18,4 @@ pkg.generate(libraries : libs, This causes a file called `simple.pc` to be created and placed into the install directory during the install phase. -More infromation on the pkg-config module and the parameters can be found on the [pkgconfig-module](Pkgconfig-module.md) page. +More information on the pkg-config module and the parameters can be found on the [pkgconfig-module](Pkgconfig-module.md) page. diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md index 3fdd9a9e4..cf846ef18 100644 --- a/docs/markdown/Reference-manual.md +++ b/docs/markdown/Reference-manual.md @@ -697,7 +697,7 @@ Keyword arguments are the following: [`dependency()`](#dependency) for argument format. The version of the program is determined by running `program_name --version` command. If stdout is empty it fallbacks to stderr. If the output contains more text than simply a version - number, only the first occurence of numbers separated by dots is kept. + number, only the first occurrence of numbers separated by dots is kept. If the output is more complicated than that, the version checking will have to be done manually using [`run_command()`](#run_command). @@ -1152,7 +1152,7 @@ You should use this instead of [`shared_library`](#shared_library), to toggle your entire project (including subprojects) from shared to static with only one option. This option applies to libraries being built internal to the entire project. For external dependencies, the -default library type prefered is shared. This can be adapted on a per +default library type preferred is shared. This can be adapted on a per library basis using the [dependency()](#dependency)) `static` keyword. The keyword arguments for this are the same as for diff --git a/docs/markdown/Rewriter.md b/docs/markdown/Rewriter.md index b6301d637..9972bea63 100644 --- a/docs/markdown/Rewriter.md +++ b/docs/markdown/Rewriter.md @@ -107,7 +107,7 @@ meson rewrite default-options {set/delete} <opt1> <value1> <opt2> <value2> ... ## Limitations -Rewriting a meson file is not guranteed to keep the indentation of the modified +Rewriting a meson file is not guaranteed to keep the indentation of the modified functions. Additionally, comments inside a modified statement will be removed. Furthermore, all source files will be sorted alphabetically. diff --git a/docs/markdown/Unit-tests.md b/docs/markdown/Unit-tests.md index 15b194100..4b216995a 100644 --- a/docs/markdown/Unit-tests.md +++ b/docs/markdown/Unit-tests.md @@ -169,7 +169,7 @@ $ meson test --gdb --gdb-path /path/to/gdb testname $ meson test --print-errorlogs ``` -Meson will report the output produced by the failing tests along with other useful informations as the environmental variables. This is useful, for example, when you run the tests on Travis-CI, Jenkins and the like. +Meson will report the output produced by the failing tests along with other useful information as the environmental variables. This is useful, for example, when you run the tests on Travis-CI, Jenkins and the like. For further information see the command line help of Meson by running `meson test -h`. diff --git a/docs/markdown/Vala.md b/docs/markdown/Vala.md index 3550fa12e..7081f8eb9 100644 --- a/docs/markdown/Vala.md +++ b/docs/markdown/Vala.md @@ -82,7 +82,7 @@ development files. The VAPI is installed in Vala's standard search path and so works just as seamlessly using the `dependency()` function. -### Targetting a version of GLib +### Targeting a version of GLib Meson's [`dependency()`](Reference-manual.md#dependency) function allows a version check of a library. This is often used to check a minimum version is installed. When setting a minimum version of GLib, Meson will also pass this to |