diff options
Diffstat (limited to 'docs/users')
| -rw-r--r-- | docs/users/android.md | 6 | ||||
| -rw-r--r-- | docs/users/config-environment.md | 4 | ||||
| -rw-r--r-- | docs/users/versioning.implementation-details.md | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docs/users/android.md b/docs/users/android.md index 58f2807de..45b0cf616 100644 --- a/docs/users/android.md +++ b/docs/users/android.md @@ -2,7 +2,7 @@ **The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/android.md).** -Android is not officialy supported, and there are no official android triplets at the moment. +Android is not officially supported, and there are no official android triplets at the moment. However, some packages can compile to Android, and the situation is improving: see the list of [PR related to Android](https://github.com/Microsoft/vcpkg/pulls?q=+android+). @@ -149,7 +149,7 @@ Starting package 1/2: vulkan:arm64-android Building package vulkan[core]:arm64-android... -- Using community triplet arm64-android. This triplet configuration is not guaranteed to succeed. -- [COMMUNITY] Loading triplet configuration from: /.../vcpkg/triplets/community/arm64-android.cmake --- Querying VULKAN_SDK Enviroment variable +-- Querying VULKAN_SDK Environment variable -- Searching /.../Library/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/vulkan/ for vulkan.h -- Found vulkan.h -- Performing post-build validation @@ -208,7 +208,7 @@ cmake \ ... ```` -2. Specifiy the android abi and vcpkg triplet +2. Specify the android abi and vcpkg triplet When compiling for android, you need to select a matching "android abi" / "vcpkg triplet" pair. diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md index a63116af3..b8353e4e8 100644 --- a/docs/users/config-environment.md +++ b/docs/users/config-environment.md @@ -49,7 +49,7 @@ This environment variable can be set to a triplet name which will be used for un This environment variable allows users to override ports with alternate versions according to the
[ports overlay](../specifications/ports-overlay.md) specification. List paths to overlays using
-the platform dependent PATH seperator (Windows `;` | others `:`)
+the platform dependent PATH separator (Windows `;` | others `:`)
Example (Windows): `C:\custom-ports\boost;C:\custom-ports\sqlite3`
@@ -57,7 +57,7 @@ Example (Windows): `C:\custom-ports\boost;C:\custom-ports\sqlite3` This environment variable allows users to add directories to search for triplets.
[Example: overlay triplets](../examples/overlay-triplets-linux-dynamic.md).
-List paths to overlays using the platform dependent PATH seperator (Windows `;`, others `:`)
+List paths to overlays using the platform dependent PATH separator (Windows `;`, others `:`)
#### VCPKG_FORCE_SYSTEM_BINARIES
diff --git a/docs/users/versioning.implementation-details.md b/docs/users/versioning.implementation-details.md index 02645ec81..e264e9ebf 100644 --- a/docs/users/versioning.implementation-details.md +++ b/docs/users/versioning.implementation-details.md @@ -67,7 +67,7 @@ Version constraints come in the following flavors: * **Declared constraints**: Constraints declared explicitly in the top-level manifest using `version>=`.
* **Baseline constraints**: Constraints added implicitly by the `builtin-baseline`.
* **Transitive constraints**: Constraints added indirectly by dependencies of your dependencies.
-* **Overriden constraints**: Constraints overriden in the top-level manifest using `overrides` declarations.
+* **Overridden constraints**: Constraints overridden in the top-level manifest using `overrides` declarations.
To compute an installation plan, vcpkg follows roughly these steps:
|