Skip to content

Commit b242cae

Browse files
authored
Merge branch 'main' into update-secret-scanning-alerts-docs
2 parents 675f954 + b04766d commit b242cae

10 files changed

Lines changed: 25 additions & 21 deletions

File tree

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
*.js @github/docs-engineering
88
/.github/ @github/docs-engineering
99
/script/ @github/docs-engineering
10+
/includes/ @github/docs-engineering
11+
/layouts/ @github/docs-engineering
1012
app.json @github/docs-engineering
1113
Dockerfile @github/docs-engineering
1214
package-lock.json @github/docs-engineering

.github/allowed-actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ module.exports = [
2121
"fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289",
2222
"github/codeql-action/analyze@v1",
2323
"github/codeql-action/init@v1",
24-
"ianwalter/puppeteer-container@2466ba8ecf689ccf4e5dfadeff3ac2db227b2e17",
2524
"juliangruber/approve-pull-request-action@c530832d4d346c597332e20e03605aa94fa150a8",
2625
"juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9",
2726
"juliangruber/read-file-action@e0a316da496006ffd19142f0fd594a1783f3b512",
@@ -33,6 +32,7 @@ module.exports = [
3332
"peter-evans/create-pull-request@8c603dbb04b917a9fc2dd991dc54fef54b640b43",
3433
"rachmari/actions-add-new-issue-to-column@1a459ef92308ba7c9c9dc2fcdd72f232495574a9",
3534
"rachmari/labeler@832d42ec5523f3c6d46e8168de71cd54363e3e2e",
35+
"rachmari/puppeteer-container@6d56d6e132a3df76cf60bc290a4282f7fbaed05e",
3636
"repo-sync/github-sync@3832fe8e2be32372e1b3970bbae8e7079edeec88",
3737
"repo-sync/pull-request@33777245b1aace1a58c87a29c90321aa7a74bd7d",
3838
"someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd",

.github/workflows/browser-test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Browser Tests
22

33
on:
44
workflow_dispatch:
5-
# push:
6-
# branches:
7-
# - main
8-
# pull_request:
5+
push:
6+
branches:
7+
- main
8+
pull_request:
99

1010
jobs:
1111
see_if_should_skip:
@@ -39,14 +39,14 @@ jobs:
3939

4040
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
4141
name: Install
42-
uses: ianwalter/puppeteer-container@2466ba8ecf689ccf4e5dfadeff3ac2db227b2e17
42+
uses: rachmari/puppeteer-container@6d56d6e132a3df76cf60bc290a4282f7fbaed05e
4343
timeout-minutes: 5
4444
with:
4545
args: npm ci
4646

4747
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
4848
name: Test
4949
timeout-minutes: 10
50-
uses: ianwalter/puppeteer-container@2466ba8ecf689ccf4e5dfadeff3ac2db227b2e17
50+
uses: rachmari/puppeteer-container@6d56d6e132a3df76cf60bc290a4282f7fbaed05e
5151
with:
5252
args: npm run browser-test

content/actions/learn-github-actions/security-hardening-for-github-actions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ This means that a compromise of a single action within a workflow can be very si
7777

7878
### Considering cross-repository access
7979

80-
{% data variables.product.prodname_actions %} is intentionally scoped for a single repository at a time. The `GITHUB_TOKEN` grants the same level of access as a write-access user, because any write-access user can access this token by creating or modifying workflow files. Users have specific permissions for each repository, so having the `GITHUB_TOKEN` for one repository grant access to another would impact the {% data variables.product.prodname_dotcom %} permission model if not implemented carefully. Similarly, caution must be taken when adding {% data variables.product.prodname_dotcom %} authentication tokens to a workflow, because this can also affect the {% data variables.product.prodname_dotcom %} permission model by inadvertently granting broad access to collaborators.
80+
{% data variables.product.prodname_actions %} is intentionally scoped for a single repository at a time. The `GITHUB_TOKEN` grants the same level of access as a write-access user, because any write-access user can access this token by creating or modifying workflow files. Users have specific permissions for each repository, so allowing the `GITHUB_TOKEN` for one repository to grant access to another would impact the {% data variables.product.prodname_dotcom %} permission model if not implemented carefully. Similarly, caution must be taken when adding {% data variables.product.prodname_dotcom %} authentication tokens to a workflow, because this can also affect the {% data variables.product.prodname_dotcom %} permission model by inadvertently granting broad access to collaborators.
8181

8282
We have [a plan on the {% data variables.product.prodname_dotcom %} roadmap](https://github.com/github/roadmap/issues/74) to support a flow that allows cross-repository access within {% data variables.product.product_name %}, but this is not yet a supported feature. Currently, the only way to perform privileged cross-repository interactions is to place a {% data variables.product.prodname_dotcom %} authentication token or SSH key as a secret within the workflow. Because many authentication token types do not allow for granular access to specific resources, there is significant risk in using the wrong token type, as it can grant much broader access than intended.
8383

content/admin/enterprise-management/monitoring-using-snmp.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ If you enable SNMP v3, you can take advantage of increased user based security t
6666

6767
##### Querying SNMP data
6868

69-
Both hardware and software-level information about your appliance is available with SNMP v3. Due to the lack of encryption and privacy for the `noAuthNoPriv` and `authNoPriv` security levels, we exclude the `hrSWRun` table (1.1.3.6.1.2.1.25.41) from the resulting SNMP reports. We include this table if you're using the `authPriv` security level.
69+
Both hardware and software-level information about your appliance is available with SNMP v3. Due to the lack of encryption and privacy for the `noAuthNoPriv` and `authNoPriv` security levels, we exclude the `hrSWRun` table (1.3.6.1.2.1.25.4) from the resulting SNMP reports. We include this table if you're using the `authPriv` security level. For more information, see the "[OID reference documentation](http://oidref.com/1.3.6.1.2.1.25.4)."
7070

7171
With SNMP v2c, only hardware-level information about your appliance is available. The applications and services within {% data variables.product.prodname_enterprise %} do not have OIDs configured to report metrics. Several MIBs are available, which you can see by running `snmpwalk` on a separate workstation with SNMP support in your network:
7272

@@ -76,16 +76,16 @@ With SNMP v2c, only hardware-level information about your appliance is available
7676
$ snmpwalk -v 2c -c <em>community-string</em> -O e <em>hostname</em>
7777
```
7878

79-
Of the available MIBs for SNMP, the most useful is `HOST-RESOURCES-MIB` (.1.3.6.1.2.1.25). See the table below for some important objects in this MIB:
79+
Of the available MIBs for SNMP, the most useful is `HOST-RESOURCES-MIB` (1.3.6.1.2.1.25). See the table below for some important objects in this MIB:
8080

8181
| Name | OID | Description |
8282
| ---- | --- | ----------- |
83-
| hrSystemDate.2 | .1.3.6.1.2.1.25.1.2 | The hosts notion of the local date and time of day. |
84-
| hrSystemUptime.0 |.1.3.6.1.2.1.25.1.1.0 | How long it's been since the host was last initialized. |
85-
| hrMemorySize.0 | .1.3.6.1.2.1.25.2.2.0 | The amount of RAM on the host. |
86-
| hrSystemProcesses.0 | .1.3.6.1.2.1.25.1.6.0 | The number of process contexts currently loaded or running on the host. |
87-
| hrStorageUsed.1 | .1.3.6.1.2.1.25.2.3.1.6.1 | The amount of storage space consumed on the host, in hrStorageAllocationUnits. |
88-
| hrStorageAllocationUnits.1 | .1.3.6.1.2.1.25.2.3.1.4.1 | The size, in bytes, of an hrStorageAllocationUnit |
83+
| hrSystemDate.2 | 1.3.6.1.2.1.25.1.2 | The hosts notion of the local date and time of day. |
84+
| hrSystemUptime.0 | 1.3.6.1.2.1.25.1.1.0 | How long it's been since the host was last initialized. |
85+
| hrMemorySize.0 | 1.3.6.1.2.1.25.2.2.0 | The amount of RAM on the host. |
86+
| hrSystemProcesses.0 | 1.3.6.1.2.1.25.1.6.0 | The number of process contexts currently loaded or running on the host. |
87+
| hrStorageUsed.1 | 1.3.6.1.2.1.25.2.3.1.6.1 | The amount of storage space consumed on the host, in hrStorageAllocationUnits. |
88+
| hrStorageAllocationUnits.1 | 1.3.6.1.2.1.25.2.3.1.4.1 | The size, in bytes, of an hrStorageAllocationUnit |
8989

9090
For example, to query for `hrMemorySize` with SNMP v3, run the following command on a separate workstation with SNMP support in your network:
9191
```shell
@@ -108,7 +108,7 @@ snmpget -v 2c -c <em>community-string</em> <em>hostname</em> HOST-RESOURCES-MIB:
108108

109109
{% tip %}
110110

111-
**Note:** To prevent leaking information about services running on your appliance, we exclude the `hrSWRun` table (1.1.3.6.1.2.1.25.41) from the resulting SNMP reports unless you're using the `authPriv` security level with SNMP v3. If you're using the `authPriv` security level, we include the `hrSWRun` table.
111+
**Note:** To prevent leaking information about services running on your appliance, we exclude the `hrSWRun` table (1.3.6.1.2.1.25.4) from the resulting SNMP reports unless you're using the `authPriv` security level with SNMP v3. If you're using the `authPriv` security level, we include the `hrSWRun` table.
112112

113113
{% endtip %}
114114

content/github/site-policy/github-terms-of-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ GitHub may offer subscription-based access to our API for those Users who requir
180180
Some Service features may be subject to additional terms specific to that feature or product as set forth in the GitHub Additional Product Terms. By accessing or using the Services, you also agree to the [GitHub Additional Product Terms](/github/site-policy/github-additional-product-terms).
181181

182182
### J. Beta Previews
183-
**Short version:** *Beta Previews may not be supported or may change at any time, you may receive confidential information through those programs that must remain confidential while the program is private, and we'd love your feedback to make our Beta Previews better.*
183+
**Short version:** *Beta Previews may not be supported or may change at any time. You may receive confidential information through those programs that must remain confidential while the program is private. We'd love your feedback to make our Beta Previews better.*
184184

185185
#### 1. Subject to Change
186186

content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ The recommended formats explicitly define which versions are used for all direct
7070
| `dotnet` CLI | .NET languages (C#, C++, F#, VB) | `.csproj`, `.vbproj`, `.nuspec`, `.vcxproj`, `.fsproj` | `.csproj`, `.vbproj`, `.nuspec`, `.vcxproj`, `.fsproj`, `packages.config` |
7171
| Maven | Java, Scala | `pom.xml` | `pom.xml` |
7272
| npm | JavaScript | `package-lock.json` | `package-lock.json`, `package.json`|
73-
| Python PIP | Python | `requirements.txt`, `pipfile.lock` | `requirements.txt`, `pipfile.lock`, `setup.py`* |
73+
| Python PIP | Python | `requirements.txt`, `pipfile.lock` | `requirements.txt`, `pipfile`, `pipfile.lock`, `setup.py`* |
7474
| RubyGems | Ruby | `Gemfile.lock` | `Gemfile.lock`, `Gemfile`, `*.gemspec` |
7575
| Yarn | JavaScript | `yarn.lock` | `package.json`, `yarn.lock` |
7676

content/rest/overview/resources-in-the-rest-api.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,8 @@ For users that belong to a {% data variables.product.prodname_ghe_cloud %} accou
360360
361361
{% endif %}
362362
363+
When using the built-in `GITHUB_TOKEN` in GitHub Actions, the rate limit is 1,000 requests per hour per repository. For organizations that belong to a GitHub Enterprise Cloud account, this limit is 15,000 requests per hour per repository.
364+
363365
For unauthenticated requests, the rate limit allows for up to 60 requests per hour. Unauthenticated requests are associated with the originating IP address, and not the user making requests.
364366
365367
{% data reusables.enterprise.rate_limit %}

data/reusables/gated-features/okta-team-sync.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{% note %}
44

5-
**Note:** Team synchronization with Okta is currently in beta and subject to change.
5+
**Note:** Team synchronization with Okta is currently in beta and subject to change. Please contact your GitHub Sales account representative to register for the beta.
66

77
{% endnote %}
88

includes/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h4 class="mb-3 text-mono text-gray-light text-normal">{% data ui.footer.support
3434
<li class="lh-condensed mb-3"><a href="https://github.community" class="link-gray">{% data ui.footer.support.links.community_forum %}</a></li>
3535
<li class="lh-condensed mb-3"><a href="https://services.github.com/" class="link-gray">{% data ui.footer.support.links.training %}</a></li>
3636
<li class="lh-condensed mb-3"><a href="https://www.githubstatus.com/" class="link-gray">{% data ui.footer.support.links.status %}</a></li>
37-
<li class="lh-condensed mb-3"><a href="https://support.github.com/contact" class="link-gray">{% data ui.footer.support.links.contact_github %}</a></li>
37+
<li class="lh-condensed mb-3"><a href="https://support.github.com/" class="link-gray">{% data ui.footer.support.links.contact_github %}</a></li>
3838
</ul>
3939
</div>
4040
<div class="col-6 col-sm-3 col-lg-2 mb-6 mb-md-2 pr-3 pr-md-0 pl-md-4">

0 commit comments

Comments
 (0)