diff options
Diffstat (limited to 'docs/markdown')
| -rw-r--r-- | docs/markdown/Creating-OSX-packages.md | 4 | ||||
| -rw-r--r-- | docs/markdown/Dependencies.md | 4 | ||||
| -rw-r--r-- | docs/markdown/Generating-sources.md | 2 | ||||
| -rw-r--r-- | docs/markdown/GuiTutorial.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-0.57.0.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-0.62.0.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-0.63.0.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Unit-tests.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Yaml-RefMan.md | 2 | ||||
| -rw-r--r-- | docs/markdown/_include_qt_base.md | 2 | ||||
| -rw-r--r-- | docs/markdown/snippets/conf_pager.md | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/docs/markdown/Creating-OSX-packages.md b/docs/markdown/Creating-OSX-packages.md index 5a30b97..7e0d05b 100644 --- a/docs/markdown/Creating-OSX-packages.md +++ b/docs/markdown/Creating-OSX-packages.md @@ -132,7 +132,7 @@ ready for distribution. #### Qt Qt offers a [deployment tool](https://doc.qt.io/qt-5/macos-deployment.html#macdeploy), -called `macdeployqt`, that automatizes bundling Qt's libraries in your application folder and +called `macdeployqt`, that automates bundling Qt's libraries in your application folder and optionally create the final `.dmg` installer ```console @@ -140,7 +140,7 @@ optionally create the final `.dmg` installer macdeployqt myapp.app -executable=myapp.app/Contents/MacOS/myapp ``` -This copies the needed Qt libaries to the correct subfolders within `myapp.app`. +This copies the needed Qt libraries to the correct subfolders within `myapp.app`. The `-executable=myapp.app/Contents/MacOS/myapp` argument is to automatically alter the search path of the executable `myapp.app/Contents/MacOS/myapp` for the Qt libraries. One can also pass the `-dmg` diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md index 0938e06..6eab6ab 100644 --- a/docs/markdown/Dependencies.md +++ b/docs/markdown/Dependencies.md @@ -570,7 +570,7 @@ versions would statically link, due to a quirk in `llvm-config`. ### Modules, a.k.a. Components -Meson wraps LLVM's concept of components in it's own modules concept. +Meson wraps LLVM's concept of components in its own modules concept. When you need specific components you add them as modules as Meson will do the right thing: @@ -756,7 +756,7 @@ See [threads](Threads.md). ## Valgrind Meson will find valgrind using `pkg-config`, but only uses the -compilation flags and avoids trying to link with it's non-PIC static +compilation flags and avoids trying to link with its non-PIC static libs. ## Vulkan diff --git a/docs/markdown/Generating-sources.md b/docs/markdown/Generating-sources.md index 3cdfbc4..b954a41 100644 --- a/docs/markdown/Generating-sources.md +++ b/docs/markdown/Generating-sources.md @@ -75,7 +75,7 @@ executable('myexe', ['main.c', foo_h], link_with : libfoo) ``` Each target that depends on a generated header should add that header -to it's sources, as seen above with `libfoo` and `myexe`. This is +to its sources, as seen above with `libfoo` and `myexe`. This is because there is no way for Meson or the backend to know that `myexe` depends on `foo.h` just because `libfoo` does, it could be a private header. diff --git a/docs/markdown/GuiTutorial.md b/docs/markdown/GuiTutorial.md index 6990eef..85930d7 100644 --- a/docs/markdown/GuiTutorial.md +++ b/docs/markdown/GuiTutorial.md @@ -181,7 +181,7 @@ the system downloads and configures SDL2:  -A bit later the compilation exits succesfully. +A bit later the compilation exits successfully.  diff --git a/docs/markdown/Release-notes-for-0.57.0.md b/docs/markdown/Release-notes-for-0.57.0.md index 4ac003c..f16cf24 100644 --- a/docs/markdown/Release-notes-for-0.57.0.md +++ b/docs/markdown/Release-notes-for-0.57.0.md @@ -337,7 +337,7 @@ Likewise, `add_test_setup(..., timeout_multiplier: 0)`, or Both the gnu linker and lld support using threads for speeding up LTO, meson now provides a knob for this: `-Db_lto_threads`. Currently this is only supported for clang and gcc. Any positive integer is supported, `0` means -`auto`. If the compiler or linker implements it's on `auto` we use that, +`auto`. If the compiler or linker implements its own `auto` we use that, otherwise the number of threads on the machine is used. ## `summary()` now uses left alignment for both keys and values diff --git a/docs/markdown/Release-notes-for-0.62.0.md b/docs/markdown/Release-notes-for-0.62.0.md index f5382df..cc32ac6 100644 --- a/docs/markdown/Release-notes-for-0.62.0.md +++ b/docs/markdown/Release-notes-for-0.62.0.md @@ -176,7 +176,7 @@ Meson has a new command `env2mfile` that can be used to convert "environment variable based" cross and native compilation environments to Meson machine files. This is especially convenient for e.g. distro packagers so they can easily generate unambiguous configuration files -for packge building. +for package building. As an example here's how you would generate a cross file that takes its settings from the `CC`, `CXX`, `CFLAGS` etc environment variables. diff --git a/docs/markdown/Release-notes-for-0.63.0.md b/docs/markdown/Release-notes-for-0.63.0.md index f64c2a3..9f8da3e 100644 --- a/docs/markdown/Release-notes-for-0.63.0.md +++ b/docs/markdown/Release-notes-for-0.63.0.md @@ -247,7 +247,7 @@ set explicitly (in which case that will take precedence). ## Added support for multiline fstrings Added support for multiline f-strings which use the same syntax as f-strings -for string substition. +for string substitution. ```meson x = 'hello' diff --git a/docs/markdown/Unit-tests.md b/docs/markdown/Unit-tests.md index 421270e..664f99e 100644 --- a/docs/markdown/Unit-tests.md +++ b/docs/markdown/Unit-tests.md @@ -279,7 +279,7 @@ When tests use the `tap` protocol each test will be recorded as a testsuite container, with each case named by the number of the result. When tests use the `gtest` protocol Meson will inject arguments to the -test to generate it's own JUnit XML, which Meson will include as part +test to generate its own JUnit XML, which Meson will include as part of this XML file. *New in 0.55.0* diff --git a/docs/markdown/Yaml-RefMan.md b/docs/markdown/Yaml-RefMan.md index 0e59bf5..1bb800f 100644 --- a/docs/markdown/Yaml-RefMan.md +++ b/docs/markdown/Yaml-RefMan.md @@ -115,7 +115,7 @@ warnings: - Warnings are also optional. -# To avoid duplicating documentation / code, argument inheritence is supported with +# To avoid duplicating documentation / code, argument inheritance is supported with # the following optional keys: posargs_inherit: _build_target_base # Use the posargs definition of `_build_target_base` here diff --git a/docs/markdown/_include_qt_base.md b/docs/markdown/_include_qt_base.md index e624c17..0ecd63a 100644 --- a/docs/markdown/_include_qt_base.md +++ b/docs/markdown/_include_qt_base.md @@ -7,7 +7,7 @@ Compiles Qt's resources collection files (.qrc) into c++ files for compilation. It takes no positional arguments, and the following keyword arguments: - `name` (string | empty): if provided a single .cpp file will be generated, and the output of all qrc files will be combined in this file, otherwise - each qrc file be written to it's own cpp file. + each qrc file be written to its own cpp file. - `sources` (File | string | custom_target | custom_target index | generator_output)[]: A list of sources to be transpiled. Required, must have at least one source *New in 0.60.0*: support for custom_target, custom_target_index, and generator_output. diff --git a/docs/markdown/snippets/conf_pager.md b/docs/markdown/snippets/conf_pager.md index 8924adc..3d936ad 100644 --- a/docs/markdown/snippets/conf_pager.md +++ b/docs/markdown/snippets/conf_pager.md @@ -2,5 +2,5 @@ The output of `meson configure`, printing all options, is now more readable by automatically using a pager (`less` by default) and colors. The pager used can -be controled by setting `PAGER` environment variable, or `--no-pager` command +be controlled by setting `PAGER` environment variable, or `--no-pager` command line option. |