Merge branch 'main' into patch-1

Author: tecc

.github/workflows/msft-create-translation-batch-pr.yml

@@ -47,9 +47,9 @@ jobs:
 
           # We'll be ready to add the following languages in a future effort.
 
-          # - language: ru
-          #   language_dir: translations/ru-RU
-          #   language_repo: github/docs-internal.ru-ru
+          - language: ru
+            language_dir: translations/ru-RU
+            language_repo: github/docs-internal.ru-ru
 
           # - language: ko
           #   language_dir: translations/ko-KR

.github/workflows/sync-search-elasticsearch.yml

@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         # This needs to match the languages we support
-        language: [en, ja, es, pt, cn]
+        language: [en, ja, es, pt, cn, ru]
     steps:
       - if: ${{ env.FREEZE == 'true' }}
         run: |

.github/workflows/wip-langs-create-translation-batch-pr.yml

@@ -63,11 +63,6 @@ jobs:
       - name: Remove unwanted git hooks
         run: rm .git/hooks/post-checkout
 
-      - name: Remove all language translations
-        run: |
-          git rm -rf --quiet ${{ matrix.language_dir }}/content
-          git rm -rf --quiet ${{ matrix.language_dir }}/data
-
       - name: Checkout the language-specific repo
         uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
         with:

content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md

@@ -186,12 +186,12 @@ The old method of specifying images based on the theme, by using a fragment appe
 
 ## Lists
 
-You can make an unordered list by preceding one or more lines of text with <kbd>-</kbd> or <kbd>*</kbd>.
+You can make an unordered list by preceding one or more lines of text with <kbd>-</kbd>, <kbd>*</kbd>, or <kbd>+</kbd>.
 
 ```markdown
 - George Washington
-- John Adams
-- Thomas Jefferson
+* John Adams
++ Thomas Jefferson
 ```
 
 ![Rendered unordered list](/assets/images/help/writing/unordered-list-rendered.png)

content/issues/planning-and-tracking-with-projects/automating-your-project/using-the-api-to-manage-projects.md

@@ -660,7 +660,7 @@ The following example will update the value of an iteration field for an item.
 curl --request POST \
   --url https://api.github.com/graphql \
   --header 'Authorization: Bearer TOKEN' \
