Skip to content

Commit 70cd490

Browse files
authored
Merge pull request #33936 from github/repo-sync
Repo sync
2 parents e375d03 + 5606db1 commit 70cd490

File tree

8 files changed

+12
-13
lines changed

8 files changed

+12
-13
lines changed

content/actions/using-jobs/assigning-permissions-to-jobs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ versions:
1414

1515
{% data reusables.actions.jobs.section-assigning-permissions-to-jobs %}
1616

17-
## Defining access for the `GITHUB_TOKEN` scopes
17+
## Defining access for the `GITHUB_TOKEN` permissions
1818

1919
{% data reusables.actions.github-token-available-permissions %}
2020

content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ The trial lasts for **{% data reusables.enterprise.ghec-trial-length %} days** a
5252
* {% data variables.product.prodname_sponsors %}
5353
* Paid {% data variables.product.prodname_marketplace %} apps
5454
* {% data variables.product.prodname_github_connect %}
55+
* {% data variables.large_files.product_name_long %}
5556
* For {% data variables.product.prodname_actions %}, increased minutes, job concurrency, and {% data variables.actions.hosted_runner %}s
5657

5758
If you invite an existing organization into your trial enterprise, **all of these features will be disabled**. If you remove the organization from the enterprise, the features will be re-enabled.

content/pages/getting-started-with-github-pages/securing-your-github-pages-site-with-https.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ All {% data variables.product.prodname_pages %} sites, including sites that are
4040

4141
When you set or change your custom domain in the Pages settings, an automatic DNS check begins. This check determines if your DNS settings are configured to allow {% data variables.product.prodname_dotcom %} to obtain a certificate automatically. If the check is successful, {% data variables.product.prodname_dotcom %} queues a job to request a TLS certificate from [Let's Encrypt](https://letsencrypt.org/). On receiving a valid certificate, {% data variables.product.prodname_dotcom %} automatically uploads it to the servers that handle TLS termination for Pages. When this process completes successfully, a check mark is displayed beside your custom domain name.
4242

43-
Please note that your {% data variables.product.prodname_pages %} site must be publicly available for a Let's Encrypt certificate to be issued. Once the certificate has been issued you may revert the site to private.
44-
4543
The process may take some time. If the process has not completed several minutes after you clicked **Save**, try clicking **Remove** next to your custom domain name. Retype the domain name and click **Save** again. This will cancel and restart the provisioning process.
4644

4745
## Resolving problems with mixed content

data/reusables/actions/github-token-available-permissions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
You can define the access that the `GITHUB_TOKEN` will permit by specifying `read`, `write`, or `none` as the value of the available scopes within the `permissions` key.
1+
You can define the access that the `GITHUB_TOKEN` will permit by specifying `read`, `write`, or `none` as the value of the available permissions within the `permissions` key.
22

33
```yaml
44
permissions:
@@ -17,9 +17,9 @@ permissions:
1717
statuses: read|write|none
1818
```
1919
20-
If you specify the access for any of these scopes, all of those that are not specified are set to `none`.
20+
If you specify the access for any of these permissions, all of those that are not specified are set to `none`.
2121

22-
You can use the following syntax to define one of `read-all` or `write-all` access for all of the available scopes:
22+
You can use the following syntax to define one of `read-all` or `write-all` access for all of the available permissions:
2323

2424
```yaml
2525
permissions: read-all
@@ -29,7 +29,7 @@ permissions: read-all
2929
permissions: write-all
3030
```
3131

32-
You can use the following syntax to disable permissions for all of the available scopes:
32+
You can use the following syntax to disable permissions for all of the available permissions:
3333

3434
```yaml
3535
permissions: {}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
The `GITHUB_TOKEN` secret is set to an access token for the repository each time a job in a workflow begins. You should set the permissions for this access token in the workflow file to grant read access for the `contents` scope and write access for the `packages` scope. For more information, see "[AUTOTITLE](/actions/security-guides/automatic-token-authentication)."
1+
The `GITHUB_TOKEN` secret is set to an access token for the repository each time a job in a workflow begins. You should set the permissions for this access token in the workflow file to grant read access for the `contents` permission and write access for the `packages` permission. For more information, see "[AUTOTITLE](/actions/security-guides/automatic-token-authentication)."

data/reusables/actions/github-token-scope-descriptions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
For each of the available scopes, shown in the table below, you can assign one of the permissions: `read`, `write`, or `none`. If you specify the access for any of these scopes, all of those that are not specified are set to `none`.
1+
For each of the available permissions, shown in the table below, you can assign one of the access levels: `read`, `write`, or `none`. `write` includes `read`. If you specify the access for any of these permissions, all of those that are not specified are set to `none`.
22

3-
Available scopes and details of what each allows an action to do:
3+
Available permissions and details of what each allows an action to do:
44

5-
| Scope | Allows an action using `GITHUB_TOKEN` to |
5+
| Permission | Allows an action using `GITHUB_TOKEN` to |
66
| --- | --- |
77
| `actions` | Work with GitHub Actions. For example, `actions: write` permits an action to cancel a workflow run. For more information, see "[AUTOTITLE](/rest/overview/permissions-required-for-github-apps?apiVersion=2022-11-28#repository-permissions-for-actions)." |
88
{% ifversion artifact-attestations %}| `attestations` | Work with artifact attestations. For example, `attestations: write` permits an action to generate an artifact attestation for a build. For more information, see "[AUTOTITLE](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds)" |{% endif %}

data/reusables/actions/jobs/setting-permissions-specific-jobs-example.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This example shows permissions being set for the `GITHUB_TOKEN` that will only apply to the job named `stale`. Write access is granted for the `issues` and `pull-requests` scopes. All other scopes will have no access.
1+
This example shows permissions being set for the `GITHUB_TOKEN` that will only apply to the job named `stale`. Write access is granted for the `issues` and `pull-requests` permissions. All other permissions will have no access.
22

33
```yaml
44
jobs:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1. Under "Workflow permissions", choose whether you want the `GITHUB_TOKEN` to have read and write access for all scopes (the permissive setting), or just read access for the `contents` {% ifversion actions-default-workflow-permissions-restrictive %}and `packages` scopes{% else %}scope{% endif %} (the restricted setting).
1+
1. Under "Workflow permissions", choose whether you want the `GITHUB_TOKEN` to have read and write access for all permissions (the permissive setting), or just read access for the `contents` {% ifversion actions-default-workflow-permissions-restrictive %}and `packages` permissions{% else %}permission{% endif %} (the restricted setting).

0 commit comments

Comments
 (0)