From 2614520dd3a8588630f8ad5bdf02f1afe1259522 Mon Sep 17 00:00:00 2001 From: Rachael Sewell Date: Thu, 1 Jun 2023 14:15:13 -0700 Subject: [PATCH] fix a few more errors --- .../creating-a-javascript-action.md | 28 +++++++++++-------- .../about-enterprise-managed-users.md | 3 +- ...ment-environment-to-create-a-github-app.md | 3 +- ...-github-using-two-factor-authentication.md | 10 +++---- .../automatically-merging-a-pull-request.md | 4 +-- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/content/actions/creating-actions/creating-a-javascript-action.md b/content/actions/creating-actions/creating-a-javascript-action.md index eaf6ef68a6..aabc553e3c 100644 --- a/content/actions/creating-actions/creating-a-javascript-action.md +++ b/content/actions/creating-actions/creating-a-javascript-action.md @@ -183,27 +183,31 @@ git push --follow-tags Checking in your `node_modules` directory can cause problems. As an alternative, you can use a tool called [`@vercel/ncc`](https://github.com/vercel/ncc) to compile your code and modules into one file used for distribution. 1. Install `vercel/ncc` by running this command in your terminal. - `npm i -g @vercel/ncc` + + `npm i -g @vercel/ncc` 1. Compile your `index.js` file. - `ncc build index.js --license licenses.txt` + + `ncc build index.js --license licenses.txt` - You'll see a new `dist/index.js` file with your code and the compiled modules. - You will also see an accompanying `dist/licenses.txt` file containing all the licenses of the `node_modules` you are using. + You'll see a new `dist/index.js` file with your code and the compiled modules. You will also see an accompanying `dist/licenses.txt` file containing all the licenses of the `node_modules` you are using. 1. Change the `main` keyword in your `action.yml` file to use the new `dist/index.js` file. - `main: 'dist/index.js'` + + `main: 'dist/index.js'` 1. If you already checked in your `node_modules` directory, remove it. - `rm -rf node_modules/*` + + `rm -rf node_modules/*` 1. From your terminal, commit the updates to your `action.yml`, `dist/index.js`, and `node_modules` files. -```shell{:copy} -git add action.yml dist/index.js node_modules/* -git commit -m "Use vercel/ncc" -git tag -a -m "My first action release" v1.1 -git push --follow-tags -``` + + ```shell{:copy} + git add action.yml dist/index.js node_modules/* + git commit -m "Use vercel/ncc" + git tag -a -m "My first action release" v1.1 + git push --follow-tags + ``` ## Testing out your action in a workflow diff --git a/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users.md b/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users.md index 991ad1d936..0538fef37f 100644 --- a/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users.md +++ b/content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users.md @@ -150,8 +150,7 @@ By default, when an unauthenticated user attempts to access an enterprise that u ### Authenticating as a {% data variables.enterprise.prodname_managed_user %} via {% data variables.product.prodname_dotcom_the_website %} 1. Navigate to [https://github.com/login](https://github.com/login). -1. In the "Username or email address" text box, enter your username including the underscore and short code. - When the form recognizes your username, the form will update. You do not need to enter your password on this form. +1. In the "Username or email address" text box, enter your username including the underscore and short code. When the form recognizes your username, the form will update. You do not need to enter your password on this form. 1. To continue to your identity provider, click **Sign in with your identity provider**. ## Usernames and profile information diff --git a/content/apps/creating-github-apps/guides/setting-up-your-development-environment-to-create-a-github-app.md b/content/apps/creating-github-apps/guides/setting-up-your-development-environment-to-create-a-github-app.md index 638b067746..8313317d62 100644 --- a/content/apps/creating-github-apps/guides/setting-up-your-development-environment-to-create-a-github-app.md +++ b/content/apps/creating-github-apps/guides/setting-up-your-development-environment-to-create-a-github-app.md @@ -106,8 +106,7 @@ You'll see a form where you can enter details about your app. See "[AUTOTITLE](/ * For the "Webhook secret", create a password to secure your webhook endpoints. This should be something that only you (and GitHub, via this form) know. The secret is important because you will be receiving payloads from the public internet, and you'll use this secret to verify the webhook sender. Note that the GitHub App settings say the webhook secret is optional, which is true in most cases, but for the template app code to work, you must set a webhook secret. -* On the Permissions & Webhooks page, you can specify a set of permissions for your app, which determines how much data your app has access to. Under the "Repository permissions" - section, scroll down to "Metadata" and select `Access: Read-only`. If you decide to extend this template app, you can update these permissions later. +* On the Permissions & Webhooks page, you can specify a set of permissions for your app, which determines how much data your app has access to. Under the "Repository permissions" section, scroll down to "Metadata" and select `Access: Read-only`. If you decide to extend this template app, you can update these permissions later. * At the bottom of the Permissions & Webhooks page, under "Where can this {% data variables.product.prodname_github_app %} be installed?", specify whether this is a private app or a public app. diff --git a/content/authentication/securing-your-account-with-two-factor-authentication-2fa/accessing-github-using-two-factor-authentication.md b/content/authentication/securing-your-account-with-two-factor-authentication-2fa/accessing-github-using-two-factor-authentication.md index d364563bc0..3426e31e2e 100644 --- a/content/authentication/securing-your-account-with-two-factor-authentication-2fa/accessing-github-using-two-factor-authentication.md +++ b/content/authentication/securing-your-account-with-two-factor-authentication-2fa/accessing-github-using-two-factor-authentication.md @@ -62,14 +62,14 @@ If you have installed and signed in to {% data variables.product.prodname_mobile 1. Sign in to {% data variables.product.product_name %} with your browser, using your username and password. 1. {% data variables.product.product_name %} will send you a push notification to verify your sign in attempt. Opening the push notification or opening the {% data variables.product.prodname_mobile %} app will display a prompt, asking you to approve or reject this sign in attempt. - {% note %} + {% note %} - **Note**: This prompt may require you to enter a two-digit number displayed within the browser you are signing in to. + **Note**: This prompt may require you to enter a two-digit number displayed within the browser you are signing in to. - {% endnote %} + {% endnote %} - - Upon approving the login attempt using {% data variables.product.prodname_mobile %}, your browser will complete the sign in attempt automatically. - - Rejecting the sign in attempt will prevent the authentication from finishing. For more information, see "[Keeping your account and data secure](/authentication/keeping-your-account-and-data-secure)." + - Upon approving the login attempt using {% data variables.product.prodname_mobile %}, your browser will complete the sign in attempt automatically. + - Rejecting the sign in attempt will prevent the authentication from finishing. For more information, see "[Keeping your account and data secure](/authentication/keeping-your-account-and-data-secure)." {% endif %} diff --git a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md index 3da5909917..5453e757af 100644 --- a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md +++ b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md @@ -39,7 +39,7 @@ People with write permissions to a repository can enable auto-merge for a pull r ![Screenshot of the merge box of a pull request. A dropdown menu, labeled with a downward-facing triangle, is outlined in dark orange.](/assets/images/help/pull_requests/enable-auto-merge-drop-down.png) 1. Click **Enable auto-merge**. - {% ifversion fpt %} + {% ifversion fpt %} 1. If you chose the merge or squash and merge methods, type a commit message and description and choose the email address you want to author the merge commit. {% note %} @@ -50,7 +50,7 @@ People with write permissions to a repository can enable auto-merge for a pull r {% endif %} {% ifversion ghes or ghae or ghec %} 1. If you chose the merge or squash and merge methods, type a commit message and description. - {% endif %} + {% endif %} 1. Click **Confirm auto-merge**. ## Disabling auto-merge