Merge branch 'main' into revert-19011-images-ab-test

Author: sarahs

.github/workflows/confirm-internal-staff-work-in-docs.yml

@@ -61,7 +61,8 @@ jobs:
               owner: 'github',
               repo: 'docs-internal',
               title: `@${context.payload.sender.login} confirm that \#${issueNo} should be in the public github/docs repo`,
-              body: `@${context.payload.sender.login} opened https://github.com/github/docs/issues/${issueNo} publicly in the github/docs repo, instead of the private github/docs-internal repo.\n\n@${context.payload.sender.login}, please confirm that this belongs in the public repo and that no sensitive information was disclosed by commenting below and closing the issue.\n\nIf this was not intentional and sensitive information was shared, please delete https://github.com/github/docs/issues/${issueNo} and notify us in the \#docs-open-source channel.\n\nThanks! \n\n/cc @github/docs @github/docs-engineering`
+              body: `@${context.payload.sender.login} opened https://github.com/github/docs/issues/${issueNo} publicly in the github/docs repo, instead of the private github/docs-internal repo.\n\n@${context.payload.sender.login}, please confirm that this belongs in the public repo and that no sensitive information was disclosed by commenting below and closing the issue.\n\nIf this was not intentional and sensitive information was shared, please delete https://github.com/github/docs/issues/${issueNo} and notify us in the \#docs-open-source channel.\n\nThanks! \n\n/cc @github/docs @github/docs-engineering`,
+              labels: ['OS confirmation'],
             });
 
             core.setOutput('did_warn', 'true')

.github/workflows/ping-staging-apps.yml

@@ -6,7 +6,7 @@ name: Ping staging apps
 
 on:
   schedule:
-    - cron: '*/20 * * * *' # every twenty minutes
+    - cron: '10,30,50 * * * *' # every twenty minutes
 
 jobs:
   ping_staging_apps:

.github/workflows/repo-sync.yml

@@ -18,7 +18,7 @@ name: Repo Sync
 on:
   workflow_dispatch:
   schedule:
-    - cron: '*/15 * * * *' # every 15 minutes
+    - cron: '10,25,40,55 * * * *' # every 15 minutes
 
 jobs:
   close-invalid-repo-sync:

content/developers/webhooks-and-events/github-event-types.md

