diff options
Diffstat (limited to 'docs/markdown')
| -rw-r--r-- | docs/markdown/Builtin-options.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Commands.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Contributing.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Cross-compilation.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Fs-module.md | 6 | ||||
| -rw-r--r-- | docs/markdown/Machine-files.md | 8 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-0.47.0.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-0.48.0.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-0.49.0.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-0.51.0.md | 4 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-0.52.0.md | 6 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-0.54.0.md | 6 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-0.55.0.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Running-Meson.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Subprojects.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Wrap-dependency-system-manual.md | 2 |
16 files changed, 26 insertions, 26 deletions
diff --git a/docs/markdown/Builtin-options.md b/docs/markdown/Builtin-options.md index 8fe9fbe21..23995dc13 100644 --- a/docs/markdown/Builtin-options.md +++ b/docs/markdown/Builtin-options.md @@ -231,7 +231,7 @@ Most of the time this would be used either by the parent project by setting subproject's default_options (e.g. `subproject('foo', default_options: 'default_library=static')`), or by the user using the command line `-Dfoo:default_library=static`. -The value is overriden in this order: +The value is overridden in this order: - Value from parent project - Value from subproject's default_options if set - Value from subproject() default_options if set diff --git a/docs/markdown/Commands.md b/docs/markdown/Commands.md index d7233d47a..984b2933b 100644 --- a/docs/markdown/Commands.md +++ b/docs/markdown/Commands.md @@ -59,7 +59,7 @@ Builds a default or a specified target of a configured meson project. - `PATH`: path to the target relative to the root `meson.build` file. Note: relative path for a target specified in the root `meson.build` is `./`. - `TYPE`: type of the target. Can be one of the following: 'executable', 'static_library', 'shared_library', 'shared_module', 'custom', 'run', 'jar'. -`PATH` and/or `TYPE` can be ommited if the resulting `TARGET` can be used to uniquely identify the target in `meson.build`. +`PATH` and/or `TYPE` can be omitted if the resulting `TARGET` can be used to uniquely identify the target in `meson.build`. #### Backend specific arguments diff --git a/docs/markdown/Contributing.md b/docs/markdown/Contributing.md index 46fe57f6c..3e5bcca1b 100644 --- a/docs/markdown/Contributing.md +++ b/docs/markdown/Contributing.md @@ -273,7 +273,7 @@ The `shared_lib` and `pdb` types takes an optional additional parameter, `versio } ``` -This will be applied appropriatly per platform. On windows this expects `lib.dll` and `lib-1.dll`. on MacOS it expects `liblib.dylib` and `liblib.1.dylib`. On other Unices it expects `liblib.so`, `liblib.so.1`, and `liblib.so.1.2.3`. +This will be applied appropriately per platform. On windows this expects `lib.dll` and `lib-1.dll`. on MacOS it expects `liblib.dylib` and `liblib.1.dylib`. On other Unices it expects `liblib.so`, `liblib.so.1`, and `liblib.so.1.2.3`. If the `platform` key is present, the installed file entry is only considered if the platform matches. The following values for `platform` are currently supported: diff --git a/docs/markdown/Cross-compilation.md b/docs/markdown/Cross-compilation.md index c8cd72867..21ca9f5de 100644 --- a/docs/markdown/Cross-compilation.md +++ b/docs/markdown/Cross-compilation.md @@ -112,7 +112,7 @@ project's test suite. ### Properties -In addition to the properites allowed in [all machine +In addition to the properties allowed in [all machine files](Machine-files.md#properties), the cross file may contain specific information about the cross compiler or the host machine. It looks like this: diff --git a/docs/markdown/Fs-module.md b/docs/markdown/Fs-module.md index e5941a9e9..29273deda 100644 --- a/docs/markdown/Fs-module.md +++ b/docs/markdown/Fs-module.md @@ -62,7 +62,7 @@ fs.is_absolute('foo/bar') # false, even if ./foo/bar exists ### hash The `fs.hash(filename, hash_algorithm)` method returns a string containing -the hexidecimal `hash_algorithm` digest of a file. +the hexadecimal `hash_algorithm` digest of a file. `hash_algorithm` is a string; the available hash algorithms include: md5, sha1, sha224, sha256, sha384, sha512. @@ -84,7 +84,7 @@ Examples: x = 'foo.txt' y = 'sub/../foo.txt' z = 'bar.txt' # a symlink pointing to foo.txt -j = 'notafile.txt' # non-existant file +j = 'notafile.txt' # non-existent file fs.is_samepath(x, y) # true fs.is_samepath(x, z) # true @@ -93,7 +93,7 @@ fs.is_samepath(x, j) # false p = 'foo/bar' q = 'foo/bar/baz/..' r = 'buz' # a symlink pointing to foo/bar -s = 'notapath' # non-existant directory +s = 'notapath' # non-existent directory fs.is_samepath(p, q) # true fs.is_samepath(p, r) # true diff --git a/docs/markdown/Machine-files.md b/docs/markdown/Machine-files.md index 72d2e0cfc..e703988fe 100644 --- a/docs/markdown/Machine-files.md +++ b/docs/markdown/Machine-files.md @@ -209,12 +209,12 @@ options section. This is a non exhaustive list of supported variables in the `[properties]` section. -- `cmake_toolchain_file` specifies an absoulte path to an already existing +- `cmake_toolchain_file` specifies an absolute path to an already existing CMake toolchain file that will be loaded with `include()` as the last instruction of the automatically generated CMake toolchain file from meson. (*new in 0.56.0*) - `cmake_defaults` is a boolean that specifies whether meson should automatically - generate default toolchain varaibles from other sections (`binaries`, + generate default toolchain variables from other sections (`binaries`, `host_machine`, etc.) in the machine file. Defaults are always overwritten by variables set in the `[cmake]` section. The default is `true`. (*new in 0.56.0*) - `cmake_skip_compiler_test` is an enum that specifies when meson should @@ -222,7 +222,7 @@ section. sanity checks. This only has an effect if `cmake_defaults` is `true`. Supported values are `always`, `never`, `dep_only`. The default is `dep_only`. (*new in 0.56.0*) -- `cmake_use_exe_wrapper` is a boolean that controlls whether to use the +- `cmake_use_exe_wrapper` is a boolean that controls whether to use the `exe_wrapper` specified in `[binaries]` to run generated executables in CMake subprojects. This setting has no effect if the `exe_wrapper` was not specified. The default value is `true`. (*new in 0.56.0*) @@ -235,7 +235,7 @@ All variables set in the `[cmake]` section will be added to the generate CMake toolchain file used for both CMake dependencies and CMake subprojects. The type of each entry must be either a string or a list of strings. -**Note:** All occurances of `\` in the value of all keys will be replaced with +**Note:** All occurrences of `\` in the value of all keys will be replaced with a `/` since CMake has a lot of issues with correctly escaping `\` when dealing with variables (even in cases where a path in `CMAKE_C_COMPILER` is correctly escaped, CMake will still trip up internaly for instance) diff --git a/docs/markdown/Release-notes-for-0.47.0.md b/docs/markdown/Release-notes-for-0.47.0.md index 675942be4..9093035e9 100644 --- a/docs/markdown/Release-notes-for-0.47.0.md +++ b/docs/markdown/Release-notes-for-0.47.0.md @@ -184,7 +184,7 @@ Project name: featurenew Project version: undefined Build machine cpu family: x86_64 Build machine cpu: x86_64 -WARNING: Project targetting '>=0.43' but tried to use feature introduced in '0.44.0': configuration_data.get_unquoted() +WARNING: Project targeting '>=0.43' but tried to use feature introduced in '0.44.0': configuration_data.get_unquoted() Message: bar Build targets in project: 0 WARNING: Project specifies a minimum meson_version '>=0.43' which conflicts with: diff --git a/docs/markdown/Release-notes-for-0.48.0.md b/docs/markdown/Release-notes-for-0.48.0.md index 2cb02684e..eaeeefeef 100644 --- a/docs/markdown/Release-notes-for-0.48.0.md +++ b/docs/markdown/Release-notes-for-0.48.0.md @@ -263,7 +263,7 @@ that also provide a tool like protoc. Now, by default `shared_library()` sets `-compatibility_version` and `-current_version` of a macOS dylib using the `soversion`. -This can be overriden by using the `darwin_versions:` kwarg to +This can be overridden by using the `darwin_versions:` kwarg to [`shared_library()`](Reference-manual.md#shared_library). As usual, you can also pass this kwarg to `library()` or `build_target()` and it will be used in the appropriate circumstances. diff --git a/docs/markdown/Release-notes-for-0.49.0.md b/docs/markdown/Release-notes-for-0.49.0.md index 9a5e5f53b..327ed758e 100644 --- a/docs/markdown/Release-notes-for-0.49.0.md +++ b/docs/markdown/Release-notes-for-0.49.0.md @@ -105,7 +105,7 @@ This allows IDE integration to get information about the project before the user Before you could use `meson.py introspect --projectinfo build-directory`. Now you also can use `meson.py introspect --projectinfo project-dir/meson.build`. -The output is similiar to the output with a build directory but additionally also includes information from `introspect --buildsystem-files`. +The output is similar to the output with a build directory but additionally also includes information from `introspect --buildsystem-files`. For example `meson.py introspect --projectinfo test\ cases/common/47\ subproject\ options/meson.build` This outputs (pretty printed for readability): diff --git a/docs/markdown/Release-notes-for-0.51.0.md b/docs/markdown/Release-notes-for-0.51.0.md index b7e441cf4..8a73cbcb1 100644 --- a/docs/markdown/Release-notes-for-0.51.0.md +++ b/docs/markdown/Release-notes-for-0.51.0.md @@ -252,7 +252,7 @@ targets. For those trying to ensure native and cross builds to the same platform produced the same result, the old way was frustrating because very different invocations were needed to affect the same targets, if it was possible at all. Now, the same -command line arguments affect the same targets everwhere --- Meson is closer to +command line arguments affect the same targets everywhere --- Meson is closer to ignoring whether the "overall" build is native or cross, and just caring about whether individual targets are for the build or host machines. @@ -323,7 +323,7 @@ It should be noted that not all projects are guaranteed to work. The safest approach would still be to create a `meson.build` for the subprojects in question. -## Multipe cross files can be specified +## Multiple cross files can be specified `--cross-file` can be passed multiple times, with the configuration files overlaying the same way as `--native-file`. diff --git a/docs/markdown/Release-notes-for-0.52.0.md b/docs/markdown/Release-notes-for-0.52.0.md index 018fb3569..b972f816a 100644 --- a/docs/markdown/Release-notes-for-0.52.0.md +++ b/docs/markdown/Release-notes-for-0.52.0.md @@ -86,7 +86,7 @@ Add `dependency('blocks')` to use the Clang blocks extension. ## Meson's builtin b_lundef is now supported on macOS -This has always been possible, but there are some addtional restrictions on +This has always been possible, but there are some additional restrictions on macOS (mainly do to Apple only features). With the linker internal re-architecture this has become possible @@ -133,7 +133,7 @@ A new `version` keyword argument has been added to `find_program` to specify the required version. See [`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 +text than simply a version 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). @@ -163,7 +163,7 @@ lib2 = static_library(sources, link_with : lib1, install : true) ``` - pkg-config generator do not include uninstalled static libraries. In the example below, the generated `.pc` file used to be unusable because it contained - `Libs.private: -llib1` and `lib1.a` is not installed. `lib1` is now ommitted + `Libs.private: -llib1` and `lib1.a` is not installed. `lib1` is now omitted from the `.pc` file because the `link_with:` has been promoted to `link_whole:` (see above) and thus lib1 is not needed to use lib2. ```meson diff --git a/docs/markdown/Release-notes-for-0.54.0.md b/docs/markdown/Release-notes-for-0.54.0.md index 2f215de47..0807d2e83 100644 --- a/docs/markdown/Release-notes-for-0.54.0.md +++ b/docs/markdown/Release-notes-for-0.54.0.md @@ -199,7 +199,7 @@ skip_sanity_check = true ## Support for overiding the linker with ldc and gdc LDC (the llvm D compiler) and GDC (The Gnu D Compiler) now honor D_LD linker -variable (or d_ld in the cross file) and is able to pick differnt linkers. +variable (or d_ld in the cross file) and is able to pick different linkers. GDC supports all of the same values as GCC, LDC supports ld.bfd, ld.gold, ld.lld, ld64, link, and lld-link. @@ -249,7 +249,7 @@ Most of the time this would be used either by the parent project by setting subproject's default_options (e.g. `subproject('foo', default_options: 'default_library=static')`), or by the user using the command line `-Dfoo:default_library=static`. -The value is overriden in this order: +The value is overridden in this order: - Value from parent project - Value from subproject's default_options if set - Value from subproject() default_options if set @@ -276,7 +276,7 @@ and avoid a system directories use. Meson now ships with predefined project templates for `Java`, `Cuda`, `Objective-C++`, and `C#`, we provided with associated -values for corresponding languages, avalable for both library, +values for corresponding languages, available for both library, and executable. ## Ninja version requirement bumped to 1.7 diff --git a/docs/markdown/Release-notes-for-0.55.0.md b/docs/markdown/Release-notes-for-0.55.0.md index 5ee04034b..c5665609e 100644 --- a/docs/markdown/Release-notes-for-0.55.0.md +++ b/docs/markdown/Release-notes-for-0.55.0.md @@ -23,7 +23,7 @@ Usage: `meson compile [TARGET [TARGET...]]` `PATH`: path to the target relative to the root `meson.build` file. Note: relative path for a target specified in the root `meson.build` is `./`. `TYPE`: type of the target (e.g. `shared_library`, `executable` and etc) -`PATH` and/or `TYPE` can be ommited if the resulting `TARGET` can be used to uniquely identify the target in `meson.build`. +`PATH` and/or `TYPE` can be omitted if the resulting `TARGET` can be used to uniquely identify the target in `meson.build`. For example targets from the following code: ```meson diff --git a/docs/markdown/Running-Meson.md b/docs/markdown/Running-Meson.md index 326ecb96f..eb4da77f1 100644 --- a/docs/markdown/Running-Meson.md +++ b/docs/markdown/Running-Meson.md @@ -95,7 +95,7 @@ the usual way. A list of backends can be obtained with `meson setup --help`. Sometimes you want to add extra compiler flags, this can be done by passing them in environment variables when calling meson. See [the reference -tables](Reference-tables.md#compiler-and-linker-flag-envrionment-variables) for +tables](Reference-tables.md#compiler-and-linker-flag-environment-variables) for a list of all the environment variables. Be aware however these environment variables are only used for the native compiler and will not affect the compiler used for cross-compiling, where the flags specified in the cross file diff --git a/docs/markdown/Subprojects.md b/docs/markdown/Subprojects.md index e8adc965e..9afbe1b8e 100644 --- a/docs/markdown/Subprojects.md +++ b/docs/markdown/Subprojects.md @@ -212,7 +212,7 @@ the following command-line options: calls, and those are meant to be used for sources that cannot be provided by the system, such as copylibs. - This option may be overriden by `--force-fallback-for` for specific + This option may be overridden by `--force-fallback-for` for specific dependencies. * **--wrap-mode=forcefallback** diff --git a/docs/markdown/Wrap-dependency-system-manual.md b/docs/markdown/Wrap-dependency-system-manual.md index 4189709a5..61a8390dd 100644 --- a/docs/markdown/Wrap-dependency-system-manual.md +++ b/docs/markdown/Wrap-dependency-system-manual.md @@ -92,7 +92,7 @@ Since *0.55.0* those can be used in all wrap types, they were previously reserve Since *0.55.0* it is possible to use only the `source_filename` and `patch_filename` value in a .wrap file (without `source_url` and `patch_url`) to specify a local archive in the `subprojects/packagefiles` directory. The `*_hash` -entries are optional when using this method. This method should be prefered over +entries are optional when using this method. This method should be preferred over the old `packagecache` approach described below. Since *0.49.0* if `source_filename` or `patch_filename` is found in the |
