Skip to content

Commit 0d68b21

Browse files
Merge branch 'main' into issue-35709
2 parents 190a7a5 + dd98f14 commit 0d68b21

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

content/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ This will display the code block with syntax highlighting:
6666

6767
![Screenshot of three lines of Ruby code as displayed on {% data variables.product.prodname_dotcom %}. Elements of the code display in purple, blue, and red type for scannability.](/assets/images/help/writing/code-block-syntax-highlighting-rendered.png)
6868

69+
> [!TIP]
70+
> When you create a fenced code block that you also want to have syntax highlighting on a GitHub Pages site, use lower-case language identifiers. For more information, see [AUTOTITLE](/pages/setting-up-a-github-pages-site-with-jekyll/about-github-pages-and-jekyll#syntax-highlighting).
71+
6972
We use [Linguist](https://github.com/github-linguist/linguist) to perform language detection and to select [third-party grammars](https://github.com/github-linguist/linguist/blob/main/vendor/README.md) for syntax highlighting. You can find out which keywords are valid in [the languages YAML file](https://github.com/github-linguist/linguist/blob/main/lib/linguist/languages.yml).
7073

7174
## Creating diagrams

content/organizations/managing-programmatic-access-to-your-organization/viewing-api-insights-in-your-organization.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ topics:
1212
- REST
1313
---
1414

15-
> [!NOTE] This feature is currently in {% data variables.release-phases.public_preview %} and is subject to change. We welcome your feedback in [this {% data variables.product.prodname_github_community %} discussion](https://github.co/api-insights-discussion).
16-
1715
## About API insights
1816

1917
As a {% data variables.product.prodname_ghe_cloud %} organization owner, you and your designated users can view REST API activity for your entire organization or specific apps and users. This helps you understand the sources of your REST API activity and manage against your primary rate limits, giving you visibility into the timeframe, apps, and API endpoints involved. To learn more about primary rate limits, see [AUTOTITLE](/rest/using-the-rest-api/rate-limits-for-the-rest-api#about-primary-rate-limits).

content/pages/setting-up-a-github-pages-site-with-jekyll/about-github-pages-and-jekyll.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ To make your site easier to read, code snippets are highlighted on {% data varia
110110

111111
By default, code blocks on your site will be highlighted by Jekyll. Jekyll uses the [Rouge](https://github.com/rouge-ruby/rouge) highlighter (which is compatible with [Pygments](https://pygments.org/)). If you specify Pygments in your `_config.yml` file, Rouge will be used as the fallback instead. Jekyll cannot use any other syntax highlighter, and you'll get a page build warning if you specify another syntax highlighter in your `_config.yml` file. For more information, see [AUTOTITLE](/pages/setting-up-a-github-pages-site-with-jekyll/about-jekyll-build-errors-for-github-pages-sites).
112112

113+
> [!NOTE]
114+
> Rouge only recognizes lower-case language identifiers for fenced code blocks. For a list of supported languages, see [Languages](https://rouge-ruby.github.io/docs/file.Languages.html).
115+
113116
If you want to use another highlighter, such as [highlight.js](https://github.com/highlightjs/highlight.js), you must disable Jekyll's syntax highlighting by updating your project's `_config.yml` file.
114117

115118
```yaml

content/webhooks/using-webhooks/automatically-redelivering-failed-deliveries-for-a-github-app-webhook.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
- name: Setup Node.js
7777
uses: {% data reusables.actions.action-setup-node %}
7878
with:
79-
node-version: '18.x'
79+
node-version: '20.x'
8080

8181
# This step installs the octokit library. The script that this workflow will run uses the octokit library.
8282
- name: Install dependencies
@@ -98,18 +98,18 @@ jobs:
9898
WORKFLOW_REPO: {% raw %}${{ github.event.repository.name }}{% endraw %}
9999
WORKFLOW_REPO_OWNER: {% raw %}${{ github.repository_owner }}{% endraw %}
100100
run: |
101-
node .github/workflows/scripts/redeliver-failed-deliveries.js
101+
node .github/workflows/scripts/redeliver-failed-deliveries.mjs
102102
```
103103
104104
## Adding the script
105105
106106
This section demonstrates how you can write a script to find and redeliver failed deliveries.
107107
108-
Copy this script into a file called `.github/workflows/scripts/redeliver-failed-deliveries.js` in the same repository where you saved the {% data variables.product.prodname_actions %} workflow file above.
108+
Copy this script into a file called `.github/workflows/scripts/redeliver-failed-deliveries.mjs` in the same repository where you saved the {% data variables.product.prodname_actions %} workflow file above.
109109

110110
```javascript copy annotate
111111
// This script uses {% data variables.product.company_short %}'s Octokit SDK to make API requests. For more information, see "[AUTOTITLE](/rest/guides/scripting-with-the-rest-api-and-javascript)."
112-
const { App, Octokit } = require("octokit");
112+
import { App, Octokit } from "octokit";
113113
114114
//
115115
async function checkAndRedeliverWebhooks() {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
> [!NOTE]
2-
> This event will only trigger a workflow run if the workflow file is on the default branch.
2+
> This event will only trigger a workflow run if the workflow file exists on the default branch.

0 commit comments

Comments
 (0)