diff --git a/assets/images/help/repository/choose-commit-email-address.png b/assets/images/help/repository/choose-commit-email-address.png index 25e9798c05..d6d4b45634 100644 Binary files a/assets/images/help/repository/choose-commit-email-address.png and b/assets/images/help/repository/choose-commit-email-address.png differ diff --git a/content/code-security/getting-started/adding-a-security-policy-to-your-repository.md b/content/code-security/getting-started/adding-a-security-policy-to-your-repository.md index 369adbaf10..1ddc896b9a 100644 --- a/content/code-security/getting-started/adding-a-security-policy-to-your-repository.md +++ b/content/code-security/getting-started/adding-a-security-policy-to-your-repository.md @@ -48,7 +48,7 @@ By making security reporting instructions clearly available, you make it easy fo {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} -3. In the left sidebar, click **Security policy**. +3. In the left sidebar, under "Reporting", click **{% octicon "law" aria-hidden="true" %} Policy**. 4. Click **Start setup**. 5. In the new _SECURITY.md_ file, add information about supported versions of your project and how to report a vulnerability. {% data reusables.files.write_commit_message %} diff --git a/content/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository.md b/content/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository.md index b751c2434d..d0ca22a0c8 100644 --- a/content/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository.md +++ b/content/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository.md @@ -33,7 +33,7 @@ Open source licenses enable others to freely use, change, and distribute the pro {% data reusables.files.write_commit_message %} {% data reusables.files.choose_commit_branch %} {% data reusables.files.choose-commit-email %} -1. Click **Commit new file**. +{% data reusables.files.propose_file_change %} {% endif %} @@ -48,7 +48,7 @@ Open source licenses enable others to freely use, change, and distribute the pro {% data reusables.files.choose-commit-email %} 7. Below the commit message fields, decide whether to add your commit to the current branch or to a new branch. If your current branch is `main`, you should choose to create a new branch for your commit and then create a pull request. For more information, see "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request)". ![Screenshot of a {% data variables.product.prodname_dotcom %} pull request showing a radio button to commit directly to the main branch or to create a new branch. New branch is selected.](/assets/images/help/repository/choose-commit-branch.png) -1. Click **Commit new file**. +{% data reusables.files.propose_file_change %} {% endif %} diff --git a/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md b/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md index 948d37bf82..562dd941ab 100644 --- a/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md +++ b/content/repositories/working-with-files/managing-files/adding-a-file-to-a-repository.md @@ -37,7 +37,7 @@ Files that you add to a repository via a browser are limited to {% data variable ![Screenshot of the main page of the repository. Above the list of a files, a button, labeled "Add file," is outlined in dark orange.](/assets/images/help/repository/upload-files-button.png) 1. To select the files you want to upload, drag and drop the file or folder, or click **choose your files**. -{% data reusables.files.write_commit_message %} +{% data reusables.files.commit-message %} {% data reusables.files.choose_commit_branch %} 1. Click **Commit changes**. diff --git a/content/repositories/working-with-files/managing-files/deleting-files-in-a-repository.md b/content/repositories/working-with-files/managing-files/deleting-files-in-a-repository.md index 2d1cd21224..875fa98f3b 100644 --- a/content/repositories/working-with-files/managing-files/deleting-files-in-a-repository.md +++ b/content/repositories/working-with-files/managing-files/deleting-files-in-a-repository.md @@ -28,8 +28,8 @@ If the file{% ifversion fpt or ghes or ghec %} or directory{% endif %} you delet ## Deleting a file 1. Browse to the file in your repository that you want to delete. -2. At the top of the file, click {% octicon "trash" aria-label="The trash icon" %}. -{% data reusables.files.write_commit_message %} +1. In the top-right corner, select the {% octicon "kebab-horizontal" aria-label="More options" %} dropdown menu, then click **Delete file**. +{% data reusables.files.commit-message %} {% data reusables.files.choose-commit-email %} {% data reusables.files.choose_commit_branch %} {% data reusables.files.propose_file_change %} @@ -42,7 +42,7 @@ If the file{% ifversion fpt or ghes or ghec %} or directory{% endif %} you delet ![Screenshot of the file list for a directory. To the right of the directory name, a button, labeled with a kebab icon, is outlined in dark orange.](/assets/images/help/repository/delete-directory-button.png) 1. Review the files you will delete. -{% data reusables.files.write_commit_message %} +{% data reusables.files.commit-message %} {% data reusables.files.choose-commit-email %} {% data reusables.files.choose_commit_branch %} {% data reusables.files.propose_file_change %} diff --git a/content/repositories/working-with-files/managing-files/editing-files.md b/content/repositories/working-with-files/managing-files/editing-files.md index 7e04b20499..cc5b5c954a 100644 --- a/content/repositories/working-with-files/managing-files/editing-files.md +++ b/content/repositories/working-with-files/managing-files/editing-files.md @@ -52,6 +52,6 @@ When you edit a file in another user's repository, we'll automatically [fork the {% data reusables.files.preview_change %} {% data reusables.files.write_commit_message %} {% data reusables.files.choose-commit-email %} -1. Click **Propose file change**. +1. Click **Propose changes**. 1. Type a title and description for your pull request. 1. Click **Create pull request**. \ No newline at end of file diff --git a/data/reusables/files/commit-message.md b/data/reusables/files/commit-message.md new file mode 100644 index 0000000000..6f59cdcf6b --- /dev/null +++ b/data/reusables/files/commit-message.md @@ -0,0 +1 @@ +1. In the "Commit message" field, type a short, meaningful commit message that describes the change you made to the file. You can attribute the commit to more than one author in the commit message. For more information, see "[AUTOTITLE](/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors)." \ No newline at end of file diff --git a/data/reusables/files/propose_file_change.md b/data/reusables/files/propose_file_change.md index 04bd39ecc3..829ce1c33c 100644 --- a/data/reusables/files/propose_file_change.md +++ b/data/reusables/files/propose_file_change.md @@ -1 +1 @@ -1. Click **Propose file change**. +1. Click **Commit changes** or **Propose changes**. diff --git a/data/reusables/files/propose_new_file.md b/data/reusables/files/propose_new_file.md index c4f7f59ef3..829ce1c33c 100644 --- a/data/reusables/files/propose_new_file.md +++ b/data/reusables/files/propose_new_file.md @@ -1 +1 @@ -1. Click **Propose new file.** +1. Click **Commit changes** or **Propose changes**.