From 00864ca481c4e29d7f5c648a1e12b934dfa642d2 Mon Sep 17 00:00:00 2001 From: Emil Berg Date: Sun, 6 Apr 2025 10:17:55 +0200 Subject: [PATCH] Fix documentation typos --- docs/markdown/Build-options.md | 2 +- docs/markdown/Builtin-options.md | 6 +++--- docs/markdown/FAQ.md | 2 +- docs/markdown/IDE-integration.md | 2 +- docs/markdown/Include-directories.md | 2 +- docs/markdown/Qt6-module.md | 2 +- docs/markdown/Unit-tests.md | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/markdown/Build-options.md b/docs/markdown/Build-options.md index d615db689..190705d77 100644 --- a/docs/markdown/Build-options.md +++ b/docs/markdown/Build-options.md @@ -222,7 +222,7 @@ a colon: $ meson configure -Dsubproject:option=newvalue ``` -**NOTE:** If you cannot call `meson configure` you likely have a old +**NOTE:** If you cannot call `meson configure` you likely have an old version of Meson. In that case you can call `mesonconf` instead, but that is deprecated in newer versions diff --git a/docs/markdown/Builtin-options.md b/docs/markdown/Builtin-options.md index 56e30885c..faf7a6088 100644 --- a/docs/markdown/Builtin-options.md +++ b/docs/markdown/Builtin-options.md @@ -76,7 +76,7 @@ machine](#specifying-options-per-machine) section for details. | -------------------------------------- | ------------- | ----------- | -------------- | ----------------- | | auto_features {enabled, disabled, auto} | auto | Override value of all 'auto' features | no | no | | backend {ninja, vs,
vs2010, vs2012, vs2013, vs2015, vs2017, vs2019, vs2022, xcode, none} | ninja | Backend to use | no | no | -| genvslite {vs2022} | vs2022 | Setup multi-builtype ninja build directories and Visual Studio solution | no | no | +| genvslite {vs2022} | vs2022 | Setup multi-buildtype ninja build directories and Visual Studio solution | no | no | | buildtype {plain, debug,
debugoptimized, release, minsize, custom} | debug | Build type to use | no | no | | debug | true | Enable debug symbols and other information | no | no | | default_both_libraries {shared, static, auto} | shared | Default library type for both_libraries | no | no | @@ -115,7 +115,7 @@ for a lighter automated build pipeline. Setup multiple buildtype-suffixed, ninja-backend build directories (e.g. [builddir]_[debug/release/etc.]) and generate [builddir]_vs containing a Visual Studio solution with multiple configurations that invoke a meson compile of the -setup build directories, as appropriate for the current configuration (builtype). +setup build directories, as appropriate for the current configuration (buildtype). This has the effect of a simple setup macro of multiple 'meson setup ...' invocations with a set of different buildtype values. E.g. @@ -152,7 +152,7 @@ All other combinations of `debug` and `optimization` set `buildtype` to `'custom #### Details for `warning_level` -Exact flags per warning level is compiler specific, but there is an approximative +Exact flags per warning level is compiler specific, but there is an approximate table for most common compilers. | Warning level | GCC/Clang | MSVC | diff --git a/docs/markdown/FAQ.md b/docs/markdown/FAQ.md index 9daf9ae98..faa4becbe 100644 --- a/docs/markdown/FAQ.md +++ b/docs/markdown/FAQ.md @@ -285,7 +285,7 @@ or they are not called (due to e.g. `if/else`) then nothing is downloaded. If this is not sufficient for you, starting from release 0.40.0 Meson -has a option called `wrap-mode` which can be used to disable wrap +has an option called `wrap-mode` which can be used to disable wrap downloads altogether with `--wrap-mode=nodownload`. You can also disable dependency fallbacks altogether with `--wrap-mode=nofallback`, which also implies the `nodownload` option. diff --git a/docs/markdown/IDE-integration.md b/docs/markdown/IDE-integration.md index ce8d8b42e..a8e9197f7 100644 --- a/docs/markdown/IDE-integration.md +++ b/docs/markdown/IDE-integration.md @@ -10,7 +10,7 @@ this problem, Meson provides an API that makes it easy for any IDE or build tools to integrate Meson builds and provide an experience comparable to a solution native to the IDE. -All the resources required for such a IDE integration can be found in +All the resources required for such an IDE integration can be found in the `meson-info` directory in the build directory. The first thing to do when setting up a Meson project in an IDE is to diff --git a/docs/markdown/Include-directories.md b/docs/markdown/Include-directories.md index f9850ac91..8b0b420f1 100644 --- a/docs/markdown/Include-directories.md +++ b/docs/markdown/Include-directories.md @@ -7,7 +7,7 @@ short-description: Instructions on handling include directories Most `C`/`C++` projects have headers in different directories than sources. Thus you need to specify include directories. Let's assume that we are at some subdirectory and wish to add its `include` -subdirectory to some target's search path. To create a include +subdirectory to some target's search path. To create an include directory object we do this: ```meson diff --git a/docs/markdown/Qt6-module.md b/docs/markdown/Qt6-module.md index f3b3a32a0..ebe42a50c 100644 --- a/docs/markdown/Qt6-module.md +++ b/docs/markdown/Qt6-module.md @@ -69,7 +69,7 @@ It takes no positional arguments, and the following keyword arguments: directory. For instance, when a file called `subdir/one.input` is processed it generates a file `{target private directory}/subdir/one.out` when `true`, and `{target private directory}/one.out` when `false` (default). - - `output_json` bool: *New in 1.7.0*. If `true`, generates additionnaly a + - `output_json` bool: *New in 1.7.0*. If `true`, generates additionally a JSON representation which may be used by external tools such as qmltyperegistrar ## preprocess diff --git a/docs/markdown/Unit-tests.md b/docs/markdown/Unit-tests.md index ab93b715f..9654bc4fc 100644 --- a/docs/markdown/Unit-tests.md +++ b/docs/markdown/Unit-tests.md @@ -312,7 +312,7 @@ For further information see the command line help of Meson by running ## Legacy notes -If `meson test` does not work for you, you likely have a old version +If `meson test` does not work for you, you likely have an old version of Meson. In that case you should call `mesontest` instead. If `mesontest` doesn't work either you have a very old version prior to 0.37.0 and should upgrade.