-  --data '{"query":"mutation {updateProjectV2ItemFieldValue( input: { projectId: \"PROJECT_ID\" itemId: \"ITEM_ID\" fieldId: \"FIELD_ID\" value: { singleSelectOptionId: \"OPTION_ID\" }}) { projectV2Item { id }}}"}'
+  --data '{"query":"mutation {updateProjectV2ItemFieldValue( input: { projectId: \"PROJECT_ID\" itemId: \"ITEM_ID\" fieldId: \"FIELD_ID\" value: { iterationId: \"ITERATION_ID\" }}) { projectV2Item { id }}}"}'
 ```
 {% endcurl %}
 

data/features/dependabot-version-updates-enhanced-docker-support.yml

@@ -0,0 +1,7 @@
+# Reference: Issue #8544
+# Title: Dependabot support for updating Docker image tags in Kubernetes manifests
+
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>= 3.8'

data/reusables/dependabot/supported-package-managers.md

@@ -9,23 +9,23 @@ Package manager | YAML value      | Supported versions | Private repositories |
 Bundler        | `bundler`        | v1, v2           | | **✓** | **✓** |
 Cargo          | `cargo`          | v1               | **✓** | **✓** | |
 Composer       | `composer`       | v1, v2           | **✓** | **✓** | |
-Docker         | `docker`         | v1               | **✓** | **✓** | |
+Docker {% ifversion dependabot-version-updates-enhanced-docker-support %}<sup>[1]</sup>{% endif %}         | `docker`         | v1               | **✓** | **✓** | |
 Hex            | `mix`            | v1               | | **✓** | |
 elm-package    | `elm`            | v0.19            | **✓** | **✓** | |
 git submodule  | `gitsubmodule`   | N/A (no version) | **✓** | **✓** | |
 GitHub Actions | `github-actions` | N/A (no version) | **✓** | **✓** | |
 Go modules     | `gomod`          | v1               | **✓** | **✓** | **✓** |
-Gradle         | `gradle`         | N/A (no version)<sup>[1]</sup>   | **✓** | **✓** | |
-Maven          | `maven`          | N/A (no version)<sup>[2]</sup>   | **✓** | **✓** | |
+Gradle         | `gradle`         | N/A (no version)<sup>[2]</sup>   | **✓** | **✓** | |
+Maven          | `maven`          | N/A (no version)<sup>[3]</sup>   | **✓** | **✓** | |
 npm            | `npm`            | v6, v7, v8       | **✓** | **✓** | |
-NuGet          | `nuget`          | <= 4.8<sup>[3]</sup> | **✓** | **✓** | |
+NuGet          | `nuget`          | <= 4.8<sup>[4]</sup> | **✓** | **✓** | |
 pip{% ifversion dependabot-PEP621-support %}<sup>[5]</sup>{% endif %}          | `pip`            | v21.1.2          | | **✓** | |
 pipenv         | `pip`            | <= 2021-05-29    | | **✓** | |
 pip-compile{% ifversion dependabot-PEP621-support %}<sup>[5]</sup>{% endif %}   | `pip`            | 6.1.0            | | **✓** | |
 poetry         | `pip`            | v1               | | **✓** | |{% ifversion fpt or ghec or ghes > 3.4 %}
-pub            | `pub`            | v2 <sup>[4]</sup> | | | |{% endif %}
+pub            | `pub`            | v2 <sup>[6]</sup> | | | |{% endif %}
 Terraform      | `terraform`      | >= 0.13, <= 1.2.x  | **✓** | **✓** | |
-{% ifversion dependabot-yarn-v3-update %}yarn           | `npm`            | v1, v2, v3       | **✓** | **✓** | **✓**<sup>[6]</sup> |{% else %}yarn           | `npm`            | v1               | **✓** | **✓** |  |
+{% ifversion dependabot-yarn-v3-update %}yarn           | `npm`            | v1, v2, v3       | **✓** | **✓** | **✓**<sup>[7]</sup> |{% else %}yarn           | `npm`            | v1               | **✓** | **✓** |  |
 {% endif %}
 
 {% tip %}
@@ -34,25 +34,30 @@ Terraform      | `terraform`      | >= 0.13, <= 1.2.x  | **✓** | **✓** | |
 
 {% endtip %}
 
-[1] {% data variables.product.prodname_dependabot %} doesn't run Gradle but supports updates to the following files: `build.gradle`, `build.gradle.kts` (for Kotlin projects), and files included via the `apply` declaration that have `dependencies` in the filename. Note that `apply` does not support `apply to`, recursion, or advanced syntaxes (for example, Kotlin's `apply` with `mapOf`, filenames defined by property).
+{% ifversion dependabot-version-updates-enhanced-docker-support %}
+[1] {% data variables.product.prodname_dependabot %} can update Docker image tags in Kubernetes manifests. Add an entry to the Docker `package-ecosystem` element of your _dependabot.yml_ file for each directory containing a Kubernetes manifest which references Docker image tags. Kubernetes manifests can be Kubernetes Deployment YAML files or Helm charts. For information about configuring your _dependabot.yml_ file for `docker`, see  "`package-ecosystem`" in "[Configuration options for the dependabot.yml file](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem)."
 
-[2] {% data variables.product.prodname_dependabot %} doesn't run Maven but supports updates to `pom.xml` files.
+   {% data variables.product.prodname_dependabot %} supports both public and private Docker registries. For a list of the supported registries, see "`docker-registry`" in "[Configuration options for the dependabot.yml file](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#docker-registry)."
+{% endif %}
+
+[2] {% data variables.product.prodname_dependabot %} doesn't run Gradle but supports updates to the following files: `build.gradle`, `build.gradle.kts` (for Kotlin projects), and files included via the `apply` declaration that have `dependencies` in the filename. Note that `apply` does not support `apply to`, recursion, or advanced syntaxes (for example, Kotlin's `apply` with `mapOf`, filenames defined by property).
+
+[3] {% data variables.product.prodname_dependabot %} doesn't run Maven but supports updates to `pom.xml` files.
 
-[3] {% data variables.product.prodname_dependabot %} doesn't run the NuGet CLI but does support most features up until version 4.8.
+[4] {% data variables.product.prodname_dependabot %} doesn't run the NuGet CLI but does support most features up until version 4.8.
+
+{% ifversion dependabot-PEP621-support %}
+[5] In addition to supporting updates to `requirements.txt` files, {% data variables.product.prodname_dependabot %} supports updates to `pyproject.toml` files if they follow the PEP 621 standard. {% endif %}
 
 {% ifversion fpt or ghec or ghes > 3.4 %}
-[4] {% ifversion ghes = 3.5 %}`pub` support is currently in beta. Any known limitations are subject to change. Note that {% data variables.product.prodname_dependabot %}:
+[6] {% ifversion ghes = 3.5 %}`pub` support is currently in beta. Any known limitations are subject to change. Note that {% data variables.product.prodname_dependabot %}:
    - Doesn't support updating git dependencies for `pub`. 
    - Won't perform an update when the version that it tries to update to is ignored, even if an earlier version is available.
 
    For information about configuring your _dependabot.yml_ file for `pub`, see "[Enabling support for beta-level ecosystems](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#enable-beta-ecosystems)."
    {%- else %}{% data variables.product.prodname_dependabot %} won't perform an update for `pub` when the version that it tries to update to is ignored, even if an earlier version is available.{% endif %}
 {% endif %} 
 
-
-{% ifversion dependabot-PEP621-support %}
-[5] In addition to supporting updates to `requirements.txt` files, {% data variables.product.prodname_dependabot %} supports updates to `pyproject.toml` files if they follow the PEP 621 standard. {% endif %}
-
 {% ifversion dependabot-yarn-v3-update %}
-[6] Dependabot supports vendored dependencies for v2 onwards.{% endif %}
+[7] Dependabot supports vendored dependencies for v2 onwards.{% endif %}
 

lib/languages.js

@@ -11,6 +11,7 @@ const possibleEnvVars = {
   'zh-CN': process.env.TRANSLATIONS_ROOT_ZH_CN,
   'ja-JP': process.env.TRANSLATIONS_ROOT_JA_JP,
   'pt-BR': process.env.TRANSLATIONS_ROOT_PT_BR,
+  'ru-RU': process.env.TRANSLATIONS_ROOT_RU_RU,
 }
 
 function getRoot(languageCode) {
@@ -69,6 +70,14 @@ const languages = {
     dir: getRoot('pt-BR'),
     wip: false,
   },
+  ru: {
+    name: 'Russian',
+    nativeName: 'русский',
+    code: 'ru',
+    hreflang: 'ru',
+    dir: getRoot('ru-RU'),
+    wip: true,
+  },
 }
 
 if (process.env.ENABLED_LANGUAGES) {

package.json

@@ -181,7 +181,7 @@
   "scripts": {
     "browser-test": "cross-env BROWSER=1 NODE_OPTIONS=--experimental-vm-modules JEST_PUPPETEER_CONFIG=jest-puppeteer.config.cjs jest tests/browser/browser.js",
     "build": "next build",
-    "debug": "cross-env NODE_ENV=development ENABLED_LANGUAGES='en,ja' nodemon --inspect server.js",
+    "debug": "cross-env NODE_ENV=development ENABLED_LANGUAGES='en,ja,ru' nodemon --inspect server.js",
     "dev": "cross-env npm start",
     "index-test-fixtures": "node script/search/index-elasticsearch.js -l en -V ghae -V dotcom --index-prefix tests -- tests/content/fixtures/search-indexes",
     "lint": "eslint '**/*.{js,mjs,ts,tsx}'",
@@ -192,7 +192,7 @@
     "prevent-pushes-to-main": "node script/prevent-pushes-to-main.js",
     "rest-dev": "script/rest/update-files.js && npm run dev",
     "show-action-deps": "echo 'Action Dependencies:' && rg '^[\\s|-]*(uses:.*)$' .github -I -N --no-heading -r '$1$2' | sort | uniq | cut -c 7-",
-    "start": "cross-env NODE_ENV=development ENABLED_LANGUAGES='en,ja' nodemon server.js",
+    "start": "cross-env NODE_ENV=development ENABLED_LANGUAGES='en,ja,ru' nodemon server.js",
     "start-all-languages": "cross-env NODE_ENV=development nodemon server.js",
     "sync-search": "cross-env NODE_OPTIONS='--max_old_space_size=8192' start-server-and-test sync-search-server 4002 sync-search-indices",
     "sync-search-ghes-release": "cross-env GHES_RELEASE=1 start-server-and-test sync-search-server 4002 sync-search-indices",