Merge pull request #13923 from MicrosoftDocs/gary-workflows-tcphelp

Replace aka.ms/AskAnAdmin with aka.ms/tcphelp

Author: garycentric

.github/workflows/Shared-AutoPublishV2.yml

@@ -95,10 +95,10 @@ jobs:
 
                 # PR variables
                 $PrTitle = "[AutoPublish] $DefaultBranch to $TargetBranch"
-                $AutoMergeDisabledPrDescriptionPubOps = "@MicrosoftDocs/marveldocs-pubops`n`nThis is an automated pull request to publish changes from the $DefaultBranch branch to the $TargetBranch branch. Merging this PR will publish the changes to the live learn.microsoft.com site.`n`n**Auto-merge is disabled.** This PR must be merged manually.`n`nBefore merging this PR, complete the following checks before merging this PR:`n`n- If there are more than $MaxAllowedChangedFiles files, the repo will not automatically merge the PR. Review the changes for any obvious mistakes such as mass-deleted files. If the changes appear normal (bulk changes, general updates to many files, etc), merge the PR. If you're not sure, do not merge the PR and investigate further.`n- If there are warnings or failing checks, resolve them before merging the PR.`n- View the changes on https://review.learn.microsoft.com to confirm the changes look correct on the site.`n`nAfter you've completed these steps, manually merge the PR.`n`nIf you have questions, post a message to https://aka.ms/askanadmin."
-                $AutoMergeDisabledPrDescriptionNonPubOps = "This is an automated pull request to publish changes from the $DefaultBranch branch to the $TargetBranch branch. Merging this PR will publish the changes to the live learn.microsoft.com site.`n`n**Auto-merge is disabled.** This PR must be merged manually.`n`nBefore you merge this PR, complete the following checks before merging this PR:`n`n- If there are more than $MaxAllowedChangedFiles files, the repo will not automatically merge the PR. Review the changes for any obvious mistakes such as mass-deleted files. If the changes appear normal (bulk changes, general updates to many files, etc), merge the PR. If you're not sure, do not merge the PR and investigate further.`n- If there are warnings or failing checks, resolve them before merging the PR.`n- View the changes on https://review.learn.microsoft.com to confirm the changes look correct on the site.`n`nAfter you've completed these steps, manually merge the PR.`n`n**Note**: This is repo isn't managed by PubOps. **A contributor with write access to this repo will need to merge this PR for changes in it to go live.`n`nIf you have questions, post a message to https://aka.ms/askanadmin."
-                $AutoMergeEnabledPrDescriptionPubOps = "@MicrosoftDocs/marveldocs-pubops`n`nThis is an automated pull request to publish changes from the $DefaultBranch branch to the $TargetBranch branch. Merging this PR will publish the changes to the live learn.microsoft.com site.`n`n**Auto-merge is enabled.** The repo will attempt to automatically merge this PR when all required checks pass. If the PR is automatically merged, no further action is required to publish the contents of this PR.`n`nIn the event the repo can't automatically merge this PR, the **Manual merge required** label will be added to the PR. If this happens, complete the following checks before merging this PR:`n`n- If there are more than $MaxAllowedChangedFiles files, the repo will not automatically merge the PR. Review the changes for any obvious mistakes such as mass-deleted files. If the changes appear normal (bulk changes, general updates to many files, etc), merge the PR. If you're not sure, do not merge the PR and investigate further.`n- If there are warnings or failing checks, resolve them before merging the PR.`n- View the changes on https://review.learn.microsoft.com to confirm the changes look correct on the site.`n`nAfter you've completed these steps, manually merge the PR.`n`nIf you have questions, post a message to https://aka.ms/askanadmin."
-                $AutoMergeEnabledPrDescriptionNonPubOps = "This is an automated pull request to publish changes from the $DefaultBranch branch to the $TargetBranch branch. Merging this PR will publish the changes to the live learn.microsoft.com site.`n`n**Auto-merge is enabled.** The repo will attempt to automatically merge this PR when all required checks pass. If the PR is automatically merged, no further action is required to publish the contents of this PR.`n`nIn the event the repo can't automatically merge this PR, the **Manual merge required** label will be added to the PR. If this happens, complete the following checks before merging this PR:`n`n- If there are more than $MaxAllowedChangedFiles files, the repo will not automatically merge the PR. Review the changes for any obvious mistakes such as mass-deleted files. If the changes appear normal (bulk changes, general updates to many files, etc), merge the PR. If you're not sure, do not merge the PR and investigate further.`n- If there are warnings or failing checks, resolve them before merging the PR.`n- View the changes on https://review.learn.microsoft.com to confirm the changes look correct on the site.`n`nAfter you've completed these steps, manually merge the PR.`n`n**Note**: This is repo isn't managed by PubOps. **If a manual merge is required, a contributor with write access to this repo will need to merge this PR for changes in it to go live.**`n`nIf you have questions, post a message to https://aka.ms/askanadmin."
+                $AutoMergeDisabledPrDescriptionPubOps = "@MicrosoftDocs/marveldocs-pubops`n`nThis is an automated pull request to publish changes from the $DefaultBranch branch to the $TargetBranch branch. Merging this PR will publish the changes to the live learn.microsoft.com site.`n`n**Auto-merge is disabled.** This PR must be merged manually.`n`nBefore merging this PR, complete the following checks before merging this PR:`n`n- If there are more than $MaxAllowedChangedFiles files, the repo will not automatically merge the PR. Review the changes for any obvious mistakes such as mass-deleted files. If the changes appear normal (bulk changes, general updates to many files, etc), merge the PR. If you're not sure, do not merge the PR and investigate further.`n- If there are warnings or failing checks, resolve them before merging the PR.`n- View the changes on https://review.learn.microsoft.com to confirm the changes look correct on the site.`n`nAfter you've completed these steps, manually merge the PR.`n`nIf you have questions, post a message to https://aka.ms/tcphelp."
+                $AutoMergeDisabledPrDescriptionNonPubOps = "This is an automated pull request to publish changes from the $DefaultBranch branch to the $TargetBranch branch. Merging this PR will publish the changes to the live learn.microsoft.com site.`n`n**Auto-merge is disabled.** This PR must be merged manually.`n`nBefore you merge this PR, complete the following checks before merging this PR:`n`n- If there are more than $MaxAllowedChangedFiles files, the repo will not automatically merge the PR. Review the changes for any obvious mistakes such as mass-deleted files. If the changes appear normal (bulk changes, general updates to many files, etc), merge the PR. If you're not sure, do not merge the PR and investigate further.`n- If there are warnings or failing checks, resolve them before merging the PR.`n- View the changes on https://review.learn.microsoft.com to confirm the changes look correct on the site.`n`nAfter you've completed these steps, manually merge the PR.`n`n**Note**: This is repo isn't managed by PubOps. **A contributor with write access to this repo will need to merge this PR for changes in it to go live.`n`nIf you have questions, post a message to https://aka.ms/tcphelp."
+                $AutoMergeEnabledPrDescriptionPubOps = "@MicrosoftDocs/marveldocs-pubops`n`nThis is an automated pull request to publish changes from the $DefaultBranch branch to the $TargetBranch branch. Merging this PR will publish the changes to the live learn.microsoft.com site.`n`n**Auto-merge is enabled.** The repo will attempt to automatically merge this PR when all required checks pass. If the PR is automatically merged, no further action is required to publish the contents of this PR.`n`nIn the event the repo can't automatically merge this PR, the **Manual merge required** label will be added to the PR. If this happens, complete the following checks before merging this PR:`n`n- If there are more than $MaxAllowedChangedFiles files, the repo will not automatically merge the PR. Review the changes for any obvious mistakes such as mass-deleted files. If the changes appear normal (bulk changes, general updates to many files, etc), merge the PR. If you're not sure, do not merge the PR and investigate further.`n- If there are warnings or failing checks, resolve them before merging the PR.`n- View the changes on https://review.learn.microsoft.com to confirm the changes look correct on the site.`n`nAfter you've completed these steps, manually merge the PR.`n`nIf you have questions, post a message to https://aka.ms/tcphelp."
+                $AutoMergeEnabledPrDescriptionNonPubOps = "This is an automated pull request to publish changes from the $DefaultBranch branch to the $TargetBranch branch. Merging this PR will publish the changes to the live learn.microsoft.com site.`n`n**Auto-merge is enabled.** The repo will attempt to automatically merge this PR when all required checks pass. If the PR is automatically merged, no further action is required to publish the contents of this PR.`n`nIn the event the repo can't automatically merge this PR, the **Manual merge required** label will be added to the PR. If this happens, complete the following checks before merging this PR:`n`n- If there are more than $MaxAllowedChangedFiles files, the repo will not automatically merge the PR. Review the changes for any obvious mistakes such as mass-deleted files. If the changes appear normal (bulk changes, general updates to many files, etc), merge the PR. If you're not sure, do not merge the PR and investigate further.`n- If there are warnings or failing checks, resolve them before merging the PR.`n- View the changes on https://review.learn.microsoft.com to confirm the changes look correct on the site.`n`nAfter you've completed these steps, manually merge the PR.`n`n**Note**: This is repo isn't managed by PubOps. **If a manual merge is required, a contributor with write access to this repo will need to merge this PR for changes in it to go live.**`n`nIf you have questions, post a message to https://aka.ms/tcphelp."
 
                 # Label variables
                 $AutoPublishLabelColor = "5319E7"

