diff options
author | Christian Clauss <cclauss@me.com> | 2021-10-01 00:03:23 +0200 |
---|---|---|
committer | Eli Schwartz <eschwartz93@gmail.com> | 2021-10-10 16:12:25 -0400 |
commit | a5020857f31ad6d03bc7c0019551cc28b9e5aad5 (patch) | |
tree | fdf9e08b2c37877e44fb4cdf91cc2ee45c868e6a /docs/markdown | |
parent | 32b7cbd4a7cd8cffb47c5465301141eaad599eaa (diff) | |
download | meson-a5020857f31ad6d03bc7c0019551cc28b9e5aad5.zip meson-a5020857f31ad6d03bc7c0019551cc28b9e5aad5.tar.gz meson-a5020857f31ad6d03bc7c0019551cc28b9e5aad5.tar.bz2 |
Fix typos discovered by codespell
Diffstat (limited to 'docs/markdown')
-rw-r--r-- | docs/markdown/CMake-module.md | 2 | ||||
-rw-r--r-- | docs/markdown/Cross-compilation.md | 2 | ||||
-rw-r--r-- | docs/markdown/Dependencies.md | 2 | ||||
-rw-r--r-- | docs/markdown/Installing.md | 2 | ||||
-rw-r--r-- | docs/markdown/Machine-files.md | 4 | ||||
-rw-r--r-- | docs/markdown/MesonCI.md | 4 | ||||
-rw-r--r-- | docs/markdown/Reference-tables.md | 4 | ||||
-rw-r--r-- | docs/markdown/Release-notes-for-0.42.0.md | 4 | ||||
-rw-r--r-- | docs/markdown/Release-notes-for-0.48.0.md | 2 | ||||
-rw-r--r-- | docs/markdown/Release-notes-for-0.51.0.md | 2 | ||||
-rw-r--r-- | docs/markdown/Release-notes-for-0.52.0.md | 2 | ||||
-rw-r--r-- | docs/markdown/Release-notes-for-0.54.0.md | 2 | ||||
-rw-r--r-- | docs/markdown/Release-notes-for-0.55.0.md | 2 | ||||
-rw-r--r-- | docs/markdown/Release-notes-for-0.58.0.md | 6 | ||||
-rw-r--r-- | docs/markdown/Rust-module.md | 2 | ||||
-rw-r--r-- | docs/markdown/Syntax.md | 6 | ||||
-rw-r--r-- | docs/markdown/_include_qt_base.md | 4 | ||||
-rw-r--r-- | docs/markdown/snippets/qt_module_generated_inputs.md | 2 |
18 files changed, 27 insertions, 27 deletions
diff --git a/docs/markdown/CMake-module.md b/docs/markdown/CMake-module.md index ed43f9d..38b6eea 100644 --- a/docs/markdown/CMake-module.md +++ b/docs/markdown/CMake-module.md @@ -160,7 +160,7 @@ following methods are supported: - `set_override_option(opt, val)` set specific [build options](Build-options.md) for targets. This will effectively add `opt=val` to the `override_options` array of the [[build_target]] - - `set_install(bool)` override wether targets should be installed or not + - `set_install(bool)` override whether targets should be installed or not - `append_compile_args(lang, arg1, ...)` append compile flags for a specific language to the targets - `append_link_args(arg1, ...)` append linger args to the targets diff --git a/docs/markdown/Cross-compilation.md b/docs/markdown/Cross-compilation.md index 4410c03..beca74d 100644 --- a/docs/markdown/Cross-compilation.md +++ b/docs/markdown/Cross-compilation.md @@ -203,7 +203,7 @@ There are two different values for the CPU. The first one is value from [the CPU Family table](Reference-tables.md#cpu-families). *Note* that Meson does not add `el` to end cpu_family value for little endian systems. Big endian and little endian mips are both just -`mips`, with the `endian` field set approriately. +`mips`, with the `endian` field set appropriately. The second value is `cpu` which is a more specific subtype for the CPU. Typical values for a `x86` CPU family might include `i386` or diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md index d09c688..db8623a 100644 --- a/docs/markdown/Dependencies.md +++ b/docs/markdown/Dependencies.md @@ -203,7 +203,7 @@ it automatically. Support for adding additional `COMPONENTS` for the CMake `find_package` lookup is provided with the `components` kwarg -(*introduced in 0.54.0*). All specified componets will be passed +(*introduced in 0.54.0*). All specified components will be passed directly to `find_package(COMPONENTS)`. Support for packages which require a specified version for CMake diff --git a/docs/markdown/Installing.md b/docs/markdown/Installing.md index 4a87ca3..0f7cbb5 100644 --- a/docs/markdown/Installing.md +++ b/docs/markdown/Installing.md @@ -114,7 +114,7 @@ $ DESTDIR=/path/to/staging/area meson install ``` Since *0.57.0* `--destdir` argument can be used instead of environment. In that -case Meson will set `DESTDIR` into environment when runing install scripts. +case Meson will set `DESTDIR` into environment when running install scripts. Since *0.60.0* `DESTDIR` and `--destdir` can be a path relative to build directory. An absolute path will be set into environment when executing scripts. diff --git a/docs/markdown/Machine-files.md b/docs/markdown/Machine-files.md index c77c7dc..ecdb8b4 100644 --- a/docs/markdown/Machine-files.md +++ b/docs/markdown/Machine-files.md @@ -250,7 +250,7 @@ list of strings. **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) + is correctly escaped, CMake will still trip up internally for instance) A custom toolchain file should be used (via the `cmake_toolchain_file` property) if `\` support is required. @@ -348,7 +348,7 @@ overriding, but to allow composing files. This composition is done by passing the command line argument multiple times: ```console -meson setup builddir/ --cross-file first.ini --cross-file second.ini --cross-file thrid.ini +meson setup builddir/ --cross-file first.ini --cross-file second.ini --cross-file third.ini ``` In this case `first.ini` will be loaded, then `second.ini`, with diff --git a/docs/markdown/MesonCI.md b/docs/markdown/MesonCI.md index 65175af..5136c28 100644 --- a/docs/markdown/MesonCI.md +++ b/docs/markdown/MesonCI.md @@ -14,11 +14,11 @@ tests are run. ## Docker images The Linux docker images are automatically built and uploaded by GitHub -actions. An image rebuild is triggerd when any of the image definition +actions. An image rebuild is triggered when any of the image definition files are changed (in `ci/ciimage`) in the master branch. Additionally, the images are also updated weekly. -Each docker image has one corresponding dirctory in `ci/ciimage` with +Each docker image has one corresponding directory in `ci/ciimage` with an `image.json` and an `install.sh`. ### Image generation diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md index f2fc663..1028849 100644 --- a/docs/markdown/Reference-tables.md +++ b/docs/markdown/Reference-tables.md @@ -192,7 +192,7 @@ arguments](#language-arguments-parameter-names) instead. | LDFLAGS | The linker flags, used for all languages | N.B. these settings are specified per machine, and so the environment -varibles actually come in pairs. See the [environment variables per +variables actually come in pairs. See the [environment variables per machine](#Environment-variables-per-machine) section for details. ## Function Attributes @@ -289,7 +289,7 @@ These are the values that can be passed to `dependency` function's ## Compiler and Linker selection variables N.B. these settings are specified per machine, and so the environment -varibles actually come in pairs. See the [environment variables per +variables actually come in pairs. See the [environment variables per machine](#Environment-variables-per-machine) section for details. | Language | Compiler | Linker | Note | diff --git a/docs/markdown/Release-notes-for-0.42.0.md b/docs/markdown/Release-notes-for-0.42.0.md index ba2fe8c..b4081e1 100644 --- a/docs/markdown/Release-notes-for-0.42.0.md +++ b/docs/markdown/Release-notes-for-0.42.0.md @@ -119,10 +119,10 @@ accepts the new `exclude_files` and `exclude_directories` keyword arguments that allow specified files or directories to be excluded from the installed subdirectory. -## Make all Meson functionality invokable via the main executable +## Make all Meson functionality invocable via the main executable Previously Meson had multiple executables such as `mesonintrospect` -and `mesontest`. They are now invokable via the main Meson executable +and `mesontest`. They are now invocable via the main Meson executable like this: meson configure <arguments> # equivalent to mesonconf <options> diff --git a/docs/markdown/Release-notes-for-0.48.0.md b/docs/markdown/Release-notes-for-0.48.0.md index 50e8f20..144355d 100644 --- a/docs/markdown/Release-notes-for-0.48.0.md +++ b/docs/markdown/Release-notes-for-0.48.0.md @@ -15,7 +15,7 @@ to add everything by hand. This works but is a bit tedious. In this release we have added new new options to manually toggle e.g. optimization levels and debug info so those can be changed independently of other options. For example by default the debug -buildtype has no optmization enabled at all. If you wish to use GCC's +buildtype has no optimization enabled at all. If you wish to use GCC's `-Og` instead, you could set it with the following command: ``` diff --git a/docs/markdown/Release-notes-for-0.51.0.md b/docs/markdown/Release-notes-for-0.51.0.md index cd94f6a..0a644a3 100644 --- a/docs/markdown/Release-notes-for-0.51.0.md +++ b/docs/markdown/Release-notes-for-0.51.0.md @@ -294,7 +294,7 @@ their syntax is not correct as a standalone target. In general `include` files are meant to be injected inline as if they were copy and pasted into the source file. -`include` was never standard and was superceded by Fortran 90 `module`. +`include` was never standard and was superseded by Fortran 90 `module`. The `include` file is only recognized by Meson if it has a Fortran file suffix, such as `.f` `.F` `.f90` `.F90` or similar. This is to diff --git a/docs/markdown/Release-notes-for-0.52.0.md b/docs/markdown/Release-notes-for-0.52.0.md index 05e2dc2..667a0d7 100644 --- a/docs/markdown/Release-notes-for-0.52.0.md +++ b/docs/markdown/Release-notes-for-0.52.0.md @@ -94,7 +94,7 @@ linker internal re-architecture this has become possible ## Compiler and dynamic linker representation split -0.52.0 inclues a massive refactor of the representaitons of compilers to +0.52.0 includes a massive refactor of the representaitons of compilers to tease apart the representations of compilers and dynamic linkers (ld). This fixes a number of compiler/linker combinations. In particular this fixes use GCC and vanilla clang on macOS. diff --git a/docs/markdown/Release-notes-for-0.54.0.md b/docs/markdown/Release-notes-for-0.54.0.md index 7e9fbf2..3b060a5 100644 --- a/docs/markdown/Release-notes-for-0.54.0.md +++ b/docs/markdown/Release-notes-for-0.54.0.md @@ -210,7 +210,7 @@ the following entry to your cross file's `properties` section: skip_sanity_check = true ``` -## Support for overiding the linker with ldc and gdc +## Support for overriding 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 diff --git a/docs/markdown/Release-notes-for-0.55.0.md b/docs/markdown/Release-notes-for-0.55.0.md index 22c7e61..b5e9c0a 100644 --- a/docs/markdown/Release-notes-for-0.55.0.md +++ b/docs/markdown/Release-notes-for-0.55.0.md @@ -191,7 +191,7 @@ option( ## Wrap fallback URL Wrap files can now define `source_fallback_url` and -`patch_fallback_url` to be used in case the main server is temporaly +`patch_fallback_url` to be used in case the main server is temporarily down. ## Clang coverage support diff --git a/docs/markdown/Release-notes-for-0.58.0.md b/docs/markdown/Release-notes-for-0.58.0.md index 7187dc1..2f9b52d 100644 --- a/docs/markdown/Release-notes-for-0.58.0.md +++ b/docs/markdown/Release-notes-for-0.58.0.md @@ -20,7 +20,7 @@ when a project is being used as a subproject. New method `meson.add_devenv()` adds an [`environment()`](#environment) object to the list of environments that will be applied when using `meson devenv` -command line. This is useful for developpers who wish to use the project without +command line. This is useful for developers who wish to use the project without installing it, it is often needed to set for example the path to plugins directory, etc. Alternatively, a list or dictionary can be passed as first argument. @@ -63,7 +63,7 @@ compilation faster and using `-pipe` [can cause sporadic build failures in certain cases](https://github.com/mesonbuild/meson/issues/8508). -## `meson.add_dist_script()` allowd in subprojects +## `meson.add_dist_script()` allowed in subprojects `meson.add_dist_script()` can now be invoked from a subproject, it was a hard error in earlier versions. Subproject dist scripts will only be executed @@ -100,7 +100,7 @@ up the path manually with `include_directories`. `append()` and `prepend()` methods can now be called multiple times on the same `varname`. Earlier Meson versions would warn and only the last -opperation was taking effect. +operation was taking effect. ```meson env = environment() diff --git a/docs/markdown/Rust-module.md b/docs/markdown/Rust-module.md index bbb2b5e..9f8b09b 100644 --- a/docs/markdown/Rust-module.md +++ b/docs/markdown/Rust-module.md @@ -34,7 +34,7 @@ that automatically. Additional, test only dependencies may be passed via the dependencies argument. -### bindgen(*, input: string | BuildTarget | []string | []BuildTarget, output: strng, include_directories: []include_directories, c_args: []string, args: []string) +### bindgen(*, input: string | BuildTarget | []string | []BuildTarget, output: string, include_directories: []include_directories, c_args: []string, args: []string) This function wraps bindgen to simplify creating rust bindings around C libraries. This has two advantages over hand-rolling ones own with a diff --git a/docs/markdown/Syntax.md b/docs/markdown/Syntax.md index 8f32765..5bcbdb5 100644 --- a/docs/markdown/Syntax.md +++ b/docs/markdown/Syntax.md @@ -180,8 +180,8 @@ functionality described below. ### String index -Stings support the indexing (`[<num>]`) operator. This operator allows (read -only) acessing a specific character. The returned value is guaranteed to be +Strings support the indexing (`[<num>]`) operator. This operator allows (read +only) accessing a specific character. The returned value is guaranteed to be a string of length 1. ```meson @@ -513,7 +513,7 @@ executable('progname', kwargs: d) ``` -A single function can take keyword argumets both directly in the +A single function can take keyword arguments both directly in the function call and indirectly via the `kwargs` keyword argument. The only limitation is that it is a hard error to pass any particular key both as a direct and indirect argument. diff --git a/docs/markdown/_include_qt_base.md b/docs/markdown/_include_qt_base.md index db8667c..51665f8 100644 --- a/docs/markdown/_include_qt_base.md +++ b/docs/markdown/_include_qt_base.md @@ -58,7 +58,7 @@ compilation. Has the following signature: `qt.preprocess(name: str | None, *sources: str)` -If the `name` parameter is passed then all of the rcc files will be wirtten to a single output file +If the `name` parameter is passed then all of the rcc files will be written to a single output file The variadic `sources` arguments have been deprecated since Meson 0.59.0, as has the `sources` keyword argument. These passed files unmodified through the preprocessor, don't do this, just add the output of the generator to another sources list: ```meson @@ -76,7 +76,7 @@ This method takes the following keyword arguments: - `uic_extra_arguments` string[]: any additional arguments to `uic`. Since v0.49.0. - `rcc_extra_arguments` string[]: any additional arguments to `rcc`. Since v0.49.0. - `dependencies` Dependency[]: dependency objects needed by moc. Available since v0.48.0. - - `sources`: a list of extra sources, which are added to the output unchaged. Deprecated in 0.59.0. + - `sources`: a list of extra sources, which are added to the output unchanged. Deprecated in 0.59.0. It returns an array of targets and sources to pass to a compilation target. diff --git a/docs/markdown/snippets/qt_module_generated_inputs.md b/docs/markdown/snippets/qt_module_generated_inputs.md index f3bc695..a4dfc4c 100644 --- a/docs/markdown/snippets/qt_module_generated_inputs.md +++ b/docs/markdown/snippets/qt_module_generated_inputs.md @@ -1,6 +1,6 @@ ## The qt modules now accept generated outputs as inputs for qt.compile_* -This means you can uset `custom_target`, custom_target indecies +This means you can uset `custom_target`, custom_target indices (`custom_target[0]`, for example), or the output of `generator.process` as inputs to the various `qt.compile_*` methods. |