Skip to content

Commit

Permalink
fix various spelling issues
Browse files Browse the repository at this point in the history
Signed-off-by: Josh Soref <[email protected]>
  • Loading branch information
jsoref authored and eli-schwartz committed Apr 11, 2023
1 parent e238b81 commit cf9fd56
Show file tree
Hide file tree
Showing 151 changed files with 248 additions and 248 deletions.
4 changes: 2 additions & 2 deletions ci/run.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if ($LastExitCode -ne 0) {
exit 0
}

# remove Chocolately, MinGW, Strawberry Perl from path, so we don't find gcc/gfortran and try to use it
# remove Chocolatey, MinGW, Strawberry Perl from path, so we don't find gcc/gfortran and try to use it
# remove PostgreSQL from path so we don't pickup a broken zlib from it
$env:Path = ($env:Path.Split(';') | Where-Object { $_ -notmatch 'mingw|Strawberry|Chocolatey|PostgreSQL' }) -join ';'

Expand Down Expand Up @@ -76,7 +76,7 @@ foreach ($prog in $progs) {


echo ""
echo "Ninja / MSBuld version:"
echo "Ninja / MSBuild version:"
if ($env:backend -eq 'ninja') {
ninja --version
} else {
Expand Down
2 changes: 1 addition & 1 deletion cross/iphone.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is a cross compilation file from OSX Yosemite to iPhone
# Apple keeps changing the location and names of files so
# these might not work for you. Use the googels and xcrun.
# these might not work for you. Use the googles and xcrun.

[binaries]
c = ['clang', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk']
Expand Down
2 changes: 1 addition & 1 deletion cross/tvos.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is a cross compilation file from OSX Yosemite to Apple tvOS
# Apple keeps changing the location and names of files so
# these might not work for you. Use the googels and xcrun.
# these might not work for you. Use the googles and xcrun.

[binaries]
c = ['clang', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Adding-new-projects-to-wrapdb.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,6 @@ The first command is to ensure the wrap is correctly fetched from the
latest packagefiles. The second command configures meson and selects a
set of subprojects to enable.

The Github project contains automatic CI on pushing to run the project
The GitHub project contains automatic CI on pushing to run the project
and check the metadata for obvious mistakes. This can be checked from
your fork before submitting a PR.
4 changes: 2 additions & 2 deletions docs/markdown/Contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Thank you for your interest in participating to the development.
## Submitting patches

All changes must be submitted as [pull requests to
Github](https://github.com/mesonbuild/meson/pulls). This causes them
GitHub](https://github.com/mesonbuild/meson/pulls). This causes them
to be run through the CI system. All submissions must pass a full CI
test run before they are even considered for submission.

Expand Down Expand Up @@ -110,7 +110,7 @@ Meson's merge strategy should fulfill the following guidelines:

These goals are slightly contradictory so the correct thing to do
often requires some judgement on part of the person doing the
merge. Github provides three different merge options, The rules of
merge. GitHub provides three different merge options, The rules of
thumb for choosing between them goes like this:

- single commit pull requests should always be rebased
Expand Down
4 changes: 2 additions & 2 deletions docs/markdown/Fs-module.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Examples:
x = 'foo.txt'
y = 'sub/../foo.txt'
z = 'bar.txt' # a symlink pointing to foo.txt
j = 'notafile.txt' # non-existent file
j = 'notafile.txt' # nonexistent file
fs.is_samepath(x, y) # true
fs.is_samepath(x, z) # true
Expand All @@ -99,7 +99,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-existent directory
s = 'notapath' # nonexistent directory
fs.is_samepath(p, q) # true
fs.is_samepath(p, r) # true
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/IDE-integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ The list of all _found_ dependencies can be acquired from
`intro-dependencies.json`. Here, the name, version, compiler and
linker arguments for a dependency are listed.

### Scanning for dependecie with `--scan-dependencies`
### Scanning for dependencies with `--scan-dependencies`

It is also possible to get most dependencies used without a build
directory. This can be done by running `meson introspect
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/MesonCI.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ The Dockerfile is generated from the `image.json` file and basically
only adds a few common files and runs the `install.sh` script which
should contain all distribution specific setup steps. The `common.sh`
can be sourced via `source /ci/common.sh` to access some shared
functionalety.
functionality.

To generate the image run `build.py -t build <image>`. A generated
image can be tested with `build.py -t test <image>`.
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Qt6-module.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ This method takes the following keyword arguments:
- `ui_files`: (string | File | CustomTarget)[]: Passed the `uic` compiler
- `moc_sources`: (string | File | CustomTarget)[]: Passed the `moc` compiler.
These are converted into .moc files meant to be `#include`ed
- `moc_headers`: (string | File | CustomTarget)[]: Passied the `moc` compiler.
- `moc_headers`: (string | File | CustomTarget)[]: Passed the `moc` compiler.
These will be converted into .cpp files
- `include_directories` (IncludeDirectories | string)[], the directories to add
to header search path for `moc`
Expand Down
4 changes: 2 additions & 2 deletions docs/markdown/Reference-tables.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ These are provided by the `.system()` method call.
| cygwin | The Cygwin environment for Windows |
| darwin | Either OSX or iOS |
| dragonfly | DragonFly BSD |
| emscripten | Emscripten's Javascript environment |
| emscripten | Emscripten's JavaScript environment |
| freebsd | FreeBSD and its derivatives |
| gnu | GNU Hurd |
| haiku | |
Expand Down Expand Up @@ -329,7 +329,7 @@ machine](#Environment-variables-per-machine) section for details.
| C# | CSC | CSC | The linker is the compiler |
| nasm | NASM | | Uses the C linker |

*The old environment variales are still supported, but are deprecated
*The old environment variables are still supported, but are deprecated
and will be removed in a future version of Meson.*

## Environment variables per machine
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Release-notes-for-0.40.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ qt5_dep = dependency('qt5', modules : 'core', method : 'qmake')
## Link whole contents of static libraries

The default behavior of static libraries is to discard all symbols
that are not not directly referenced. This may lead to exported
that are not directly referenced. This may lead to exported
symbols being lost. Most compilers support "whole archive" linking
that includes all symbols and code of a given static library. This is
exposed with the `link_whole` keyword.
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Release-notes-for-0.45.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ int_255 = 0xFF
The value `if-release` can be given for the `b_ndebug` project option.

This will make the `NDEBUG` pre-compiler macro to be defined for
release type builds as if the `b_ndebug` project option had had the
release type builds as if the `b_ndebug` project option had the
value `true` defined for it.

## `install_data()` defaults to `{datadir}/{projectname}`
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Release-notes-for-0.46.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ helper = static_library(
final = shared_library(
'final',
['final.c'],
dependencyes : dep,
dependencies : dep,
)
```

Expand Down
4 changes: 2 additions & 2 deletions docs/markdown/Release-notes-for-0.48.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use, such as *debug* and *minsize*. There is also a *plain* type that
adds nothing by default but instead makes it the user's responsibility
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.
In this release we have added 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 optimization enabled at all. If you wish to use GCC's
Expand Down Expand Up @@ -79,7 +79,7 @@ which has special properties such as not buffering stdout and
serializing all targets in this pool.

The primary use-case for this is to be able to run external commands
that take a long time to exeute. Without setting this, the user does
that take a long time to execute. Without setting this, the user does
not receive any feedback about what the program is doing.

## `dependency(version:)` now applies to all dependency types
Expand Down
4 changes: 2 additions & 2 deletions docs/markdown/Release-notes-for-0.50.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ Furthermore, the `filename` and `install_filename` keys in the targets
introspection are now lists of strings with identical length.

The `--target-files` option is now deprecated, since the same information
can be acquired from the `--tragets` introspection API.
can be acquired from the `--targets` introspection API.

## Meson file rewriter

Expand Down Expand Up @@ -317,7 +317,7 @@ A complete introspection dump is also stored in the `meson-info`
directory. This dump will be (re)generated each time meson updates the
configuration of the build directory.

Additionlly the format of `meson introspect target` was changed:
Additionally the format of `meson introspect target` was changed:

- New: the `sources` key. It stores the source files of a target and their compiler parameters.
- New: the `defined_in` key. It stores the Meson file where a target is defined
Expand Down
4 changes: 2 additions & 2 deletions docs/markdown/Release-notes-for-0.52.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ linker internal re-architecture this has become possible

## Compiler and dynamic linker representation split

0.52.0 includes a massive refactor of the representaitons of compilers to
0.52.0 includes a massive refactor of the representations 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.
Expand Down Expand Up @@ -160,7 +160,7 @@ lib2 = static_library(other_sources, link_whole : lib1, install : true)
```
- `link_with:` of a static library with an uninstalled static library. In the
example below, lib2 now implicitly promote `link_with:` to `link_whole:` because
the installed lib2 would oterhwise be unusable.
the installed lib2 would otherwise be unusable.
```meson
lib1 = static_library(sources, install : false)
lib2 = static_library(sources, link_with : lib1, install : true)
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Release-notes-for-0.54.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ This old behavior is inconsistent with the way Autotools works, which
undermines the purpose of distro-integration that is the only reason
environment variables are supported at all in Meson. The new behavior
is not quite the same, but doesn't conflict: Meson doesn't always
repond to an environment when Autoconf would, but when it does it
respond to an environment when Autoconf would, but when it does it
interprets it as Autotools would.

## Added 'pkg_config_libdir' property
Expand Down
4 changes: 2 additions & 2 deletions docs/markdown/Release-notes-for-0.55.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Meson now supports passing configuration options to CMake and
overriding certain build details extracted from the CMake subproject.

The new CMake configuration options object is very similar to the
[[@cfg_data]] object object returned
[[@cfg_data]] object returned
by [[configuration_data]]. It
is generated by the `subproject_options` function

Expand Down Expand Up @@ -175,7 +175,7 @@ changed), but is now deprecated.
## String concatenation in meson_options.txt

It is now possible to use string concatenation (with the `+`
opperator) in the `meson_options.txt` file. This allows splitting long
operator) in the `meson_options.txt` file. This allows splitting long
option descriptions.

```meson
Expand Down
4 changes: 2 additions & 2 deletions docs/markdown/Release-notes-for-0.59.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ executable(
## New `build target` methods

The [[@build_tgt]] object now supports
the following two functions, to ensure feature compatebility with
the following two functions, to ensure feature compatibility with
[[@external_program]] objects:

- `found()`: Always returns `true`. This function is meant
Expand All @@ -205,7 +205,7 @@ the following two functions, to ensure feature compatebility with
use-cases where an executable is used instead of an external program.

- `path()`: **(deprecated)** does the exact same as `full_path()`.
**NOTE:** This function is solely kept for compatebility
**NOTE:** This function is solely kept for compatibility
with `external program` objects. It will be
removed once the, also deprecated, corresponding `path()` function in the
`external program` object is removed.
Expand Down
4 changes: 2 additions & 2 deletions docs/markdown/Release-notes-for-0.60.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ be flattened.

## The qt modules now accept generated outputs as inputs for qt.compile_*

This means you can uset `custom_target`, custom_target indices
This means you can use `custom_target`, custom_target indices
(`custom_target[0]`, for example), or the output of `generator.process` as
inputs to the various `qt.compile_*` methods.

Expand Down Expand Up @@ -357,7 +357,7 @@ are found, and silently continue if Visual Studio activation fails.

`meson setup --vsenv` command line argument can now be used to force Visual Studio
activation even when other compilers are found. It also make Meson abort with an
error message when activation fails. This is especially useful for Github Action
error message when activation fails. This is especially useful for GitHub Actions
because their Windows images have gcc in their PATH by default.

`--vsenv` is set by default when using `vs` backend.
Expand Down
4 changes: 2 additions & 2 deletions docs/markdown/Release-notes-for-0.62.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ directory, that file is loaded by gdb automatically.

## Print modified environment variables with `meson devenv --dump`

With `--dump` option, all envorinment variables that have been modified are
With `--dump` option, all environment variables that have been modified are
printed instead of starting an interactive shell. It can be used by shell
scripts that wish to setup their environment themself.
scripts that wish to setup their environment themselves.

## New `method` and `separator` kwargs on `environment()` and `meson.add_devenv()`

Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Release-notes-for-0.63.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ and the resulting directory tree will look like
## JAR Resources

The ability to add resources to a JAR has been added. Use the `java_resources`
keyword argument. It takes a `sturctured_src` object.
keyword argument. It takes a `structured_src` object.

```meson
jar(
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Release-notes-for-1.0.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Meson function name styling.

The `bindgen` method of the `rust` module now accepts a dependencies argument.
Any include paths in these dependencies will be passed to the underlying call to
`clang`, and the call to `bindgen` will correctly depend on any generatd sources.
`clang`, and the call to `bindgen` will correctly depend on any generated sources.

## String arguments to the rust.bindgen include_directories argument

Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Release-procedure.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Before a major release is made a stable branch will be made, and
will be made, and all bugs effecting the RC will be assigned to this
milestone. Patches fixing bugs in the milestone will be picked to the
stable branch, and normal development will continue on the master
branch. Every week after after this a new release candidate will be
branch. Every week after this a new release candidate will be
made until all bugs are resolved in that milestone. When all of the
bugs are fixed the 0.X.0 release will be made.

Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Rewriter.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ mode", on the other hand, is meant to be used by external programs

The rewriter itself is considered stable, however the user interface
and the "script mode" API might change in the future. These changes
may also break backwards comaptibility to older releases.
may also break backwards compatibility to older releases.

We are also open to suggestions for API improvements.

Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Rust-module.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ generated = rust.bindgen(
)
```

If the header depeneds on generated headers, those headers must be passed to
If the header depends on generated headers, those headers must be passed to
`bindgen` as well to ensure proper dependency ordering, static headers do not
need to be passed, as a proper depfile is generated:

Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Simple-comparison.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ how much time the build system takes to check the states of all source
files because if any of them could potentially cause a rebuild.
Since CMake has two different backends, Make and Ninja, we ran the
tests on both of them. All tests were run on a 2011 era Macbook Pro
tests on both of them. All tests were run on a 2011 era MacBook Pro
running Ubuntu 13/04. The tests were run multiple times and we always
took the fastest time.
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Subprojects.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ the following command-line options:
* **--wrap-mode=nodownload**

Meson will not use the network to download any subprojects or
fetch any wrap information. Only pre-existing sources will be used.
fetch any wrap information. Only preexisting sources will be used.
This is useful (mostly for distros) when you want to only use the
sources provided by a software release, and want to manually handle
or provide missing dependencies.
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Syntax.md
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ additive_expression: multiplicative_expression | (additive_expression additive_o
additive_operator: "+" | "-"
argument_list: positional_arguments ["," keyword_arguments] | keyword_arguments
array_literal: "[" [expression_list] "]"
assignment_statement: expression asssignment_operator expression
assignment_statement: expression assignment_operator expression
assignment_operator: "=" | "+="
binary_literal: "0b" BINARY_NUMBER
BINARY_NUMBER: /[01]+/
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Users.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ format files
- [Marker](https://github.com/fabiocolacio/Marker), a GTK-3 markdown editor
- [Mesa](https://mesa3d.org/), an open source graphics driver project
- [Miniz](https://github.com/richgel999/miniz), a zlib replacement library
- [MiracleCast](https://github.com/albfan/miraclecast), connect external monitors to your system via Wifi-Display specification aka Miracast
- [MiracleCast](https://github.com/albfan/miraclecast), connect external monitors to your system via WiFi-Display specification aka Miracast
- [mpv](https://github.com/mpv-player/mpv), a free, open source, and cross-platform media player
- [mrsh](https://github.com/emersion/mrsh), a minimal POSIX shell
- [Nautilus](https://gitlab.gnome.org/GNOME/nautilus), the GNOME file manager
Expand Down
4 changes: 2 additions & 2 deletions docs/markdown/Vala.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ executable('app_name', sources, dependencies: dependencies)
```

Using `[GtkTemplate]` also requires the GTK+ user interface definition
files to be built in to the binary as GResources. For completeness,
files to be built into the binary as GResources. For completeness,
the next example shows this:

```meson
Expand Down Expand Up @@ -177,7 +177,7 @@ repository](https://gitlab.gnome.org/GNOME/vala-extra-vapis) is a
community maintained repository of VAPIs that are not distributed.
Developers use the repository to share early work on new bindings and
improvements to existing bindings. So the VAPIs can frequently change.
It is recommended VAPIs from this repository are copied in to your
It is recommended VAPIs from this repository are copied into your
project's source files.

This also works well for starting to write new bindings before they
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Windows-module.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Compiles Windows `rc` files specified in the positional arguments.
Returns a list of `CustomTarget` objects that you put in the list of sources for
the target you want to have the resources in.

*Since 0.61.0* CustomTargetIndexs and CustomTargets with more than out output
*Since 0.61.0* CustomTargetIndexes and CustomTargets with more than out output
*may be used as positional arguments.

This method has the following keyword arguments:
Expand Down
Loading

0 comments on commit cf9fd56

Please sign in to comment.