.github/workflows/Shared-TierManagement.yml

@@ -72,9 +72,9 @@ jobs:
             $SignOffLabelColor = "46ce1c"
             $SignOffLabelDescription = "The pull request is ready to be reviewed and merged by PubOps."
             $SignOffLabel = "Sign off"
-            $InvalidTargetBranchString = "Hi @{1}<br><br>The target (base) branch of this PR, **{2}**, doesn't support the **{0}** command. The **{0}** command can only be used to merge pull requests into the default branch **{3}** or into branches beginning with **release-**.<br><br>Please retarget your PR to either the default branch **{3}** or to a release branch.<br><br>If you have questions, please post a message to https://aka.ms/askanadmin." # Variable substitution happens in script.
-            $Tier3LabelMissingString = "hi @{1},<br><br>The **{0}** command can't be used on this PR because the none of the files included in it are classified as Tier3/Selfserve. At least one file needs to be classified as Tier3/Selfserve. Please work with the owner of the article(s) (found in the **ms.author** metadata field in the article) to review and merge this PR.<br><br>If you're the owner of the article(s) and your alias is specified in **ms.author**, work with the Magic content team that owns the content set to classify the article(s) as Tier3/Selfserve.<br><br>If you have questions, please post a message to https://aka.ms/askanadmin." -f $SignOffString, $CommentUser
-            $PrSubmittedToReviewString = "Hi @{0},<br><br>This PR has been sent to our publishing team for review to ensure content quality and completeness. A member of our publishing team will contact you within {1} business hours.<br><br>If you have questions, please post a message to https://aka.ms/askanadmin." -f $CommentUser, $ReviewResponseHours
+            $InvalidTargetBranchString = "Hi @{1}<br><br>The target (base) branch of this PR, **{2}**, doesn't support the **{0}** command. The **{0}** command can only be used to merge pull requests into the default branch **{3}** or into branches beginning with **release-**.<br><br>Please retarget your PR to either the default branch **{3}** or to a release branch.<br><br>If you have questions, please post a message to https://aka.ms/tcphelp." # Variable substitution happens in script.
+            $Tier3LabelMissingString = "hi @{1},<br><br>The **{0}** command can't be used on this PR because the none of the files included in it are classified as Tier3/Selfserve. At least one file needs to be classified as Tier3/Selfserve. Please work with the owner of the article(s) (found in the **ms.author** metadata field in the article) to review and merge this PR.<br><br>If you're the owner of the article(s) and your alias is specified in **ms.author**, work with the Magic content team that owns the content set to classify the article(s) as Tier3/Selfserve.<br><br>If you have questions, please post a message to https://aka.ms/tcphelp." -f $SignOffString, $CommentUser
+            $PrSubmittedToReviewString = "Hi @{0},<br><br>This PR has been sent to our publishing team for review to ensure content quality and completeness. A member of our publishing team will contact you within {1} business hours.<br><br>If you have questions, please post a message to https://aka.ms/tcphelp." -f $CommentUser, $ReviewResponseHours
 
             $SignOffRegex = "(?m)^\s*$SignOffString\s*$"
 
@@ -472,7 +472,7 @@ jobs:
             $CommentsUrl = $GitHubData.event.pull_request.comments_url
             $UserPermissionUrl = $GitHubData.event.repository.collaborators_url.Replace("{/collaborator}", "/$GitHubSender/permission" )
 
-            $DraftMessage = "<h1>Pull request set to Draft</h1><p>Hi @{0}. <p>To avoid accidentally publishing the changes in this pull request prematurely, its state has been changed to <b>Draft</b>.<p>When you're ready for the changes in this pull request to be published live, select the <b>Ready for review</b> button at the bottom of the page.<p>If you have questions, please post a message to <a href=`"https://aka.ms/askanadmin`">https://aka.ms/askanadmin</a>."
+            $DraftMessage = "<h1>Pull request set to Draft</h1><p>Hi @{0}. <p>To avoid accidentally publishing the changes in this pull request prematurely, its state has been changed to <b>Draft</b>.<p>When you're ready for the changes in this pull request to be published live, select the <b>Ready for review</b> button at the bottom of the page.<p>If you have questions, please post a message to <a href=`"https://aka.ms/tcphelp`">https://aka.ms/tcphelp</a>."
 
             # Create github HTTP authentication header 
             $GitHubHeaders = @{}