summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Deininger <adeininger@urbanonline.de>2022-12-12 17:14:20 +0100
committerEli Schwartz <eschwartz93@gmail.com>2022-12-12 12:10:37 -0500
commitb249470a4c1de39a0a56d9237f767fe04d6efa05 (patch)
tree8c215f06683f0451ca1c471d1a4381754f73db09
parent41ab2ef8af22020d28153ab5872dbc5bef4d491e (diff)
downloadmeson-b249470a4c1de39a0a56d9237f767fe04d6efa05.tar.gz
Fixing typos
Convert http to https in some links
-rw-r--r--docs/markdown/Contributing.md2
-rw-r--r--docs/markdown/Qt6-module.md2
-rw-r--r--docs/markdown/snippets/devenv.md2
-rw-r--r--docs/markdown/snippets/rust_bindgen_str_include.md2
-rw-r--r--mesonbuild/modules/sourceset.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/docs/markdown/Contributing.md b/docs/markdown/Contributing.md
index 17f4fd221..b3deefc53 100644
--- a/docs/markdown/Contributing.md
+++ b/docs/markdown/Contributing.md
@@ -450,7 +450,7 @@ To promote consistent naming policy, use:
## Documentation
The `docs` directory contains the full documentation that will be used
-to generate [the Meson web site](http://mesonbuild.com). Line length
+to generate [the Meson web site](https://mesonbuild.com). Line length
in most cases should not exceed 70 characters (lines containing links
or examples are usually exempt). Every change in functionality must
change the documentation pages. In most cases this means updating the
diff --git a/docs/markdown/Qt6-module.md b/docs/markdown/Qt6-module.md
index 6fe783d84..e7b8901b3 100644
--- a/docs/markdown/Qt6-module.md
+++ b/docs/markdown/Qt6-module.md
@@ -142,7 +142,7 @@ See [Qt dependencies](Dependencies.md#qt4-qt5)
The 'modules' argument is used to include Qt modules in the project.
See the Qt documentation for the [list of
-modules](http://doc.qt.io/qt-6/qtmodules.html).
+modules](https://doc.qt.io/qt-6/qtmodules.html).
The 'private_headers' argument allows usage of Qt's modules private
headers.
diff --git a/docs/markdown/snippets/devenv.md b/docs/markdown/snippets/devenv.md
index d8a38bacc..b385203d4 100644
--- a/docs/markdown/snippets/devenv.md
+++ b/docs/markdown/snippets/devenv.md
@@ -11,5 +11,5 @@ directory. For example, `meson devenv -C builddir --workdir .` can be used to
remain in the current dir (often source dir) instead.
`--dump` now prints shell commands like `FOO="/prepend/path:$FOO:/append/path"`,
-using the litteral `$FOO` instead of current value of `FOO` from environment.
+using the literal `$FOO` instead of current value of `FOO` from environment.
This makes easier to evaluate those expressions in a different environment.
diff --git a/docs/markdown/snippets/rust_bindgen_str_include.md b/docs/markdown/snippets/rust_bindgen_str_include.md
index aad5da9b9..2a42951ab 100644
--- a/docs/markdown/snippets/rust_bindgen_str_include.md
+++ b/docs/markdown/snippets/rust_bindgen_str_include.md
@@ -1,4 +1,4 @@
## 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 consistancy.
+`IncludeDirectory` objects, so lets do that here too for consistency.
diff --git a/mesonbuild/modules/sourceset.py b/mesonbuild/modules/sourceset.py
index 7bec2b718..c35416e5a 100644
--- a/mesonbuild/modules/sourceset.py
+++ b/mesonbuild/modules/sourceset.py
@@ -75,7 +75,7 @@ class SourceSetRule(T.NamedTuple):
"""Other sourcesets added when this rule's conditions are true"""
if_false: T.List[T.Union[mesonlib.FileOrString, build.GeneratedTypes]]
- """Source files added when this rule's conditons are false"""
+ """Source files added when this rule's conditions are false"""
class SourceFiles(T.NamedTuple):