Skip to content

Commit 7bd7dc6

Browse files
authored
Merge pull request #3032 from peternewman/patch-5
Fix various typos
2 parents 39f051b + b340656 commit 7bd7dc6

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

_data/snippets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ github_oauth_access_rights: |
128128
129129
This is not how Travis CI accesses your data, however we can explain it later in the process.
130130
131-
The warning is triggerred due to GitHub OAuth App permissions which Travis CI uses, and due to the available granularity of permission scopes (see GitHub [Scopes for OAuth Apps documentation](https://docs.github.com/en/developers/apps/scopes-for-oauth-apps) ).
131+
The warning is triggered due to GitHub OAuth App permissions which Travis CI uses, and due to the available granularity of permission scopes (see GitHub [Scopes for OAuth Apps documentation](https://docs.github.com/en/developers/apps/scopes-for-oauth-apps) ).
132132
133133
**Travis CI does not access all your repositories by default**.
134134

_includes/deploy/providers/testfairy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Use the following options to further configure the deployment.
2727
| `symbols_file` | Path to the symbols file — type: string |
2828
| `testers_groups` | Tester groups to be notified about this build — type: string, e.g.: e.g. group1,group1 |
2929
| `notify` | Send an email with a changelog to your users — type: boolean |
30-
| `auto_update` | Automaticall upgrade all the previous installations of this app this version — type: boolean |
30+
| `auto_update` | Automatically upgrade all the previous installations of this app this version — type: boolean |
3131
| `advanced_options` | Comma_separated list of advanced options — type: string, e.g.: option1,option2 |
3232

3333
### Shared options
@@ -41,4 +41,4 @@ All options can be given as environment variables if prefixed with `TESTFAIRY_`.
4141

4242
For example, `api_key` can be given as `TESTFAIRY_API_KEY=<api_key>`.
4343

44-
{% include deploy/secrets.md name="api_key" env_name="TESTFAIRY_API_KEY" %}
44+
{% include deploy/secrets.md name="api_key" env_name="TESTFAIRY_API_KEY" %}

user/billing-overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The variety of plans provides you with the flexibility to choose the plan that s
1616

1717
| Billing Period | Concurrency based | Usage based |
1818
|:------- |:-----------------:|:-----------:|
19-
|Month | Concurrent jobs limit<br />Unlimited build minutes on Linux, Windows, and FreeBSD<br />Paid macOS builds (credits)<br /><br />Available via [site](https://travis-ci.com/account/plan) | Very high concurrency limit<br />Paid macOS, Linux, Windows, and FreeBSD build minutes (credits)<br />Paid user licenses (only per users trigerring the builds)<br /><br />Contact Travis CI to obtain|
19+
|Month | Concurrent jobs limit<br />Unlimited build minutes on Linux, Windows, and FreeBSD<br />Paid macOS builds (credits)<br /><br />Available via [site](https://travis-ci.com/account/plan) | Very high concurrency limit<br />Paid macOS, Linux, Windows, and FreeBSD build minutes (credits)<br />Paid user licenses (only per users triggering the builds)<br /><br />Contact Travis CI to obtain|
2020

2121
For the majority of users, a single concurrency based plan should be sufficient. However, if you build a lot of minutes per month and concurrency becomes a bottleneck, please contact Travis CI asking for a Usage based plan.
2222

@@ -136,15 +136,15 @@ Partner Queues are available only for standard instance size.
136136
137137
By design, the billing system usually allows the build job to finish even if the possible cost of the build job expressed in credits exceeds the available credits balance. Once the build finishes you may notice your credit balance to be negative. **This is perfectly normal.** Whenever your credits get replenished, e.g. after purchasing an addon, the negative balance will be deducted from the newly arriving credit pool. What remains is your available credit balance for your builds.
138138
139-
Please note: Currenlty, if the system decides that the build could cause your negative balance to be too high, the job can be canceled mid-flight due to insufficient credits balance. This will be addressed in one of the incoming updates in order to allow fluent processing for your builds.
139+
Please note: Currently, if the system decides that the build could cause your negative balance to be too high, the job can be canceled mid-flight due to insufficient credits balance. This will be addressed in one of the incoming updates in order to allow fluent processing for your builds.
140140
141141
142142
#### Credits vs. OSS Only Credits
143143
144144
Credits can be used to build both over private and public repositories.
145145
146-
On occassion, an allotment of OSS Only credits may be granted by Travis CI. These credits may be used only for builds over public repositories and are meant for open source support.
147-
The OSS credits may be assigned as one time pool or renewable pool, subject to case by case assesment of Travis CI staff.
146+
On occasion, an allotment of OSS Only credits may be granted by Travis CI. These credits may be used only for builds over public repositories and are meant for open source support.
147+
The OSS credits may be assigned as one time pool or renewable pool, subject to case by case assessment of Travis CI staff.
148148
149149
The OSS credits is a pool of credits completely separate from regular credits, with separate credits balance tracking.
150150

user/jwt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def authenticate(user, access_key):
141141
"""
142142
user: db object representing user retrieved based on username from HTTP BASIC AUTH
143143
access_key: access key or JWT token signed using access key (shared secret)
144-
returns True when authenication validation passed, otherwise False
144+
returns True when authentication validation passed, otherwise False
145145
"""
146146
# primary auth method
147147
if user['access_key'] == access_key:

user/multi-cpu-architectures.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permalink: /user/multi-cpu-architectures/
1515
>
1616
> `Arm`-based building on `Arm64 Graviton2` CPU now supports both Open Source and commercial projects. The total concurrency capacity is limited, but may adjusted based on the demand.
1717
18-
## Multi CPU availaibility
18+
## Multi CPU availability
1919

2020
If your code is used on multiple CPU architectures it probably should be tested on multiple CPU architectures. Travis CI can test on
2121

@@ -69,7 +69,7 @@ If you are already using a [build matrix](/user/customizing-the-build/#build-mat
6969

7070
- The `ppc64le` (IBM Power) and `s390x` (IBM Z) build jobs are run in an LXD compliant Linux OS image.
7171
- The `arm64` CPU architecture build job is run in an LXD compliant Linux OS image.
72-
- The `arm64-graviton2` architecture builds can be run on both LXD and regular 'full VM' environments. You **need** to explicitely set the target environment by using `virt` key. A `virt: vm` routes build jobs to a full virtual machine setup while `virt: lxd` routes build jobs to an LXD container setup.
72+
- The `arm64-graviton2` architecture builds can be run on both LXD and regular 'full VM' environments. You **need** to explicitly set the target environment by using `virt` key. A `virt: vm` routes build jobs to a full virtual machine setup while `virt: lxd` routes build jobs to an LXD container setup.
7373
- The default LXD image supported by Travis CI is Ubuntu Xenial 16.04 and by using `dist` you can select different supported LXD images. Also see our [CI Environment Overview - Virtualisation Environment vs Operating System](https://docs.travis-ci.com/user/reference/overview/#virtualisation-environment-vs-operating-system) documentation. The LXD host, on which LXD-based builds are run, is on Ubuntu 18.04.
7474
- The amd64 CPU architecture build job currently runs as a regular 'full VM' and will be transitioned to an LXD compliant Linux OS image usage over time.
7575

user/notifications.md.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Also, consult [cipher suite names mapping](https://www.openssl.org/docs/manmaste
9191
### Note on IP addresses
9292

9393
All notifications that use HTTP are sent through a proxy with static IP
94-
addresess to ensure safelist and firewall rule stability. The current IP
94+
addresses to ensure safelist and firewall rule stability. The current IP
9595
addresses are:
9696

9797
```

0 commit comments

Comments
 (0)