@@ -45,7 +45,7 @@ The event objects returned from the Events API endpoints have the same structure
 This example shows the format of the [WatchEvent](#watchevent) response when using the [Events API](/rest/reference/activity#events).
 
 ```
-Status: 200 OK
+HTTP/1.1 200 OK
 Link: <https://api.github.com/resource?page=2>; rel="next",
       <https://api.github.com/resource?page=5>; rel="last"
 ```

content/rest/guides/getting-started-with-the-rest-api.md

@@ -62,7 +62,6 @@ $ curl -i https://api.github.com/users/defunkt
 > Server: GitHub.com
 > Date: Sun, 11 Nov 2012 18:43:28 GMT
 > Content-Type: application/json; charset=utf-8
-> Status: 200 OK
 > ETag: "bfd85cbf23ac0b0c8a29bee02e7117c6"
 > X-RateLimit-Limit: 60
 > X-RateLimit-Remaining: 57

content/rest/overview/resources-in-the-rest-api.md

@@ -39,7 +39,6 @@ $ curl -I {% data variables.product.api_url_pre %}/users/octocat/orgs
 > Server: nginx
 > Date: Fri, 12 Oct 2012 23:33:14 GMT
 > Content-Type: application/json; charset=utf-8
-> Status: 200 OK
 > ETag: "a00049ba79152d03380c34652f2cb612"
 > X-GitHub-Media-Type: github.v3
 > X-RateLimit-Limit: 5000
@@ -376,7 +375,6 @@ The returned HTTP headers of any API request show your current rate limit status
 $ curl -I {% data variables.product.api_url_pre %}/users/octocat
 > HTTP/1.1 200 OK
 > Date: Mon, 01 Jul 2013 17:27:06 GMT
-> Status: 200 OK
 > X-RateLimit-Limit: 60
 > X-RateLimit-Remaining: 56
 > X-RateLimit-Reset: 1372700873
@@ -400,7 +398,6 @@ If you exceed the rate limit, an error response returns:
 ```shell
 > HTTP/1.1 403 Forbidden
 > Date: Tue, 20 Aug 2013 14:50:41 GMT
-> Status: 403 Forbidden
 > X-RateLimit-Limit: 60
 > X-RateLimit-Remaining: 0
 > X-RateLimit-Reset: 1377013266
@@ -421,7 +418,6 @@ If your OAuth application needs to make unauthenticated calls with a higher rate
 $ curl -u my_client_id:my_client_secret {% data variables.product.api_url_pre %}/user/repos
 > HTTP/1.1 200 OK
 > Date: Mon, 01 Jul 2013 17:27:06 GMT
-> Status: 200 OK
 > X-RateLimit-Limit: 5000
 > X-RateLimit-Remaining: 4966
 > X-RateLimit-Reset: 1372700873
@@ -510,7 +506,6 @@ $ curl -I {% data variables.product.api_url_pre %}/user
 > Cache-Control: private, max-age=60
 > ETag: "644b5b0155e6404a9cc4bd9d8b1ae730"
 > Last-Modified: Thu, 05 Jul 2012 15:31:30 GMT
-> Status: 200 OK
 > Vary: Accept, Authorization, Cookie
 > X-RateLimit-Limit: 5000
 > X-RateLimit-Remaining: 4996
@@ -521,7 +516,6 @@ $ curl -I {% data variables.product.api_url_pre %}/user -H 'If-None-Match: "644b
 > Cache-Control: private, max-age=60
 > ETag: "644b5b0155e6404a9cc4bd9d8b1ae730"
 > Last-Modified: Thu, 05 Jul 2012 15:31:30 GMT
-> Status: 304 Not Modified
 > Vary: Accept, Authorization, Cookie
 > X-RateLimit-Limit: 5000
 > X-RateLimit-Remaining: 4996
@@ -531,7 +525,6 @@ $ curl -I {% data variables.product.api_url_pre %}/user -H "If-Modified-Since: T
 > HTTP/1.1 304 Not Modified
 > Cache-Control: private, max-age=60
 > Last-Modified: Thu, 05 Jul 2012 15:31:30 GMT
-> Status: 304 Not Modified
 > Vary: Accept, Authorization, Cookie
 > X-RateLimit-Limit: 5000
 > X-RateLimit-Remaining: 4996

content/rest/reference/activity.md

@@ -56,7 +56,7 @@ To get a feed in Atom format, you must specify the `application/atom+xml` type i
 #### Response
 
 ```shell
-Status: 200 OK
+HTTP/1.1 200 OK
 ```
 
 ```xml

script/i18n/homogenize-frontmatter.js

@@ -0,0 +1,59 @@
+#!/usr/bin/env node
+
+// [start-readme]
+//
+// Run this script to fix known frontmatter errors by copying values from english file
+// Translatable properties are designated in the frontmatter JSON schema
+//
+// [end-readme]
+
+const { execSync } = require('child_process')
+const fs = require('fs')
+const path = require('path')
+const readFileAsync = require('../../lib/readfile-async')
+const fm = require('../../lib/frontmatter')
+const matter = require('gray-matter')
+
+const extractFrontmatter = async (path) => {
+  const fileContents = await readFileAsync(path, 'utf8')
+  return fm(fileContents)
+}
+
+// Find all content files that differ from the default branch
+// TODO: make sure this will work in an Actions workflow
+const cmd = 'git -c diff.renameLimit=10000 diff --name-only origin/main'
+const changedFilesRelPaths = execSync(cmd)
+  .toString()
+  .split('\n')
+  .filter(filename => {
+    return filename.startsWith('translations/') &&
+    filename.includes('/content/') &&
+    !filename.endsWith('README.md')
+  })
+
+changedFilesRelPaths.forEach(async (relPath) => {
+  const localisedAbsPath = path.join(__dirname, '../..', relPath)
+  // find the corresponding english file by removing the first 2 path segments: /translations/<language code>
+  const engAbsPath = path.join(__dirname, '../..', relPath.split(path.sep).slice(2).join(path.sep))
+
+  const localisedFrontmatter = await extractFrontmatter(localisedAbsPath)
+  if (!localisedFrontmatter) return
+
+  // Load frontmatter from the source english file
+  const englishFrontmatter = await extractFrontmatter(engAbsPath)
+
+  // Look for differences between the english and localised non-translatable properties
+  let overWroteSomething = false
+  for (const prop in englishFrontmatter.data) {
+    if (!fm.schema.properties[prop].translatable && localisedFrontmatter.data[prop] !== englishFrontmatter.data[prop]) {
+      localisedFrontmatter.data[prop] = englishFrontmatter.data[prop]
+      overWroteSomething = true
+    }
+  }
+
+  // rewrite the localised file, if it changed
+  if (overWroteSomething) {
+    const toWrite = matter.stringify(localisedFrontmatter.content, localisedFrontmatter.data, { lineWidth: 10000, forceQuotes: true })
+    fs.writeFileSync(localisedAbsPath, toWrite)
+  }
+})

translations/de-DE/content/developers/webhooks-and-events/github-event-types.md

@@ -45,7 +45,7 @@ The event objects returned from the Events API endpoints have the same structure
 This example shows the format of the [WatchEvent](#watchevent) response when using the [Events API](/rest/reference/activity#events).
 
 ```
-Status: 200 OK
+HTTP/1.1 200 OK
 Link: <https://api.github.com/resource?page=2>; rel="next",
       <https://api.github.com/resource?page=5>; rel="last"
 ```

translations/de-DE/content/rest/guides/getting-started-with-the-rest-api.md

@@ -57,7 +57,6 @@ $ curl -i https://api.github.com/users/defunkt
 > Server: GitHub.com
 > Date: Sun, 11 Nov 2012 18:43:28 GMT
 > Content-Type: application/json; charset=utf-8
-> Status: 200 OK
 > ETag: "bfd85cbf23ac0b0c8a29bee02e7117c6"
 > X-RateLimit-Limit: 60
 > X-RateLimit-Remaining: 57