From cdf891c8c30861aa6c45dc8667430e6d0e7512b8 Mon Sep 17 00:00:00 2001 From: Gregor Martynus <39992+gr2m@users.noreply.github.com> Date: Tue, 3 Aug 2021 18:00:22 -0700 Subject: [PATCH 1/6] typo --- content/actions/reference/workflow-syntax-for-github-actions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/reference/workflow-syntax-for-github-actions.md b/content/actions/reference/workflow-syntax-for-github-actions.md index 138a4e58dd..e64c9c47bb 100644 --- a/content/actions/reference/workflow-syntax-for-github-actions.md +++ b/content/actions/reference/workflow-syntax-for-github-actions.md @@ -655,7 +655,7 @@ steps: `{owner}/{repo}@{ref}` -You can specific branch, ref, or SHA in a public {% data variables.product.prodname_dotcom %} repository. +You can specificy a branch, ref, or SHA in a public {% data variables.product.prodname_dotcom %} repository. ```yaml jobs: From fc197054abe199311b32da69122b467459b0d655 Mon Sep 17 00:00:00 2001 From: buzzkillb Date: Tue, 3 Aug 2021 19:36:19 -0700 Subject: [PATCH 2/6] fix typo --- content/actions/guides/publishing-docker-images.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/guides/publishing-docker-images.md b/content/actions/guides/publishing-docker-images.md index 2960744d8d..76c6aeb29f 100644 --- a/content/actions/guides/publishing-docker-images.md +++ b/content/actions/guides/publishing-docker-images.md @@ -131,7 +131,7 @@ The `build-push-action` options required for {% data variables.product.prodname_ {% ifversion fpt %} {% data reusables.package_registry.publish-docker-image %} -The above workflow if triggered by a push to the "release" branch. It checks out the GitHub repository, and uses the `login-action` to log in to the {% data variables.product.prodname_container_registry %}. It then extracts labels and tags for the Docker image. Finally, it and uses the `build-push-action` action to build the image and publish it on the {% data variables.product.prodname_container_registry %}. +The above workflow if triggered by a push to the "release" branch. It checks out the GitHub repository, and uses the `login-action` to log in to the {% data variables.product.prodname_container_registry %}. It then extracts labels and tags for the Docker image. Finally, it uses the `build-push-action` action to build the image and publish it on the {% data variables.product.prodname_container_registry %}. {% else %} ```yaml{:copy} From b69c05dcbb06a8644cfaecc54a1fef6b81653657 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Wed, 4 Aug 2021 11:29:51 +0200 Subject: [PATCH 3/6] align changing username docs with current policy --- .../changing-your-github-username.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username.md b/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username.md index c258d1f04a..b6ef9b427c 100644 --- a/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username.md +++ b/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username.md @@ -17,9 +17,11 @@ shortTitle: Change your username --- ## About username changes -You can change your username to another username that is not currently in use.{% ifversion fpt %} If the username you want is not available, you'll see information about whether you can request the username to be released when you type in the desired username. +You can change your username to another username that is not currently in use.{% ifversion fpt %} If the username you want is not available, consider other names or unique variations. Using a number, hyphen, or an alternative spelling might help you identify a desirable username still available. -If the username is not eligible for release and you don't hold a trademark for the username, you can choose another username or keep your current username. {% data variables.contact.github_support %} cannot release the unavailable username for you. For more information, see "[Changing your username](#changing-your-username)."{% endif %} +If you hold a trademark for the username, you can find more information about making a trademark complaint on our [Trademark Policy](/articles/github-trademark-policy/) page. + +If you do not hold a trademark for the name, you can choose another username or keep your current username. {% data variables.contact.github_support %} cannot release the unavailable username for you. For more information, see "[Changing your username](#changing-your-username)."{% endif %} After changing your username, your old username becomes available for anyone else to claim. Most references to your repositories under the old username automatically change to the new username. However, some links to your profile won't automatically redirect. From a7f3d8ccbff2a9a3801f46631d59d89f3fc413ed Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Wed, 4 Aug 2021 12:32:11 +0200 Subject: [PATCH 4/6] Update content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username.md Co-authored-by: Matt Pollard --- .../changing-your-github-username.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username.md b/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username.md index b6ef9b427c..e6e928c37c 100644 --- a/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username.md +++ b/content/github/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username.md @@ -17,7 +17,7 @@ shortTitle: Change your username --- ## About username changes -You can change your username to another username that is not currently in use.{% ifversion fpt %} If the username you want is not available, consider other names or unique variations. Using a number, hyphen, or an alternative spelling might help you identify a desirable username still available. +You can change your username to another username that is not currently in use.{% ifversion fpt %} If the username you want is not available, consider other names or unique variations. Using a number, hyphen, or an alternative spelling might help you find a similar username that's still available. If you hold a trademark for the username, you can find more information about making a trademark complaint on our [Trademark Policy](/articles/github-trademark-policy/) page. From 010789c22b92ab3540d443dbc8bd6a3ae1805ab4 Mon Sep 17 00:00:00 2001 From: Ramya Parimi <33761166+ramyaparimi@users.noreply.github.com> Date: Wed, 4 Aug 2021 08:12:35 -0500 Subject: [PATCH 5/6] Update workflow-syntax-for-github-actions.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✏️ spell fix --- content/actions/reference/workflow-syntax-for-github-actions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/actions/reference/workflow-syntax-for-github-actions.md b/content/actions/reference/workflow-syntax-for-github-actions.md index e64c9c47bb..a63ae941ba 100644 --- a/content/actions/reference/workflow-syntax-for-github-actions.md +++ b/content/actions/reference/workflow-syntax-for-github-actions.md @@ -655,7 +655,7 @@ steps: `{owner}/{repo}@{ref}` -You can specificy a branch, ref, or SHA in a public {% data variables.product.prodname_dotcom %} repository. +You can specify a branch, ref, or SHA in a public {% data variables.product.prodname_dotcom %} repository. ```yaml jobs: From 90166580b0a651cd5a1fa820df141233c6ed7120 Mon Sep 17 00:00:00 2001 From: "github-service-catalog[bot]" <66641770+github-service-catalog[bot]@users.noreply.github.com> Date: Wed, 4 Aug 2021 15:13:35 +0000 Subject: [PATCH 6/6] ownership.yaml: Remove deprecated `mention` field (#20645) --- ownership.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ownership.yaml b/ownership.yaml index f7a3042429..f398d58663 100644 --- a/ownership.yaml +++ b/ownership.yaml @@ -9,7 +9,6 @@ ownership: maintainer: chiedo exec_sponsor: scottdensmore product_manager: emilyistoofunky - mention: github/docs-engineering qos: critical dependencies: [] sev1: