diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/markdown/Builtin-options.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-0.51.0.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-1.0.0.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-1.2.0.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-1.3.0.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-1.5.0.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Wrap-dependency-system-manual.md | 4 | ||||
| -rw-r--r-- | docs/refman/generatormd.py | 2 | ||||
| -rw-r--r-- | docs/yaml/functions/build_target.yaml | 2 | ||||
| -rw-r--r-- | docs/yaml/functions/install_data.yaml | 2 | ||||
| -rw-r--r-- | docs/yaml/objects/compiler.yaml | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/docs/markdown/Builtin-options.md b/docs/markdown/Builtin-options.md index 2018b9575..f16a46ffe 100644 --- a/docs/markdown/Builtin-options.md +++ b/docs/markdown/Builtin-options.md @@ -187,7 +187,7 @@ with previous meson versions), 'static', or 'auto'. With auto, the value from `default_library` option is used, unless it is 'both', in which case 'shared' is used instead. -When `default_both_libraries` is 'auto', passing a [[@both_libs]] dependecy +When `default_both_libraries` is 'auto', passing a [[@both_libs]] dependency in [[both_libraries]] will link the static dependency with the static lib, and the shared dependency with the shared lib. diff --git a/docs/markdown/Release-notes-for-0.51.0.md b/docs/markdown/Release-notes-for-0.51.0.md index 635fbbdda..d4eaa5e52 100644 --- a/docs/markdown/Release-notes-for-0.51.0.md +++ b/docs/markdown/Release-notes-for-0.51.0.md @@ -143,7 +143,7 @@ then invoke Meson as `meson setup builddir/ -Dcmake_prefix_path=/tmp/dep` You can tag a test as needing to fail like this: ```meson -test('shoulfail', exe, should_fail: true) +test('shouldfail', exe, should_fail: true) ``` If the test passes the problem is reported in the error logs but due diff --git a/docs/markdown/Release-notes-for-1.0.0.md b/docs/markdown/Release-notes-for-1.0.0.md index 42c05ddab..2399373b1 100644 --- a/docs/markdown/Release-notes-for-1.0.0.md +++ b/docs/markdown/Release-notes-for-1.0.0.md @@ -59,7 +59,7 @@ Any include paths in these dependencies will be passed to the underlying call to ## String arguments to the rust.bindgen include_directories argument Most other cases of include_directories accept strings as well as -`IncludeDirectory` objects, so lets do that here too for consistency. +`IncludeDirectory` objects, so let's do that here too for consistency. ## The Rust module is stable diff --git a/docs/markdown/Release-notes-for-1.2.0.md b/docs/markdown/Release-notes-for-1.2.0.md index 23312164e..6e321b6d4 100644 --- a/docs/markdown/Release-notes-for-1.2.0.md +++ b/docs/markdown/Release-notes-for-1.2.0.md @@ -49,7 +49,7 @@ directory, instead of using Visual Studio's native engine. ## More data in introspection files - Used compilers are listed in `intro-compilers.json` -- Informations about `host`, `build` and `target` machines +- Information about `host`, `build` and `target` machines are lister in `intro-machines.json` - `intro-dependencies.json` now includes internal dependencies, and relations between dependencies. diff --git a/docs/markdown/Release-notes-for-1.3.0.md b/docs/markdown/Release-notes-for-1.3.0.md index cf6ad46ae..1a1d04898 100644 --- a/docs/markdown/Release-notes-for-1.3.0.md +++ b/docs/markdown/Release-notes-for-1.3.0.md @@ -39,7 +39,7 @@ about its value. ## [[configure_file]] now has a `macro_name` parameter. -This new paramater, `macro_name` allows C macro-style include guards to be added +This new parameter, `macro_name` allows C macro-style include guards to be added to [[configure_file]]'s output when a template file is not given. This change simplifies the creation of configure files that define macros with dynamic names and want the C-style include guards. diff --git a/docs/markdown/Release-notes-for-1.5.0.md b/docs/markdown/Release-notes-for-1.5.0.md index 7dfea9af2..794efe47c 100644 --- a/docs/markdown/Release-notes-for-1.5.0.md +++ b/docs/markdown/Release-notes-for-1.5.0.md @@ -19,7 +19,7 @@ Cargo dependencies names are now in the format `<package_name>-<version>-rs`: * `x.y.z` -> 'x' * `0.x.y` -> '0.x' * `0.0.x` -> '0' - It allows to make different dependencies for uncompatible versions of the same + It allows to make different dependencies for incompatible versions of the same crate. - `-rs` suffix is added to distinguish from regular system dependencies, for example `gstreamer-1.0` is a system pkg-config dependency and `gstreamer-0.22-rs` diff --git a/docs/markdown/Wrap-dependency-system-manual.md b/docs/markdown/Wrap-dependency-system-manual.md index 3983d2877..60568f1d8 100644 --- a/docs/markdown/Wrap-dependency-system-manual.md +++ b/docs/markdown/Wrap-dependency-system-manual.md @@ -323,7 +323,7 @@ name: * `x.y.z` -> 'x' * `0.x.y` -> '0.x' * `0.0.x` -> '0' - It allows to make different dependencies for uncompatible versions of the same + It allows to make different dependencies for incompatible versions of the same crate. - `-rs` suffix is added to distinguish from regular system dependencies, for example `gstreamer-1.0` is a system pkg-config dependency and `gstreamer-0.22-rs` @@ -359,7 +359,7 @@ the main project depends on `foo-1-rs` and `bar-1-rs`, and they both depend on configure `common-rs` with a set of features. Later, when `bar-1-rs` does a lookup for `common-1-rs` it has already been configured and the set of features cannot be changed. If `bar-1-rs` wants extra features from `common-1-rs`, Meson will error out. -It is currently the responsability of the main project to resolve those +It is currently the responsibility of the main project to resolve those issues by enabling extra features on each subproject: ```meson project(..., diff --git a/docs/refman/generatormd.py b/docs/refman/generatormd.py index 2c80ab023..854712d53 100644 --- a/docs/refman/generatormd.py +++ b/docs/refman/generatormd.py @@ -94,7 +94,7 @@ class GeneratorMD(GeneratorBase): def _link_to_object(self, obj: T.Union[Function, Object], in_code_block: bool = False) -> str: ''' - Generate a palaceholder tag for the function/method/object documentation. + Generate a placeholder tag for the function/method/object documentation. This tag is then replaced in the custom hotdoc plugin. ''' prefix = '#' if in_code_block else '' diff --git a/docs/yaml/functions/build_target.yaml b/docs/yaml/functions/build_target.yaml index 74d45f007..a56fe75fe 100644 --- a/docs/yaml/functions/build_target.yaml +++ b/docs/yaml/functions/build_target.yaml @@ -32,7 +32,7 @@ description: | The returned object also has methods that are documented in [[@build_tgt]]. - *"jar" is deprecated because it is fundementally a different thing than the + *"jar" is deprecated because it is fundamentally a different thing than the other build_target types. posargs_inherit: _build_target_base diff --git a/docs/yaml/functions/install_data.yaml b/docs/yaml/functions/install_data.yaml index ff4f3363d..9ed09a75c 100644 --- a/docs/yaml/functions/install_data.yaml +++ b/docs/yaml/functions/install_data.yaml @@ -13,7 +13,7 @@ varargs: warnings: - the `install_mode` kwarg ignored integer values between 0.59.0 -- 1.1.0. - an omitted `install_dir` kwarg did not work correctly inside of a subproject until 1.3.0. - - an omitted `install_dir` kwarg did not work correctly when combined with the `preserve_path` kwarg untill 1.3.0. + - an omitted `install_dir` kwarg did not work correctly when combined with the `preserve_path` kwarg until 1.3.0. kwargs: install_dir: diff --git a/docs/yaml/objects/compiler.yaml b/docs/yaml/objects/compiler.yaml index cd988a683..43831d2c1 100644 --- a/docs/yaml/objects/compiler.yaml +++ b/docs/yaml/objects/compiler.yaml @@ -612,7 +612,7 @@ methods: # kwargs: # checked: # type: str - # sinec: 0.59.0 + # since: 0.59.0 # default: "'off'" # description: | # Supported values: |