Merge branch 'main' into patch-1

Author: felicitymay

content/github/collaborating-with-issues-and-pull-requests/about-branches.md

@@ -23,7 +23,7 @@ You must have write access to a repository to create a branch, open a pull reque
 
 ### About the default branch
 
-{% data reusables.branches.new-repo-default-branch %} The default branch is the branch that {% data variables.product.prodname_dotcom %} displays when anyone visits your repository. The default branch is also the initial branch that Git checks out locally out when someone clones the repository. {% data reusables.branches.default-branch-automatically-base-branch %}
+{% data reusables.branches.new-repo-default-branch %} The default branch is the branch that {% data variables.product.prodname_dotcom %} displays when anyone visits your repository. The default branch is also the initial branch that Git checks out locally when someone clones the repository. {% data reusables.branches.default-branch-automatically-base-branch %}
 
 By default, {% data variables.product.product_name %} names the default branch {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" or currentVersion == "github-ae@latest" %}`main`{% else %}`master`{% endif %} in any new repository.
 
@@ -75,7 +75,7 @@ When a branch is protected:
 - If required pull request reviews are enabled on the branch, you won't be able to merge changes into the branch until all requirements in the pull request review policy have been met. For more information, see "[Merging a pull request](/articles/merging-a-pull-request)."
 - If required review from a code owner is enabled on a branch, and a pull request modifies code that has an owner, a code owner must approve the pull request before it can be merged. For more information, see "[About code owners](/articles/about-code-owners)."
 - If required commit signing is enabled on a branch, you won't be able to push any commits to the branch that are not signed and verified. For more information, see "[About commit signature verification](/articles/about-commit-signature-verification)" and "[About required commit signing](/articles/about-required-commit-signing)."{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "[email protected]" %}
-- If you use {% data variables.product.prodname_dotcom %} 's conflict editor to fix conflicts for a pull request that you created from a protected branch, {% data variables.product.prodname_dotcom %}  helps you to create an alternative branch for the pull request, so that your resolution of the conflicts can be merged. For more information, see "[Resolving a merge conflict on {% data variables.product.prodname_dotcom %}](/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github)."{% endif %}
+- If you use {% data variables.product.prodname_dotcom %}'s conflict editor to fix conflicts for a pull request that you created from a protected branch, {% data variables.product.prodname_dotcom %}  helps you to create an alternative branch for the pull request, so that your resolution of the conflicts can be merged. For more information, see "[Resolving a merge conflict on {% data variables.product.prodname_dotcom %}](/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github)."{% endif %}
 
 ### Further reading
 

content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio.md

@@ -53,8 +53,12 @@ Connecting to {% data variables.product.prodname_github_codespaces %}  with the
 
 ### Configuring a codespace for {% data variables.product.prodname_vs %}
 
-The default codespace environment created by {% data variables.product.prodname_vs %} includes popular frameworks and tools such as .NET Core, Microsoft SQL Server, Python, and the Windows SDK. {% data variables.product.prodname_github_codespaces %} created with {% data variables.product.prodname_vs %} can be customized through a subset of `devcontainers.json` properties and a new tool called devinit, included with {% data variables.product.prodname_vs %}.
+A codespace, created with {% data variables.product.prodname_vs %}, can be customized through a new tool called devinit, a command line tool included with {% data variables.product.prodname_vs %}.
 
 #### devinit
 
-The [devinit](https://docs.microsoft.com/visualstudio/devinit/getting-started-with-devinit) command-line tool lets you install additional frameworks and tools into your Windows development codespaces, as well as run PowerShell scripts or modify environment variables. devinit supports a configuration file called [devinit.json](https://docs.microsoft.com/visualstudio/devinit/devinit-json), which can be added to your project for creating customized and repeatable development environments. For more information about Windows codespace configuration and devinit, see [Customize a codespace](https://docs.microsoft.com/visualstudio/ide/codespaces/customize-codespaces) in the {% data variables.product.prodname_vs %} documentation.
+[devinit](https://docs.microsoft.com/visualstudio/devinit/getting-started-with-devinit) lets you install additional frameworks and tools into your Windows development codespaces, modify environment variables, and more. 
+
+devinit supports a configuration file called [devinit.json](https://docs.microsoft.com/visualstudio/devinit/devinit-json). You can add this file to your project if you want to create a customized and repeatable development environment. When you use devinit with a [devcontainer.json](https://docs.microsoft.com/visualstudio/ide/codespaces/customize-codespaces#running-devinit-when-creating-a-codespace) file, your codespaces will be automatically configured on creation.
+
+For more information about Windows codespace configuration and devinit, see [Customize a codespace](https://docs.microsoft.com/visualstudio/ide/codespaces/customize-codespaces) in the {% data variables.product.prodname_vs %} documentation. For more information about devinit, see [Getting started with devinit](https://docs.microsoft.com/visualstudio/devinit/getting-started-with-devinit).

data/reusables/ssh/add-ssh-key-to-ssh-agent-commandline.md

@@ -1,3 +1,3 @@
 ```shell
-$ ssh-add ~/.ssh/id_rsa
+$ ssh-add ~/.ssh/id_ed25519
 ```

data/reusables/ssh/add-ssh-key-to-ssh-agent.md

@@ -1 +1 @@
-If you created your key with a different name, or if you are adding an existing key that has a different name, replace *id_rsa* in the command with the name of your private key file.
+If you created your key with a different name, or if you are adding an existing key that has a different name, replace *id_ed25519* in the command with the name of your private key file.

includes/article.html

@@ -55,11 +55,6 @@ <h3 id="in-this-article" class="f5 mb-2"><a class="link-gray-dark" href="#in-thi
           {% endfor %}
         </ul>
         {% endif %}
-        <div class="d-none d-xl-block{% if miniTocItems.size > 1 %} border-top border-gray-light mt-4{% endif %}">
-          {% assign helpId = 'xl' %}
-          {% include helpfulness %}
-          {% include contribution %}
-        </div>
       </div>
     </div>
     <div id="article-contents" class="article-grid-body">
@@ -70,8 +65,7 @@ <h3 id="in-this-article" class="f5 mb-2"><a class="link-gray-dark" href="#in-thi
     </div>
     </div>
 
-    <div class="d-block d-xl-none border-top border-gray-light mt-4 markdown-body">
-      {% assign helpId = 'sm' %}
+    <div class="d-block border-top border-gray-light mt-4 markdown-body">
       {% include helpfulness %}
       {% include contribution %}
     </div>

includes/helpfulness.html

@@ -1,5 +1,5 @@
 {% unless enterpriseServerReleases.isOldestReleaseDeprecated and currentVersion contains enterpriseServerReleases.oldestSupported %}
-<form class="js-helpfulness mt-4 f5" id="helpfulness-{{ helpId }}">
+<form class="js-helpfulness mt-4 f5">
   <h4
     data-help-start
     data-help-yes
@@ -19,24 +19,24 @@
   >
     <input
       hidden
-      id="helpfulness-yes-{{ helpId }}"
+      id="helpfulness-yes"
       type="radio"
       name="helpfulness-vote"
       value="Yes"
       aria-label="{% data ui.helpfulness.yes %}"
     />
-    <label class="btn x-radio-label" for="helpfulness-yes-{{ helpId }}">
+    <label class="btn x-radio-label" for="helpfulness-yes">
       {% octicon "thumbsup" height="24" %}
     </label>
     <input
       hidden
-      id="helpfulness-no-{{ helpId }}"
+      id="helpfulness-no"
       type="radio"
       name="helpfulness-vote"
       value="No"
       aria-label="{% data ui.helpfulness.no %}"
     />
-    <label class="btn x-radio-label" for="helpfulness-no-{{ helpId }}">
+    <label class="btn x-radio-label" for="helpfulness-no">
       {% octicon "thumbsdown" height="24" %}
     </label>
   </p>
@@ -55,7 +55,7 @@
   <p hidden data-help-no>
     <label
       class="d-block mb-1 f6"
-      for="helpfulness-category-{{ helpId }}"
+      for="helpfulness-category"
     >
       {% data ui.helpfulness.category_label %}
       <span class="text-normal text-gray-light float-right ml-1">
@@ -65,7 +65,7 @@
     <select
       class="form-control select-sm width-full"
       name="helpfulness-category"
-      id="helpfulness-category-{{ helpId }}"
+      id="helpfulness-category"
     >
       <option value="">
         {% data ui.helpfulness.category_default %}
@@ -87,7 +87,7 @@
   <p hidden data-help-no>
     <label
       class="d-block mb-1 f6"
-      for="helpfulness-comment-{{ helpId }}"
+      for="helpfulness-comment"
     >
       <span>{% data ui.helpfulness.comment_label %}</span>
       <span class="text-normal text-gray-light float-right ml-1">
@@ -97,13 +97,13 @@
     <textarea
       class="form-control input-sm width-full"
       name="helpfulness-comment"
-      id="helpfulness-comment-{{ helpId }}"
+      id="helpfulness-comment"
     ></textarea>
   </p>
   <p>
     <label
       class="d-block mb-1 f6"
-      for="helpfulness-email-{{ helpId }}"
+      for="helpfulness-email"
       hidden
       data-help-no
     >
@@ -116,7 +116,7 @@
       type="email"
       class="form-control input-sm width-full"
       name="helpfulness-email"
-      id="helpfulness-email-{{ helpId }}"
+      id="helpfulness-email"
       placeholder="{% data ui.helpfulness.email_placeholder %}"
       hidden
       data-help-yes
@@ -137,4 +137,4 @@
     {% data ui.helpfulness.feedback %}
   </p>
 </form>
-{% endunless %}
+{% endunless %}

javascripts/experiment.js

@@ -41,28 +41,4 @@ export default function () {
   // const xbucket = bucket(testName)
   // if (xbucket === TREATMENT) { ... }
   // x.addEventListener('click', () => { sendSuccess(testName) })
-
-  const testName = 'helpfulness-prompt-to-bottom'
-  const xbucket = bucket(testName)
-
-  if (xbucket === TREATMENT) {
-    const bigHelpfulness = document.querySelector('#helpfulness-xl')
-    const smallHelpfulness = document.querySelector('#helpfulness-sm')
-
-    // Check that helpfulness prompt is present on this page
-    if (!(bigHelpfulness && smallHelpfulness)) {
-      return
-    }
-
-    // Remove the -xl prompts
-    bigHelpfulness.parentElement.parentElement.removeChild(bigHelpfulness.parentElement)
-
-    // Always show the -sm prompt
-    smallHelpfulness.parentElement.classList.remove('d-xl-none')
-  }
-
-  const votes = Array.from(document.querySelectorAll('.js-helpfulness [type=radio]'))
-  votes.forEach(voteEl => {
-    voteEl.addEventListener('change', () => { sendSuccess(testName) })
-  })
 }

javascripts/helpfulness.js

@@ -1,17 +1,15 @@
 import { sendEvent } from './events'
 
 export default function helpfulness () {
-  const forms = Array.from(document.querySelectorAll('.js-helpfulness'))
+  const form = document.querySelector('.js-helpfulness')
   const texts = Array.from(document.querySelectorAll('.js-helpfulness input, .js-helpfulness textarea'))
   const votes = Array.from(document.querySelectorAll('.js-helpfulness [type=radio]'))
-  if (!forms.length || !texts.length || !votes.length) return
+  if (!form || !texts.length || !votes.length) return
 
-  forms.forEach(form => {
-    form.addEventListener('submit', async evt => {
-      evt.preventDefault()
-      await submitForm(evt.target)
-      updateDisplay(form, 'end')
-    })
+  form.addEventListener('submit', async evt => {
+    evt.preventDefault()
+    await submitForm(evt.target)
+    updateDisplay(form, 'end')
   })
 
   votes.forEach(voteEl => {

package-lock.json

@@ -16,7 +16,7 @@
     "@github-docs/data-directory": "^1.2.0",
     "@github-docs/frontmatter": "^1.3.1",
     "@github-docs/render-content": "^5.2.0",
-    "@github/rest-api-operations": "^3.7.1",
+    "@github/rest-api-operations": "^3.7.3",
     "@octokit/rest": "^16.38.1",
     "@primer/css": "^15.1.0",
     "@primer/octicons": "^11.0.0",