Skip to content

Fix various typos #3032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _data/snippets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ github_oauth_access_rights: |

This is not how Travis CI accesses your data, however we can explain it later in the process.

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) ).
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) ).

**Travis CI does not access all your repositories by default**.

Expand Down
4 changes: 2 additions & 2 deletions _includes/deploy/providers/testfairy.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Use the following options to further configure the deployment.
| `symbols_file` | Path to the symbols file — type: string |
| `testers_groups` | Tester groups to be notified about this build — type: string, e.g.: e.g. group1,group1 |
| `notify` | Send an email with a changelog to your users — type: boolean |
| `auto_update` | Automaticall upgrade all the previous installations of this app this version — type: boolean |
| `auto_update` | Automatically upgrade all the previous installations of this app this version — type: boolean |
| `advanced_options` | Comma_separated list of advanced options — type: string, e.g.: option1,option2 |

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

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

{% include deploy/secrets.md name="api_key" env_name="TESTFAIRY_API_KEY" %}
{% include deploy/secrets.md name="api_key" env_name="TESTFAIRY_API_KEY" %}
8 changes: 4 additions & 4 deletions user/billing-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The variety of plans provides you with the flexibility to choose the plan that s

| Billing Period | Concurrency based | Usage based |
|:------- |:-----------------:|:-----------:|
|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|
|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|

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.

Expand Down Expand Up @@ -136,15 +136,15 @@ Partner Queues are available only for standard instance size.

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.

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.
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.


#### Credits vs. OSS Only Credits

Credits can be used to build both over private and public repositories.

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.
The OSS credits may be assigned as one time pool or renewable pool, subject to case by case assesment of Travis CI staff.
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.
The OSS credits may be assigned as one time pool or renewable pool, subject to case by case assessment of Travis CI staff.

The OSS credits is a pool of credits completely separate from regular credits, with separate credits balance tracking.

Expand Down
2 changes: 1 addition & 1 deletion user/jwt.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def authenticate(user, access_key):
"""
user: db object representing user retrieved based on username from HTTP BASIC AUTH
access_key: access key or JWT token signed using access key (shared secret)
returns True when authenication validation passed, otherwise False
returns True when authentication validation passed, otherwise False
"""
# primary auth method
if user['access_key'] == access_key:
Expand Down
4 changes: 2 additions & 2 deletions user/multi-cpu-architectures.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ permalink: /user/multi-cpu-architectures/
>
> `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.

## Multi CPU availaibility
## Multi CPU availability

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

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

- The `ppc64le` (IBM Power) and `s390x` (IBM Z) build jobs are run in an LXD compliant Linux OS image.
- The `arm64` CPU architecture build job is run in an LXD compliant Linux OS image.
- 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.
- 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.
- 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.
- 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.

Expand Down
2 changes: 1 addition & 1 deletion user/notifications.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Also, consult [cipher suite names mapping](https://www.openssl.org/docs/manmaste
### Note on IP addresses

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

```
Expand Down