diff --git a/.devcontainer.json b/.devcontainer.json new file mode 100644 index 0000000000..10a610b4e7 --- /dev/null +++ b/.devcontainer.json @@ -0,0 +1,18 @@ +// Codespaces environment for docs.github.com +// For format details, see https://aka.ms/vscode-remote/devcontainer.json +{ + "name": "docs.github.com", + "service": "container-doc", + "settings": { + "terminal.integrated.shell.linux": "/bin/bash", + "cSpell.language": ",en" + }, + // Install pre-requisites, and start to serve docs.github.com locally + "postCreateCommand": "npm install && npm start", + "forwardPorts": [4000], + // Visual Studio Code extensions which help authoring for docs.github.com. + "extensions": [ + "yzhang.markdown-all-in-one", + "streetsidesoftware.code-spell-checker" + ] +} diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js index ad3e9197a9..79936f169a 100644 --- a/.github/allowed-actions.js +++ b/.github/allowed-actions.js @@ -4,7 +4,7 @@ // can be added it this list. module.exports = [ - 'actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16', //actions/cache@v2.1.2 + 'actions/cache@0781355a23dac32fd3bac414512f4b903437991a', //actions/cache@v2.1.3 'actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f', //actions/checkout@v2.3.4 'actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9', //actions/script@v3.0.0 'actions/labeler@5f867a63be70efff62b767459b009290364495eb', //actions/labeler@v2.2.0 diff --git a/.github/workflows/60-days-stale-check.yml b/.github/workflows/60-days-stale-check.yml index 498ddde4c0..1070b13115 100644 --- a/.github/workflows/60-days-stale-check.yml +++ b/.github/workflows/60-days-stale-check.yml @@ -17,4 +17,6 @@ jobs: only-labels: 'engineering' stale-issue-label: 'stale' stale-pr-label: 'stale' + exempt-pr-labels: 'never-stale' + exempt-issue-labels: 'never-stale' diff --git a/.github/workflows/browser-test.yml b/.github/workflows/browser-test.yml index aaf41978b3..18e0166879 100644 --- a/.github/workflows/browser-test.yml +++ b/.github/workflows/browser-test.yml @@ -20,18 +20,22 @@ jobs: paths: '[".github/workflows/browser-test.yml","assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]' build: needs: see_if_should_skip - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} runs-on: ubuntu-latest steps: - - name: Checkout + # Each of these ifs needs to be repeated at each step to make sure the required check still runs + # Even if if doesn't do anything + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} + name: Checkout uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - - name: Install + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} + name: Install uses: ianwalter/puppeteer@12728ddef82390d1ecd4732fb543f62177392fbb with: args: npm ci - - name: Test + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} + name: Test uses: ianwalter/puppeteer@12728ddef82390d1ecd4732fb543f62177392fbb with: args: npm run browser-test diff --git a/.github/workflows/check-all-english-links.yml b/.github/workflows/check-all-english-links.yml index 060a861b97..6f4b2b4672 100644 --- a/.github/workflows/check-all-english-links.yml +++ b/.github/workflows/check-all-english-links.yml @@ -1,6 +1,7 @@ name: Check all English links on: + workflow_dispatch: schedule: - cron: "40 19 * * *" # once a day at 19:40 UTC / 11:40 PST @@ -16,17 +17,12 @@ jobs: - name: npm run build run: npm run build - name: Run script - run: script/check-external-links en > broken_links.md - - name: Check if any broken links + run: script/check-english-links.js > broken_links.md + - if: ${{ failure() }} + name: Get title for issue id: check - run: | - if [ "$(grep 'All links are good' broken_links.md)" ]; then - echo ::set-output name=continue::no - else - echo "::set-output name=continue::yes" - echo "::set-output name=title::$(grep 'found on help.github.com' broken_links.md)" - fi - - if: ${{ steps.check.outputs.continue == 'yes' }} + run: echo "::set-output name=title::$(head -1 broken_links.md)" + - if: ${{ failure() }} name: Create issue from file uses: peter-evans/create-issue-from-file@35e304e2a12caac08c568247a2cb46ecd0c3ecc5 with: diff --git a/.github/workflows/dry-run-sync-algolia-search-indices.yml b/.github/workflows/dry-run-sync-algolia-search-indices.yml index bbdc53b35d..685d6c087f 100644 --- a/.github/workflows/dry-run-sync-algolia-search-indices.yml +++ b/.github/workflows/dry-run-sync-algolia-search-indices.yml @@ -15,7 +15,7 @@ jobs: with: node-version: 14.x - name: cache node modules - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16 + uses: actions/cache@0781355a23dac32fd3bac414512f4b903437991a with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} diff --git a/.github/workflows/js-lint.yml b/.github/workflows/js-lint.yml index 8ea26fcf63..ad4cbbb0cc 100644 --- a/.github/workflows/js-lint.yml +++ b/.github/workflows/js-lint.yml @@ -42,7 +42,7 @@ jobs: echo "::set-output name=dir::$(npm config get cache)" - name: Cache node modules - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16 + uses: actions/cache@0781355a23dac32fd3bac414512f4b903437991a with: path: ${{ steps.npm-cache.outputs.dir }} key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} diff --git a/.github/workflows/pa11y.yml b/.github/workflows/pa11y.yml index 43d70e8061..27f58094bc 100644 --- a/.github/workflows/pa11y.yml +++ b/.github/workflows/pa11y.yml @@ -16,7 +16,7 @@ jobs: echo "::set-output name=dir::$(npm config get cache)" - name: Cache node modules - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16 + uses: actions/cache@0781355a23dac32fd3bac414512f4b903437991a with: path: ${{ steps.npm-cache.outputs.dir }} key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} diff --git a/.github/workflows/repo-freeze-check.yml b/.github/workflows/repo-freeze-check.yml new file mode 100644 index 0000000000..1ea8d4b3c3 --- /dev/null +++ b/.github/workflows/repo-freeze-check.yml @@ -0,0 +1,27 @@ +name: Repo Freeze Check + +on: + pull_request: + types: + - opened + - reopened + - synchronize + - ready_for_review + - unlocked + branches: + - main + +env: + FREEZE: ${{ secrets.FREEZE }} + +jobs: + check-freezer: + name: Prevent merging during deployment freezes + runs-on: ubuntu-latest + steps: + + - name: Fail if repo merges are paused + if: ${{ env.FREEZE == 'true' }} + run: | + echo 'Merges into the "main" branch on this repo are currently paused!' + exit 1 diff --git a/.github/workflows/sync-algolia-search-indices.yml b/.github/workflows/sync-algolia-search-indices.yml index f3adaed491..37dc97e8e3 100644 --- a/.github/workflows/sync-algolia-search-indices.yml +++ b/.github/workflows/sync-algolia-search-indices.yml @@ -18,7 +18,7 @@ jobs: with: node-version: 14.x - name: cache node modules - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16 + uses: actions/cache@0781355a23dac32fd3bac414512f4b903437991a with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} diff --git a/.github/workflows/test-translations.yml b/.github/workflows/test-translations.yml index 4eee08b4fb..f149d5df92 100644 --- a/.github/workflows/test-translations.yml +++ b/.github/workflows/test-translations.yml @@ -27,7 +27,7 @@ jobs: echo "::set-output name=dir::$(npm config get cache)" - name: Cache node modules - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16 + uses: actions/cache@0781355a23dac32fd3bac414512f4b903437991a with: path: ${{ steps.npm-cache.outputs.dir }} key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} @@ -65,7 +65,7 @@ jobs: echo "::set-output name=dir::$(npm config get cache)" - name: Cache node modules - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16 + uses: actions/cache@0781355a23dac32fd3bac414512f4b903437991a with: path: ${{ steps.npm-cache.outputs.dir }} key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index eca46f9d73..8140a277c6 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -32,7 +32,7 @@ jobs: echo "::set-output name=dir::$(npm config get cache)" - name: Cache node modules - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16 + uses: actions/cache@0781355a23dac32fd3bac414512f4b903437991a with: path: ${{ steps.npm-cache.outputs.dir }} key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 29c4fcfacf..e3cf8725f9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,7 +31,6 @@ jobs: test: needs: see_if_should_skip - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} runs-on: ubuntu-latest timeout-minutes: 60 strategy: @@ -39,31 +38,38 @@ jobs: matrix: test-group: [content, meta, rendering, routing, unit, links-and-images] steps: - - name: Check out repo + # Each of these ifs needs to be repeated at each step to make sure the required check still runs + # Even if if doesn't do anything + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} + name: Check out repo uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f with: # Enables cloning the Early Access repo later with the relevant PAT persist-credentials: 'false' - - name: Setup node + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} + name: Setup node uses: actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d with: node-version: 14.x - - name: Get npm cache directory + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} + name: Get npm cache directory id: npm-cache run: | echo "::set-output name=dir::$(npm config get cache)" - - name: Cache node modules - uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16 + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} + name: Cache node modules + uses: actions/cache@0781355a23dac32fd3bac414512f4b903437991a with: path: ${{ steps.npm-cache.outputs.dir }} key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} restore-keys: | ${{ runner.os }}-node- - - name: Install dependencies + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} + name: Install dependencies run: npm ci - name: Clone early access @@ -73,10 +79,11 @@ jobs: DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }} - name: Run build script - if: ${{ github.repository != 'github/docs-internal' }} + if: ${{ github.repository != 'github/docs-internal' and needs.see_if_should_skip.outputs.should_skip != 'true'}} run: npm run build - - name: Run tests + - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} + name: Run tests run: npx jest tests/${{ matrix.test-group }}/ env: NODE_OPTIONS: "--max_old_space_size=4096" diff --git a/.github/workflows/triage-stale-check.yml b/.github/workflows/triage-stale-check.yml index 93a595ab03..35d4047c24 100644 --- a/.github/workflows/triage-stale-check.yml +++ b/.github/workflows/triage-stale-check.yml @@ -16,3 +16,5 @@ jobs: days-before-stale: 7 days-before-close: 10 stale-pr-label: 'stale' + exempt-pr-labels: 'never-stale' + exempt-issue-labels: 'never-stale' diff --git a/.gitignore b/.gitignore index b8d20835cc..09bfb38e88 100644 --- a/.gitignore +++ b/.gitignore @@ -4,11 +4,14 @@ /node_modules/ npm-debug.log coverage/ +.linkinator /assets/images/early-access /content/early-access /data/early-access +dist # blc: broken link checker blc_output.log blc_output_internal.log /dist/ +broken_links.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b298535af3..0480575521 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,8 +27,13 @@ Fork using GitHub Desktop: - Once Desktop is set up, you can use it to [fork the repo](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/cloning-and-forking-repositories-from-github-desktop)! Fork using the command line: + - [Fork the repo](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo#fork-an-example-repository) so that you can make your changes without affecting the original project until you're ready to merge them. +Fork with [GitHub Codespaces](https://github.com/features/codespaces): + +- [Fork, edit, and preview](https://docs.github.com/en/free-pro-team@latest/github/developing-online-with-codespaces/creating-a-codespace) using [GitHub Codespaces](https://github.com/features/codespaces) without having to install and run the project locally. + ### Make your update: Make your changes to the file(s) you'd like to update. Here are some tips and tricks for [using the docs codebase](#working-in-the-githubdocs-repository). - Are you making changes to the application code? You'll need **Node.js v14** to run the site locally. See [contributing/development.md](contributing/development.md). @@ -109,7 +114,8 @@ You can browse existing issues to find something that needs help! ### Labels Labels can help you find an issue you'd like to help with. -- The [`good-first-issue` label](https://github.com/github/docs/issues?q=is%3Aopen+is%3Aissue+label%3Agood-first-issue) is for problems or updates we think are ideal for beginners. +- The [`help wanted` label](https://github.com/github/docs/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) is for problems or updates that anyone in the community can start working on. +- The [`good first issue` label](https://github.com/github/docs/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) is for problems or updates we think are ideal for beginners. - The [`content` label](https://github.com/github/docs/issues?q=is%3Aopen+is%3Aissue+label%3Acontent) is for problems or updates in the content on docs.github.com. These will usually require some knowledge of Markdown. - The [`engineering` label](https://github.com/github/docs/issues?q=is%3Aopen+is%3Aissue+label%3Aengineering) is for problems or updates in the docs.github.com website. These will usually require some knowledge of JavaScript/Node.js or YAML to fix. diff --git a/assets/images/help/codespaces/choose-branch-vscode.png b/assets/images/help/codespaces/choose-branch-vscode.png index b430d0e933..7a2b845f88 100644 Binary files a/assets/images/help/codespaces/choose-branch-vscode.png and b/assets/images/help/codespaces/choose-branch-vscode.png differ diff --git a/assets/images/help/codespaces/choose-repository-vscode.png b/assets/images/help/codespaces/choose-repository-vscode.png index 5c530046fa..4681fc3840 100644 Binary files a/assets/images/help/codespaces/choose-repository-vscode.png and b/assets/images/help/codespaces/choose-repository-vscode.png differ diff --git a/assets/images/help/codespaces/choose-sku-vscode.png b/assets/images/help/codespaces/choose-sku-vscode.png new file mode 100644 index 0000000000..09f23904cb Binary files /dev/null and b/assets/images/help/codespaces/choose-sku-vscode.png differ diff --git a/assets/images/help/codespaces/click-connect-to-codespace-icon-vscode.png b/assets/images/help/codespaces/click-connect-to-codespace-icon-vscode.png index 46a8ee5cf8..3ef75e58ba 100644 Binary files a/assets/images/help/codespaces/click-connect-to-codespace-icon-vscode.png and b/assets/images/help/codespaces/click-connect-to-codespace-icon-vscode.png differ diff --git a/assets/images/help/codespaces/codespaces-header-vscode.png b/assets/images/help/codespaces/codespaces-header-vscode.png index 4f34f3abf8..490679f1a0 100644 Binary files a/assets/images/help/codespaces/codespaces-header-vscode.png and b/assets/images/help/codespaces/codespaces-header-vscode.png differ diff --git a/assets/images/help/codespaces/create-codespace-vscode.png b/assets/images/help/codespaces/create-codespace-vscode.png index 2a27566d5e..091559925b 100644 Binary files a/assets/images/help/codespaces/create-codespace-vscode.png and b/assets/images/help/codespaces/create-codespace-vscode.png differ diff --git a/assets/images/help/codespaces/delete-codespace-vscode.png b/assets/images/help/codespaces/delete-codespace-vscode.png index ac288111c4..d68fbf6a34 100644 Binary files a/assets/images/help/codespaces/delete-codespace-vscode.png and b/assets/images/help/codespaces/delete-codespace-vscode.png differ diff --git a/assets/images/help/codespaces/sign-in-to-view-codespaces-vscode.png b/assets/images/help/codespaces/sign-in-to-view-codespaces-vscode.png index f68d7e6c41..94bb2e106d 100644 Binary files a/assets/images/help/codespaces/sign-in-to-view-codespaces-vscode.png and b/assets/images/help/codespaces/sign-in-to-view-codespaces-vscode.png differ diff --git a/assets/images/help/repository/commit-hello-world-file.png b/assets/images/help/repository/commit-hello-world-file.png new file mode 100644 index 0000000000..72556073f1 Binary files /dev/null and b/assets/images/help/repository/commit-hello-world-file.png differ diff --git a/assets/images/help/repository/manual-workflow-trigger.png b/assets/images/help/repository/manual-workflow-trigger.png new file mode 100644 index 0000000000..306eb38764 Binary files /dev/null and b/assets/images/help/repository/manual-workflow-trigger.png differ diff --git a/assets/images/help/repository/say-hello-job.png b/assets/images/help/repository/say-hello-job.png new file mode 100644 index 0000000000..a9450b3360 Binary files /dev/null and b/assets/images/help/repository/say-hello-job.png differ diff --git a/assets/images/help/repository/workflow-job-listing.png b/assets/images/help/repository/workflow-job-listing.png new file mode 100644 index 0000000000..3e4d197665 Binary files /dev/null and b/assets/images/help/repository/workflow-job-listing.png differ diff --git a/assets/images/help/repository/workflow-log-listing.png b/assets/images/help/repository/workflow-log-listing.png new file mode 100644 index 0000000000..aeb734fd8a Binary files /dev/null and b/assets/images/help/repository/workflow-log-listing.png differ diff --git a/assets/images/help/repository/workflow-run-listing.png b/assets/images/help/repository/workflow-run-listing.png new file mode 100644 index 0000000000..328178f3b7 Binary files /dev/null and b/assets/images/help/repository/workflow-run-listing.png differ diff --git a/content/actions/guides/building-and-testing-powershell.md b/content/actions/guides/building-and-testing-powershell.md index 381e85d974..07802471c8 100644 --- a/content/actions/guides/building-and-testing-powershell.md +++ b/content/actions/guides/building-and-testing-powershell.md @@ -5,6 +5,8 @@ product: '{% data reusables.gated-features.actions %}' versions: free-pro-team: '*' enterprise-server: '>=2.22' +authors: + - potatoqualitee --- {% data reusables.actions.enterprise-beta %} diff --git a/content/actions/guides/publishing-nodejs-packages.md b/content/actions/guides/publishing-nodejs-packages.md index f428baed28..294001e7ee 100644 --- a/content/actions/guides/publishing-nodejs-packages.md +++ b/content/actions/guides/publishing-nodejs-packages.md @@ -8,6 +8,8 @@ redirect_from: versions: free-pro-team: '*' enterprise-server: '>=2.22' +authors: + - GitHub --- {% data reusables.actions.enterprise-beta %} diff --git a/content/actions/guides/setting-up-continuous-integration-using-workflow-templates.md b/content/actions/guides/setting-up-continuous-integration-using-workflow-templates.md index a10ab35eaf..a480a4824a 100644 --- a/content/actions/guides/setting-up-continuous-integration-using-workflow-templates.md +++ b/content/actions/guides/setting-up-continuous-integration-using-workflow-templates.md @@ -11,6 +11,8 @@ redirect_from: versions: free-pro-team: '*' enterprise-server: '>=2.22' +authors: + - GitHub --- {% data reusables.actions.enterprise-beta %} diff --git a/content/actions/index.md b/content/actions/index.md index 49ed125257..fa449ba6d9 100644 --- a/content/actions/index.md +++ b/content/actions/index.md @@ -7,27 +7,37 @@ introLinks: reference: /actions/reference featuredLinks: guides: - - /actions/guides/setting-up-continuous-integration-using-workflow-templates + - /actions/learn-github-actions + - /actions/guides/about-continuous-integration - /actions/guides/about-packaging-with-github-actions gettingStarted: - /actions/managing-workflow-runs - /actions/hosting-your-own-runners + guideCards: + - /actions/guides/setting-up-continuous-integration-using-workflow-templates + - /actions/guides/publishing-nodejs-packages + - /actions/guides/building-and-testing-powershell popular: - /actions/reference/workflow-syntax-for-github-actions - /actions/reference/events-that-trigger-workflows + - /actions/learn-github-actions + - /actions/reference/context-and-expression-syntax-for-github-actions + - /actions/reference/workflow-commands-for-github-actions + - /actions/reference/environment-variables changelog: + - title: Removing set-env and add-path commands on November 16 + date: '2020-11-09' + href: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/ + - title: Ubuntu-latest workflows will use Ubuntu-20.04 + date: '2020-10-29' + href: https://github.blog/changelog/2020-10-29-github-actions-ubuntu-latest-workflows-will-use-ubuntu-20-04 + - title: MacOS Big Sur Preview + date: '2020-10-29' + href: https://github.blog/changelog/2020-10-29-github-actions-macos-big-sur-preview - title: Self-Hosted Runner Group Access Changes date: '2020-10-16' href: https://github.blog/changelog/2020-10-16-github-actions-self-hosted-runner-group-access-changes/ - - title: Ability to change retention days for artifacts and logs - date: '2020-10-08' - href: https://github.blog/changelog/2020-10-08-github-actions-ability-to-change-retention-days-for-artifacts-and-logs - - title: Deprecating set-env and add-path commands - date: '2020-10-01' - href: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands - - title: Fine-tune access to external actions - date: '2020-10-01' - href: https://github.blog/changelog/2020-10-01-github-actions-fine-tune-access-to-external-actions + redirect_from: - /articles/automating-your-workflow-with-github-actions/ - /articles/customizing-your-project-with-github-actions/ @@ -50,107 +60,26 @@ versions: +{% assign actionsCodeExamples = site.data.variables.action_code_examples %} +{% if actionsCodeExamples %}
It looks like we don't have an example that fits your filter.
Try another filter or add your code example
https://YOUR-GITHUB-AE-HOSTNAME |
- | Reply URL | https://YOUR-GITHUB-AE-HOSTNAME/saml/consume |
- | Sign on URL | https://YOUR-GITHUB-AE-HOSTNAME/sso |
+1. In Azure AD, add {% data variables.product.ae_azure_ad_app_link %} to your tenant and configure single sign-on. For more information, see [Tutorial: Azure Active Directory single sign-on (SSO) integration with {% data variables.product.prodname_ghe_managed %}](https://docs.microsoft.com/azure/active-directory/saas-apps/github-ae-tutorial) in the Microsoft Docs.
1. In {% data variables.product.prodname_ghe_managed %}, enter the details for your Azure AD tenant.
diff --git a/content/admin/authentication/configuring-saml-single-sign-on-for-your-enterprise.md b/content/admin/authentication/configuring-saml-single-sign-on-for-your-enterprise.md
index 51b0cf031d..69e0358289 100644
--- a/content/admin/authentication/configuring-saml-single-sign-on-for-your-enterprise.md
+++ b/content/admin/authentication/configuring-saml-single-sign-on-for-your-enterprise.md
@@ -38,6 +38,12 @@ After a user successfully authenticates on your IdP, the user's SAML session for
{% data reusables.saml.ae-enable-saml-sso-during-bootstrapping %}
+The following IdPs provide documentation about configuring SAML SSO for {% data variables.product.product_name %}. If your IdP isn't listed, please contact your IdP to request support for {% data variables.product.product_name %}.
+
+ | IdP | More information |
+ | :- | :- |
+ | Azure AD | [Tutorial: Azure Active Directory single sign-on (SSO) integration with {% data variables.product.prodname_ghe_managed %}](https://docs.microsoft.com/azure/active-directory/saas-apps/github-ae-tutorial) in the Microsoft Docs |
+
During initialization for {% data variables.product.product_name %}, you must configure {% data variables.product.product_name %} as a SAML Service Provider (SP) on your IdP. You must enter several unique values on your IdP to configure {% data variables.product.product_name %} as a valid SP.
| Value | Other names | Description | Example |
diff --git a/content/admin/authentication/configuring-user-provisioning-for-your-enterprise.md b/content/admin/authentication/configuring-user-provisioning-for-your-enterprise.md
index 00e17a70ca..8df57afb64 100644
--- a/content/admin/authentication/configuring-user-provisioning-for-your-enterprise.md
+++ b/content/admin/authentication/configuring-user-provisioning-for-your-enterprise.md
@@ -62,7 +62,15 @@ You must have administrative access on your IdP to configure the application for

1. Click **Save**.

-1. Configure user provisioning in the application for {% data variables.product.product_name %} on your IdP. The application on your IdP requires two values to provision or deprovision user accounts on {% data variables.product.product_location %}.
+1. Configure user provisioning in the application for {% data variables.product.product_name %} on your IdP.
+
+ The following IdPs provide documentation about configuring provisioning for {% data variables.product.product_name %}. If your IdP isn't listed, please contact your IdP to request support for {% data variables.product.product_name %}.
+
+ | IdP | More information |
+ | :- | :- |
+ | Azure AD | [Tutorial: Configure {% data variables.product.prodname_ghe_managed %} for automatic user provisioning](https://docs.microsoft.com/azure/active-directory/saas-apps/github-ae-provisioning-tutorial) in the Microsoft Docs |
+
+ The application on your IdP requires two values to provision or deprovision user accounts on {% data variables.product.product_location %}.
| Value | Other names | Description | Example |
| :- | :- | :- | :- |
diff --git a/content/admin/enterprise-management/configuring-collectd.md b/content/admin/enterprise-management/configuring-collectd.md
index 0482ad809a..4196beb841 100644
--- a/content/admin/enterprise-management/configuring-collectd.md
+++ b/content/admin/enterprise-management/configuring-collectd.md
@@ -10,7 +10,7 @@ versions:
---
### Set up an external `collectd` server
-If you haven't already set up an external `collectd` server, you will need to do so before enabling `collectd` forwarding on {% data variables.product.product_location %}. Your `collectd` server must by running `collectd` version 5.x or higher.
+If you haven't already set up an external `collectd` server, you will need to do so before enabling `collectd` forwarding on {% data variables.product.product_location %}. Your `collectd` server must be running `collectd` version 5.x or higher.
1. Log into your `collectd` server.
2. Create or edit the `collectd` configuration file to load the network plugin and populate the server and port directives with the proper values. On most distributions, this is located at `/etc/collectd/collectd.conf`
diff --git a/content/developers/apps/rate-limits-for-github-apps.md b/content/developers/apps/rate-limits-for-github-apps.md
index e25d374ee1..31607e2e14 100644
--- a/content/developers/apps/rate-limits-for-github-apps.md
+++ b/content/developers/apps/rate-limits-for-github-apps.md
@@ -34,8 +34,6 @@ Different server-to-server request rate limits apply to {% data variables.produc
### User-to-server requests
-{% data reusables.apps.deprecating_password_auth %}
-
{% data variables.product.prodname_github_app %}s can also act [on behalf of a user](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/#identifying-and-authorizing-users-for-github-apps), making user-to-server requests.
{% if currentVersion == "free-pro-team@latest" %}
@@ -52,7 +50,7 @@ User-to-server requests are rate limited at 5,000 requests per hour and per auth
#### {% data variables.product.prodname_ghe_cloud %} user-to-server rate limits
-When a user belongs to a {% data variables.product.prodname_ghe_cloud %} account, user-to-server requests to resources owned by the same {% data variables.product.prodname_ghe_cloud %} account are rate limited at 15,000 requests per hour and per authenticated user. All OAuth applications authorized by that user, personal access tokens owned by that user, and requests authenticated with that user's username and password share the same quota of 5,000 requests per hour for that user.
+When a user belongs to a {% data variables.product.prodname_ghe_cloud %} account, user-to-server requests to resources owned by the same {% data variables.product.prodname_ghe_cloud %} account are rate limited at 15,000 requests per hour and per authenticated user. All OAuth applications authorized by that user, personal access tokens owned by that user, and {% data variables.product.prodname_ghe_cloud %} requests authenticated with that user's username and password share the same quota of 5,000 requests per hour for that user.
{% endif %}
diff --git a/content/developers/overview/managing-deploy-keys.md b/content/developers/overview/managing-deploy-keys.md
index cb08aae704..b1c958c590 100644
--- a/content/developers/overview/managing-deploy-keys.md
+++ b/content/developers/overview/managing-deploy-keys.md
@@ -83,6 +83,32 @@ See [our guide on Git automation with tokens][git-automation].
7. Select **Allow write access** if you want this key to have write access to the repository. A deploy key with write access lets a deployment push to the repository.
8. Click **Add key**.
+##### Using multiple repositories on one server
+
+If you use multiple repositories on one server, you will need to generate a dedicated key pair for each one. You can't reuse a deploy key for multiple repositories.
+
+In the server's SSH configuration file (usually `~/.ssh/config`), add an alias entry for each repository. For example:
+
+```bash
+Host {% if currentVersion == "free-pro-team@latest" %}github.com{% else %}my-GHE-hostname.com{% endif %}-repo-0
+ Hostname {% if currentVersion == "free-pro-team@latest" %}github.com{% else %}my-GHE-hostname.com{% endif %}
+ IdentityFile=/home/user/.ssh/repo-0_deploy_key
+
+Host {% if currentVersion == "free-pro-team@latest" %}github.com{% else %}my-GHE-hostname.com{% endif %}-repo-1
+ Hostname {% if currentVersion == "free-pro-team@latest" %}github.com{% else %}my-GHE-hostname.com{% endif %}
+ IdentityFile=/home/user/.ssh/repo-1_deploy_key
+```
+
+* `Host {% if currentVersion == "free-pro-team@latest" %}github.com{% else %}my-GHE-hostname.com{% endif %}-repo-0` - The repository's alias.
+* `Hostname {% if currentVersion == "free-pro-team@latest" %}github.com{% else %}my-GHE-hostname.com{% endif %}` - Configures the hostname to use with the alias.
+* `IdentityFile=/home/user/.ssh/repo-0_deploy_key` - Assigns a private key to the alias.
+
+You can then use the hostname's alias to interact with the repository using SSH, which will use the unique deploy key assigned to that alias. For example:
+
+```bash
+$ git clone git@{% if currentVersion == "free-pro-team@latest" %}github.com{% else %}my-GHE-hostname.com{% endif %}-repo-1:OWNER/repo-1.git
+```
+
### Machine users
If your server needs to access multiple repositories, you can create a new {% data variables.product.product_name %} account and attach an SSH key that will be used exclusively for automation. Since this {% data variables.product.product_name %} account won't be used by a human, it's called a _machine user_. You can add the machine user as a [collaborator][collaborator] on a personal repository (granting read and write access), as an [outside collaborator][outside-collaborator] on an organization repository (granting read, write, or admin access), or to a [team][team] with access to the repositories it needs to automate (granting the permissions of the team).
diff --git a/content/developers/overview/secret-scanning.md b/content/developers/overview/secret-scanning.md
index 576d3f42ec..054637e2a5 100644
--- a/content/developers/overview/secret-scanning.md
+++ b/content/developers/overview/secret-scanning.md
@@ -79,7 +79,7 @@ Content-Length: 0123
]
```
-The message body is a JSON array that contains one or more objects with the following contents. When multiple matches are found, {% data variables.product.prodname_dotcom %} may send a single message with more than one secret match.
+The message body is a JSON array that contains one or more objects with the following contents. When multiple matches are found, {% data variables.product.prodname_dotcom %} may send a single message with more than one secret match. Your endpoint should be able to handle requests with a large number of matches without timing out.
* **Token**: The value of the secret match.
* **Type**: The unique name you provided to identify your regular expression.
@@ -139,7 +139,7 @@ func main() {
fmt.Printf("Error preparing request: %s\n", err)
os.Exit(1)
}
-
+
if len(os.Getenv("GITHUB_PRODUCTION_TOKEN")) == 0 {
fmt.Println("Need to define environment variable GITHUB_PRODUCTION_TOKEN")
os.Exit(1)
diff --git a/content/github/administering-a-repository/about-secret-scanning.md b/content/github/administering-a-repository/about-secret-scanning.md
index 6a44dcb939..125f7333aa 100644
--- a/content/github/administering-a-repository/about-secret-scanning.md
+++ b/content/github/administering-a-repository/about-secret-scanning.md
@@ -1,6 +1,7 @@
---
title: About secret scanning
intro: '{% data variables.product.product_name %} scans repositories for known types of secrets, to prevent fraudulent use of secrets that were committed accidentally.'
+product: '{% data reusables.gated-features.secret-scanning %}'
redirect_from:
- /github/administering-a-repository/about-token-scanning
- /articles/about-token-scanning
diff --git a/content/github/administering-a-repository/configuring-secret-scanning-for-private-repositories.md b/content/github/administering-a-repository/configuring-secret-scanning-for-private-repositories.md
index a92349ab18..085767d24e 100644
--- a/content/github/administering-a-repository/configuring-secret-scanning-for-private-repositories.md
+++ b/content/github/administering-a-repository/configuring-secret-scanning-for-private-repositories.md
@@ -1,6 +1,7 @@
---
title: Configuring secret scanning for private repositories
intro: 'You can configure how {% data variables.product.product_name %} scans your private repositories for secrets.'
+product: '{% data reusables.gated-features.secret-scanning %}'
permissions: 'People with admin permissions to a private repository can enable {% data variables.product.prodname_secret_scanning %} for the repository.'
versions:
free-pro-team: '*'
diff --git a/content/github/administering-a-repository/managing-alerts-from-secret-scanning.md b/content/github/administering-a-repository/managing-alerts-from-secret-scanning.md
index 99770444b5..119e5135c1 100644
--- a/content/github/administering-a-repository/managing-alerts-from-secret-scanning.md
+++ b/content/github/administering-a-repository/managing-alerts-from-secret-scanning.md
@@ -1,6 +1,7 @@
---
title: Managing alerts from secret scanning
intro: You can view and close alerts for secrets checked in to your repository.
+product: '{% data reusables.gated-features.secret-scanning %}'
versions:
free-pro-team: '*'
---
diff --git a/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code.md b/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code.md
index 93dc802d2b..065d9ded30 100644
--- a/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code.md
+++ b/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code.md
@@ -1,6 +1,6 @@
---
title: Using Codespaces in Visual Studio Code
-intro: 'You can develop in your codespace directly in {% data variables.product.prodname_vscode %} by connecting the {% data variables.product.prodname_vs_codespaces %} extension with your account on {% data variables.product.product_name %}.'
+intro: 'You can develop in your codespace directly in {% data variables.product.prodname_vscode %} by connecting the {% data variables.product.prodname_github_codespaces %} extension with your account on {% data variables.product.product_name %}.'
product: '{% data reusables.gated-features.codespaces %}'
redirect_from:
- /github/developing-online-with-codespaces/connecting-to-your-codespace-from-visual-studio-code
@@ -12,22 +12,16 @@ versions:
### Prerequisites
-Before you can develop in a codespace directly in {% data variables.product.prodname_vscode %}, you must configure the {% data variables.product.prodname_vs_codespaces %} extension to connect to your {% data variables.product.product_name %} account.
+To develop in a codespace directly in {% data variables.product.prodname_vscode %}, you must sign into the {% data variables.product.prodname_github_codespaces %} extension. The {% data variables.product.prodname_github_codespaces %} extension requires {% data variables.product.prodname_vscode %} October 2020 Release 1.51 or later.
-1. Use the {% data variables.product.prodname_vs %} Marketplace to install the [{% data variables.product.prodname_vs_codespaces %}](https://marketplace.visualstudio.com/items?itemName=ms-vsonline.vsonline) extension. For more information, see [Extension Marketplace](https://code.visualstudio.com/docs/editor/extension-gallery) in the {% data variables.product.prodname_vscode %} documentation.
-2. In {% data variables.product.prodname_vscode %}, in the left sidebar, click the Extensions icon.
- 
-3. Below {% data variables.product.prodname_vs_codespaces %}, click the Manage icon, then click **Extension Settings**.
- 
-4. Use the Codespaces: Account Provider drop-down menu, and click **{% data variables.product.prodname_dotcom %}**.
- 
+1. Use the {% data variables.product.prodname_vs %} Marketplace to install the [{% data variables.product.prodname_github_codespaces %}](https://marketplace.visualstudio.com/items?itemName=GitHub.codespaces) extension. For more information, see [Extension Marketplace](https://code.visualstudio.com/docs/editor/extension-gallery) in the {% data variables.product.prodname_vscode %} documentation.
{% data reusables.codespaces.click-remote-explorer-icon-vscode %}
-6. If {% data variables.product.prodname_codespaces %} is not already selected in the header, click **{% data variables.product.prodname_codespaces %}**.
+2. Use the "REMOTE EXPLORER" drop-down, then click **{% data variables.product.prodname_github_codespaces %}**.

-7. Click **Sign in to view {% data variables.product.prodname_codespaces %}...**.
+3. Click **Sign in to view {% data variables.product.prodname_codespaces %}...**.

-8. To authorize {% data variables.product.prodname_vscode %} to access your account on {% data variables.product.product_name %}, click **Allow**.
-9. Sign in to {% data variables.product.product_name %} to approve the extension.
+4. To authorize {% data variables.product.prodname_vscode %} to access your account on {% data variables.product.product_name %}, click **Allow**.
+5. Sign in to {% data variables.product.product_name %} to approve the extension.
### Creating a codespace in {% data variables.product.prodname_vscode %}
@@ -38,9 +32,10 @@ After you connect your {% data variables.product.product_name %} account to the

3. Type, then click the repository's name you want to develop in.

-4. Click the branch you want to develop in.
+4. Click the branch you want to develop on.

-
+5. Click the instance type you want to develop in.
+
### Opening a codespace in {% data variables.product.prodname_vscode %}
{% data reusables.codespaces.click-remote-explorer-icon-vscode %}
diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-codeql-code-scanning-in-your-ci-system.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-codeql-code-scanning-in-your-ci-system.md
index 492b672a03..2e9b9ce638 100644
--- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-codeql-code-scanning-in-your-ci-system.md
+++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-codeql-code-scanning-in-your-ci-system.md
@@ -97,7 +97,7 @@ If the `autobuild` command can't build your code, you can run the build steps yo
By default, the {% data variables.product.prodname_codeql_runner %} uploads results from {% data variables.product.prodname_code_scanning %} when you run the `analyze` command. You can also upload SARIF files separately, by using the `upload` command.
-Once you've uploaded the data, {% data variables.product.prodname_dotcom %} displays the alerts in your repository. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository#viewing-an-alert)."
+Once you've uploaded the data, {% data variables.product.prodname_dotcom %} displays the alerts in your repository. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository#viewing-the-alerts-for-a-repository)."
### {% data variables.product.prodname_codeql_runner %} command reference
diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md
index d44cd2e445..5da0365e99 100644
--- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md
+++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning-for-a-repository.md
@@ -62,7 +62,7 @@ After enabling {% data variables.product.prodname_code_scanning %} for your repo
1. Review the logging output from the actions in this workflow as they run.
-1. Once all jobs are complete, you can view the details of any {% data variables.product.prodname_code_scanning %} alerts that were identified. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository#viewing-an-alert)."
+1. Once all jobs are complete, you can view the details of any {% data variables.product.prodname_code_scanning %} alerts that were identified. For more information, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository#viewing-the-alerts-for-a-repository)."
{% note %}
diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md
index 4dd31e54eb..aa465eca39 100644
--- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md
+++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md
@@ -1,7 +1,7 @@
---
title: Managing code scanning alerts for your repository
shortTitle: Managing alerts
-intro: 'You can view, fix, {% if currentVersion == "enterprise-server@2.22" %}or close{% else %}dismiss, or delete{% endif %} alerts for potential vulnerabilities or errors in your project''s code.'
+intro: 'From the security view, you can view, fix, {% if currentVersion == "enterprise-server@2.22" %}or close{% else %}dismiss, or delete{% endif %} alerts for potential vulnerabilities or errors in your project''s code.'
product: '{% data reusables.gated-features.code-scanning %}'
permissions: 'If you have write permission to a repository you can manage {% data variables.product.prodname_code_scanning %} alerts for that repository.'
versions:
@@ -30,9 +30,11 @@ If you enable {% data variables.product.prodname_code_scanning %} using {% data
When {% data variables.product.prodname_code_scanning %} reports data-flow alerts, {% data variables.product.prodname_dotcom %} shows you how data moves through the code. {% data variables.product.prodname_code_scanning_capc %} allows you to identify the areas of your code that leak sensitive information, and that could be the entry point for attacks by malicious users.
-### Viewing an alert
+### Viewing the alerts for a repository
-Anyone with read permission for a repository can see {% data variables.product.prodname_code_scanning %} alerts on pull requests. However, you need write permission to view a summary of alerts for repository on the **Security** tab. By default, alerts are shown for the default branch.
+Anyone with read permission for a repository can see {% data variables.product.prodname_code_scanning %} annotations on pull requests. For more information, see "[Triaging {% data variables.product.prodname_code_scanning %} alerts in pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)."
+
+You need write permission to view a summary of all the alerts for a repository on the **Security** tab. By default, alerts are shown for the default branch.
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-security %}
@@ -48,7 +50,7 @@ Anyone with read permission for a repository can see {% data variables.product.p
Anyone with write permission for a repository can fix an alert by committing a correction to the code. If the repository has {% data variables.product.prodname_code_scanning %} scheduled to run on pull requests, it's best to raise a pull request with your correction. This will trigger {% data variables.product.prodname_code_scanning %} analysis of the changes and test that your fix doesn't introduce any new problems. For more information, see "[Configuring {% data variables.product.prodname_code_scanning %}](/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning)" and "[Triaging {% data variables.product.prodname_code_scanning %} alerts in pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests)."
-If you have write permission for a repository, you can view fixed alerts by viewing the summary of alerts and clicking **Closed**. For more information, see "[Viewing an alert](#viewing-an-alert)." The "Closed" list shows fixed alerts and alerts that users have {% if currentVersion == "enterprise-server@2.22" %}closed{% else %}dismissed{% endif %}.
+If you have write permission for a repository, you can view fixed alerts by viewing the summary of alerts and clicking **Closed**. For more information, see "[Viewing the alerts for a repository](#viewing-the-alerts-for-a-repository)." The "Closed" list shows fixed alerts and alerts that users have {% if currentVersion == "enterprise-server@2.22" %}closed{% else %}dismissed{% endif %}.
Alerts may be fixed in one branch but not in another. You can use the "Branch" drop-down menu, on the summary of alerts, to check whether an alert is fixed in a particular branch.
diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md
index 0013b8b96b..e777541212 100644
--- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md
+++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests.md
@@ -3,7 +3,7 @@ title: Triaging code scanning alerts in pull requests
shortTitle: Triaging alerts in pull requests
intro: 'When {% data variables.product.prodname_code_scanning %} identifies a problem in a pull request, you can review the highlighted code and resolve the alert.'
product: '{% data reusables.gated-features.code-scanning %}'
-permissions: 'If you have write permission to a repository, you can resolve {% data variables.product.prodname_code_scanning %} alerts for that repository.'
+permissions: 'If you have read permission for a repository, you can see annotations on pull requests. With write permission, you can see detailed information and resolve {% data variables.product.prodname_code_scanning %} alerts for that repository.'
versions:
free-pro-team: '*'
enterprise-server: '>=2.22'
@@ -31,9 +31,9 @@ When you look at the **Files changed** tab for a pull request, you see annotatio

-Some annotations contain links with extra context for the alert. In the example above, from {% data variables.product.prodname_codeql %} analysis, you can click **user-provided value** to see where the untrusted data enters the data flow (this is referred to as the source). In this case you can view the full path from the source to the code that uses the data (the sink) by clicking **Show paths**. This makes it easy to check whether the data is untrusted or if the analysis failed to recognize a data sanitization step between the source and the sink. For information about analyzing data flow using {% data variables.product.prodname_codeql %}, see "[About data flow analysis](https://help.semmle.com/QL/learn-ql/intro-to-data-flow.html)."
+If you have write permission for the repository, some annotations contain links with extra context for the alert. In the example above, from {% data variables.product.prodname_codeql %} analysis, you can click **user-provided value** to see where the untrusted data enters the data flow (this is referred to as the source). In this case you can also view the full path from the source to the code that uses the data (the sink) by clicking **Show paths**. This makes it easy to check whether the data is untrusted or if the analysis failed to recognize a data sanitization step between the source and the sink. For information about analyzing data flow using {% data variables.product.prodname_codeql %}, see "[About data flow analysis](https://help.semmle.com/QL/learn-ql/intro-to-data-flow.html)."
-For more information about an alert, click **Show more details** on the annotation. This allows you to see all of the context and metadata provided by the tool in an alert view. In the example below, you can see tags showing the severity, type, and relevant common weakness enumerations (CWEs) for the problem. The view also shows which commit introduced the problem.
+To see more information about an alert, users with write permission can click the **Show more details** link shown in the annotation. This allows you to see all of the context and metadata provided by the tool in an alert view. In the example below, you can see tags showing the severity, type, and relevant common weakness enumerations (CWEs) for the problem. The view also shows which commit introduced the problem.
In the detailed view for an alert, some {% data variables.product.prodname_code_scanning %} tools, like {% data variables.product.prodname_codeql %} analysis, also include a description of the problem and a **Show more** link for guidance on how to fix your code.
@@ -41,11 +41,11 @@ In the detailed view for an alert, some {% data variables.product.prodname_code_
### {% if currentVersion == "enterprise-server@2.22" %}Resolving{% else %}Fixing{% endif %} an alert on your pull request
-Anyone with write permission for a repository can fix a {% data variables.product.prodname_code_scanning %} alert that's identified on a pull request. If you commit changes to the pull request this triggers a new run of the pull request checks. If your changes fix the problem, the alert is closed and the annotation removed.
+Anyone with push access to a pull request can fix a {% data variables.product.prodname_code_scanning %} alert that's identified on that pull request. If you commit changes to the pull request this triggers a new run of the pull request checks. If your changes fix the problem, the alert is closed and the annotation removed.
{% if currentVersion == "enterprise-server@2.22" %}
-If you don't think that an alert needs to be fixed, you can close the alert manually. {% data reusables.code-scanning.close-alert-examples %} The **Close** button is available in annotations and in the alerts view if you have write permission for the repository.
+If you don't think that an alert needs to be fixed, users with write permission can close the alert manually. {% data reusables.code-scanning.close-alert-examples %} The **Close** button is available in annotations and in the alerts view if you have write permission for the repository.
{% data reusables.code-scanning.false-positive-fix-codeql %}
@@ -63,4 +63,4 @@ An alternative way of closing an alert is to dismiss it. You can dismiss an aler
For more information about dismissing alerts, see "[Managing {% data variables.product.prodname_code_scanning %} alerts for your repository](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository#dismissing-or-deleting-alerts)."
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-secret-scanning-for-your-organization.md b/content/github/setting-up-and-managing-organizations-and-teams/managing-secret-scanning-for-your-organization.md
index c9a49f1591..abeb2eece6 100644
--- a/content/github/setting-up-and-managing-organizations-and-teams/managing-secret-scanning-for-your-organization.md
+++ b/content/github/setting-up-and-managing-organizations-and-teams/managing-secret-scanning-for-your-organization.md
@@ -1,6 +1,7 @@
---
title: Managing secret scanning for your organization
intro: 'You can control which repositories in your organization {% data variables.product.product_name %} will scan for secrets.'
+product: '{% data reusables.gated-features.secret-scanning %}'
permissions: 'Organization owners can manage {% data variables.product.prodname_secret_scanning %} for repositories in the organization.'
versions:
free-pro-team: '*'
diff --git a/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md b/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md
index 3d052e45e8..96dea8173e 100644
--- a/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md
+++ b/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md
@@ -104,7 +104,10 @@ In addition to managing organization-level settings, organization owners have ad
| Receive [{% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a repository | | | | | **X** |
| [Dismiss {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository) | | | | | **X** |
| [Designate additional people or teams to receive {% data variables.product.prodname_dependabot_alerts %}](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository) for vulnerable dependencies | | | | | **X** |
-| [Manage data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository) | | | | | **X** |{% endif %}{% if currentVersion == "free-pro-team@latest" %}| Create [security advisories](/github/managing-security-vulnerabilities/about-github-security-advisories) | | | | | **X** | {% endif %}
+| [Manage data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository) | | | | | **X** |
+| Create [security advisories](/github/managing-security-vulnerabilities/about-github-security-advisories) | | | | | **X** | {% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
+| [View {% data variables.product.prodname_code_scanning %} alerts on pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests) | **X** | **X** | **X** | **X** | **X** |
+| [List, dismiss, and delete {% data variables.product.prodname_code_scanning %} alerts](/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository) | | | **X** | **X** | **X** |{% endif %}
| [Manage the forking policy for a repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository) | | | | | **X** |
| [Transfer repositories into the organization](/articles/restricting-repository-creation-in-your-organization) | | | | | **X** |
| [Delete or transfer repositories out of the organization](/articles/setting-permissions-for-deleting-or-transferring-repositories) | | | | | **X** |
diff --git a/content/github/site-policy/github-additional-product-terms.md b/content/github/site-policy/github-additional-product-terms.md
index e867345c0d..25a38b2efc 100644
--- a/content/github/site-policy/github-additional-product-terms.md
+++ b/content/github/site-policy/github-additional-product-terms.md
@@ -4,7 +4,7 @@ versions:
free-pro-team: '*'
---
-Version Effective Date: November 1, 2020
+Version Effective Date: November 13, 2020
When you create an Account, you're given access to lots of different features and products that are all a part of the Service. Because many of these features and products offer different functionality, they may require additional terms and conditions specific to that feature or product. Below, we've listed those features and products, along with the corresponding additional terms that apply to your use of them.
@@ -89,7 +89,7 @@ In order to become a Sponsored Developer, you must agree to the [GitHub Sponsors
### 9. GitHub Advanced Security
-GitHub Advanced Security enables you to identify security vulnerabilities through customizable and automated semantic code analysis. GitHub Advanced Security is licensed on a per User basis. If you are using GitHub Advanced Security as part of GitHub Enterprise Cloud, many features of GitHub Advanced Security, including automated code scanning of private repositories, also require the use of GitHub Actions. Billing for usage of GitHub Actions is usage-based and is subject to the [GitHub Actions terms](/github/site-policy/github-additional-product-terms#c-payment-and-billing-for-actions-and-packages).
+GitHub Advanced Security is licensed on a "Unique Committer" basis. A "Unique Committer" is a licensed user of GitHub Enterprise, GitHub Enterprise Cloud, GitHub Enterprise Server, or GitHub AE, who has made a code commit in the last 90 days to any repository with any GitHub Advanced Security functionality activated. You must acquire a GitHub Advanced Security User license for each of your Unique Committers. You may only use GitHub Advanced Security on codebases that are developed by or for you. If you are using GitHub Advanced Security as part of GitHub Enterprise Cloud, many features of GitHub Advanced Security, including automated code scanning of private repositories, also require the use of GitHub Actions.
### 10. Dependabot Preview
@@ -108,4 +108,3 @@ We need the legal right to submit your contributions to the GitHub Advisory Data
#### b. License to the GitHub Advisory Database
The GitHub Advisory Database is licensed under the [Creative Commons Attribution 4.0 license](https://creativecommons.org/licenses/by/4.0/). The attribution term may be fulfilled by linking to the GitHub Advisory Database at or to individual GitHub Advisory Database records used, prefixed by .
-
diff --git a/content/github/writing-on-github/autolinked-references-and-urls.md b/content/github/writing-on-github/autolinked-references-and-urls.md
index b0b44c255d..05c747ca8d 100644
--- a/content/github/writing-on-github/autolinked-references-and-urls.md
+++ b/content/github/writing-on-github/autolinked-references-and-urls.md
@@ -43,10 +43,10 @@ References to a commit's SHA hash are automatically converted into shortened lin
| Reference type | Raw reference | Short link |
| --- | --- | --- |
-| Commit URL | https://github.com/jlord/sheetsee.js/commit/a5c3785ed8d6a35868bc169f07e40e889087fd2e | [a5c3785](https://github.com/jlord/sheetsee.js/commit/a5c3785ed8d6a35868bc169f07e40e889087fd2e) |
+| Commit URL | [`https://github.com/jlord/sheetsee.js/commit/a5c3785ed8d6a35868bc169f07e40e889087fd2e`](https://github.com/jlord/sheetsee.js/commit/a5c3785ed8d6a35868bc169f07e40e889087fd2e) | [a5c3785](https://github.com/jlord/sheetsee.js/commit/a5c3785ed8d6a35868bc169f07e40e889087fd2e) |
| SHA | a5c3785ed8d6a35868bc169f07e40e889087fd2e | [a5c3785](https://github.com/jlord/sheetsee.js/commit/a5c3785ed8d6a35868bc169f07e40e889087fd2e) |
| User@SHA | jlord@a5c3785ed8d6a35868bc169f07e40e889087fd2e | [jlord@a5c3785](https://github.com/jlord/sheetsee.js/commit/a5c3785ed8d6a35868bc169f07e40e889087fd2e)
-| Username/Repository@SHA | jlord/sheetsee.js@a5c3785ed8d6a35868bc169f07e40e889087fd2e | [jlord/sheetsee.js@a5c3785](https://github.com/jlord/sheetsee.js/commit/a5c3785ed8d6a35868bc169f07e40e889087fd2e) |
+| `Username/Repository@SHA` | `jlord/sheetsee.js@a5c3785ed8d6a35868bc169f07e40e889087fd2e` | [`jlord/sheetsee.js@a5c3785`](https://github.com/jlord/sheetsee.js/commit/a5c3785ed8d6a35868bc169f07e40e889087fd2e) |
### Custom autolinks to external resources
diff --git a/content/packages/getting-started-with-github-container-registry/about-github-container-registry.md b/content/packages/getting-started-with-github-container-registry/about-github-container-registry.md
index 8e538eeaf4..0ecfb6ab69 100644
--- a/content/packages/getting-started-with-github-container-registry/about-github-container-registry.md
+++ b/content/packages/getting-started-with-github-container-registry/about-github-container-registry.md
@@ -8,19 +8,24 @@ versions:
{% note %}
-**Note:** {% data variables.product.prodname_github_container_registry %} is currently in public beta and subject to change. Currently, {% data variables.product.prodname_github_container_registry %} only supports Docker image formats. During the beta, storage and bandwidth is free.
+**Note:** {% data variables.product.prodname_github_container_registry %} is currently in public beta and subject to change. During the beta, storage and bandwidth are free.
{% endnote %}
-
{% data reusables.package_registry.container-registry-feature-highlights %}
To share context about your package's use, you can link a repository to your container image on {% data variables.product.prodname_dotcom %}. For more information, see "[Connecting a repository to a container image](/packages/managing-container-images-with-github-container-registry/connecting-a-repository-to-a-container-image)."
### Supported formats
-The {% data variables.product.prodname_container_registry %} currently only supports Docker images.
+The {% data variables.product.prodname_container_registry %} currently supports the following container image formats:
+* [Docker Image Manifest V2, Schema 2](https://docs.docker.com/registry/spec/manifest-v2-2/)
+* [Open Container Initiative (OCI) Specifications](https://github.com/opencontainers/image-spec)
+
+#### Manifest Lists/Image Indexes
+
+{% data variables.product.prodname_github_container_registry %} also supports [Docker Manifest List](https://docs.docker.com/registry/spec/manifest-v2-2/#manifest-list)/[OCI Image Index](https://github.com/opencontainers/image-spec/blob/79b036d80240ae530a8de15e1d21c7ab9292c693/image-index.md) formats which are defined in the Docker V2, Schema 2 and OCI image specifications.
### Visibility and access permissions for container images
diff --git a/content/packages/managing-container-images-with-github-container-registry/deleting-a-container-image.md b/content/packages/managing-container-images-with-github-container-registry/deleting-a-container-image.md
index fdce765c81..4ddb793374 100644
--- a/content/packages/managing-container-images-with-github-container-registry/deleting-a-container-image.md
+++ b/content/packages/managing-container-images-with-github-container-registry/deleting-a-container-image.md
@@ -16,8 +16,6 @@ To delete a container image, you must have admin permissions to the container im
When deleting public packages, be aware that you may break projects that depend on your package.
-
-
### Reserved package versions and names
{% data reusables.package_registry.package-immutability %}
diff --git a/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md b/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md
index 9ac1b3572e..0d8c2df1cc 100644
--- a/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md
+++ b/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md
@@ -27,7 +27,7 @@ You can authenticate to {% data variables.product.prodname_registry %} with Apac
In the `servers` tag, add a child `server` tag with an `id`, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, and *TOKEN* with your personal access token.
-In the `repositories` tag, configure a repository by mapping the `id` of the repository to the `id` you added in the `server` tag containing your credentials. Replace {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}*REPOSITORY* with the name of the repository you'd like to publish a package to or install a package from, and *OWNER* with the name of the user or organization account that owns the repository. {% data reusables.package_registry.lowercase-name-field %}
+In the `repositories` tag, configure a repository by mapping the `id` of the repository to the `id` you added in the `server` tag containing your credentials. Replace {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}*REPOSITORY* with the name of the repository you'd like to publish a package to or install a package from, and *OWNER* with the name of the user or organization account that owns the repository. Because uppercase letters aren't supported, you must use lowercase letters for the repository owner even if the {% data variables.product.prodname_dotcom %} user or organization name contains uppercase letters.
If you want to interact with multiple repositories, you can add each repository to separate `repository` children in the `repositories` tag, mapping the `id` of each to the credentials in the `servers` tag.
diff --git a/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md b/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md
index a929dc86ee..d31c4e2c4a 100644
--- a/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md
+++ b/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md
@@ -65,13 +65,17 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen
{% data reusables.package_registry.package-registry-with-github-tokens %}
-### Publishing a package
+### Publishing an image
{% data reusables.package_registry.docker_registry_deprecation_status %}
-{% data variables.product.prodname_registry %} supports multiple top-level Docker images per repository. A repository can have any number of image tags. You may experience degraded service publishing or installing Docker images larger than 10GB, layers are capped at 5GB each. For more information, see "[Docker tag](https://docs.docker.com/engine/reference/commandline/tag/)" in the Docker documentation.
+{% note %}
-{% data reusables.package_registry.lowercase-name-field %}
+**Note:** Image names must only use lowercase letters.
+
+{% endnote %}
+
+{% data variables.product.prodname_registry %} supports multiple top-level Docker images per repository. A repository can have any number of image tags. You may experience degraded service publishing or installing Docker images larger than 10GB, layers are capped at 5GB each. For more information, see "[Docker tag](https://docs.docker.com/engine/reference/commandline/tag/)" in the Docker documentation.
{% data reusables.package_registry.viewing-packages %}
@@ -178,11 +182,11 @@ $ docker push docker.HOSTNAME/octocat/octo-app/monalisa:1.0
```
{% endif %}
-### Installing a package
+### Downloading an image
{% data reusables.package_registry.docker_registry_deprecation_status %}
-You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %}
+You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install.
{% if currentVersion == "free-pro-team@latest" %}
```shell
diff --git a/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md b/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md
index 7e84a715f3..73502d9a86 100644
--- a/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md
+++ b/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md
@@ -29,7 +29,7 @@ You can authenticate to {% data variables.product.prodname_registry %} with Grad
Replace *REGISTRY-URL* with the URL for your instance's Maven registry. If your instance has subdomain isolation enabled, use `maven.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/maven`. In either case, replace *HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance.
{% endif %}
-Replace *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, *REPOSITORY* with the name of the repository containing the package you want to publish, and *OWNER* with the name of the user or organization account on {% data variables.product.prodname_dotcom %} that owns the repository. {% data reusables.package_registry.lowercase-name-field %}
+Replace *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, *REPOSITORY* with the name of the repository containing the package you want to publish, and *OWNER* with the name of the user or organization account on {% data variables.product.prodname_dotcom %} that owns the repository. Because uppercase letters aren't supported, you must use lowercase letters for the repository owner even if the {% data variables.product.prodname_dotcom %} user or organization name contains uppercase letters.
{% note %}
diff --git a/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md b/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md
index c20f4464fa..24e8685419 100644
--- a/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md
+++ b/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md
@@ -73,6 +73,12 @@ $ npm login --registry=https://HOSTNAME/_registry/npm/
### Publishing a package
+{% note %}
+
+**Note:** Package names and scopes must only use lowercase letters.
+
+{% endnote %}
+
By default, {% data variables.product.prodname_registry %} publishes a package in the {% data variables.product.prodname_dotcom %} repository you specify in the name field of the *package.json* file. For example, you would publish a package named `@my-org/test` to the `my-org/test` {% data variables.product.prodname_dotcom %} repository. You can add a summary for the package listing page by including a *README.md* file in your package directory. For more information, see "[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)" and "[How to create Node.js Modules](https://docs.npmjs.com/getting-started/creating-node-modules)" in the npm documentation.
You can publish multiple packages to the same {% data variables.product.prodname_dotcom %} repository by including a `URL` field in the *package.json* file. For more information, see "[Publishing multiple packages to the same repository](#publishing-multiple-packages-to-the-same-repository)."
@@ -83,12 +89,12 @@ You can set up the scope mapping for your project using either a local *.npmrc*
#### Publishing a package using a local *.npmrc* file
-You can use an *.npmrc* file to configure the scope mapping for your project. In the *.npmrc* file, use the {% data variables.product.prodname_registry %} URL and account owner so {% data variables.product.prodname_registry %} knows where to route package requests. Using an *.npmrc* file prevents other developers from accidentally publishing the package to npmjs.org instead of {% data variables.product.prodname_registry %}. {% data reusables.package_registry.lowercase-name-field %}
+You can use an *.npmrc* file to configure the scope mapping for your project. In the *.npmrc* file, use the {% data variables.product.prodname_registry %} URL and account owner so {% data variables.product.prodname_registry %} knows where to route package requests. Using an *.npmrc* file prevents other developers from accidentally publishing the package to npmjs.org instead of {% data variables.product.prodname_registry %}.
{% data reusables.package_registry.authenticate-step %}
{% data reusables.package_registry.create-npmrc-owner-step %}
{% data reusables.package_registry.add-npmrc-to-repo-step %}
-4. Verify the name of your package in your project's *package.json*. The `name` field must contain the scope and the name of the package. For example, if your package is called "test", and you are publishing to the "My-org" {% data variables.product.prodname_dotcom %} organization, the `name` field in your *package.json* should be `@my-org/test`.
+1. Verify the name of your package in your project's *package.json*. The `name` field must contain the scope and the name of the package. For example, if your package is called "test", and you are publishing to the "My-org" {% data variables.product.prodname_dotcom %} organization, the `name` field in your *package.json* should be `@my-org/test`.
{% data reusables.package_registry.verify_repository_field %}
{% data reusables.package_registry.publish_package %}
@@ -166,7 +172,7 @@ You also need to add the *.npmrc* file to your project so all requests to instal
#### Installing packages from other organizations
-By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %}
+By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project.
{% if enterpriseServerVersions contains currentVersion %}
If your instance has subdomain isolation enabled:
diff --git a/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md b/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md
index da25231521..b0e21632a8 100644
--- a/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md
+++ b/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md
@@ -76,8 +76,6 @@ If you don't have a *~/.gemrc* file, create a new *~/.gemrc* file using this exa
To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance.{% endif %}
-{% data reusables.package_registry.lowercase-name-field %}
-
```shell
$ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER USERNAME:TOKEN
```
diff --git a/content/rest/overview/other-authentication-methods.md b/content/rest/overview/other-authentication-methods.md
index 5b70f6fd83..ec4a6ae19e 100644
--- a/content/rest/overview/other-authentication-methods.md
+++ b/content/rest/overview/other-authentication-methods.md
@@ -46,11 +46,19 @@ $ curl -u username:token {% data variables.product.api_url_pre
This approach is useful if your tools only support Basic Authentication but you want to take advantage of OAuth access token security features.
-{% if enterpriseServerVersions contains currentVersion %}
#### Via username and password
-{% data reusables.apps.deprecating_password_auth %}
+{% if currentVersion == "free-pro-team@latest" %}
+{% note %}
+
+**Note:** {% data variables.product.prodname_dotcom %} has discontinued password authentication to the API starting on November 13, 2020 for all {% data variables.product.prodname_dotcom_the_website %} accounts, including those on a {% data variables.product.prodname_free_user %}, {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, or {% data variables.product.prodname_ghe_cloud %} plan. You must now authenticate to the {% data variables.product.prodname_dotcom %} API with an API token, such as an OAuth access token, GitHub App installation access token, or personal access token, depending on what you need to do with the token. For more information, see "[Troubleshooting](/rest/overview/troubleshooting#basic-authentication-errors)."
+
+{% endnote %}
+
+{% endif %}
+
+{% if enterpriseServerVersions contains currentVersion %}
To use Basic Authentication with the {% data variables.product.product_name %} API, simply send the username and
password associated with the account.
@@ -100,14 +108,13 @@ The value `organizations` is a comma-separated list of organization IDs for orga
{% if currentVersion == "free-pro-team@latest" or enterpriseServerVersions contains currentVersion %}
### Working with two-factor authentication
-{% data reusables.apps.deprecating_password_auth %}
-
-When you have two-factor authentication enabled, [Basic Authentication](#basic-authentication) for _most_ endpoints in the REST API requires that you use a personal access token or OAuth token instead of your username and password.
-
-You can generate a new personal access token {% if currentVersion == "free-pro-team@latest" %}with [{% data variables.product.product_name %} developer settings](https://github.com/settings/tokens/new){% endif %} or use the "[Create a new authorization][create-access]" endpoint in the OAuth Authorizations API to generate a new OAuth token. For more information, see "[Creating a personal access token for the command line](/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line)". Then you would use these tokens to [authenticate using OAuth token][oauth-auth] with the GitHub API. The only time you need to authenticate with your username and password is when you create your OAuth token or use the OAuth Authorizations API.
+When you have two-factor authentication enabled, [Basic Authentication](#basic-authentication) for _most_ endpoints in the REST API requires that you use a personal access token{% if enterpriseServerVersions contains currentVersion %} or OAuth token instead of your username and password{% endif %}.
+You can generate a new personal access token {% if currentVersion == "free-pro-team@latest" %}using [{% data variables.product.product_name %} developer settings](https://github.com/settings/tokens/new){% endif %}{% if enterpriseServerVersions contains currentVersion %} or with the "[Create a new authorization][/rest/reference/oauth-authorizations#create-a-new-authorization]" endpoint in the OAuth Authorizations API to generate a new OAuth token{% endif %}. For more information, see "[Creating a personal access token for the command line](/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line)". Then you would use these tokens to [authenticate using OAuth token][oauth-auth] with the {% data variables.product.prodname_dotcom %} API.{% if enterpriseServerVersions contains currentVersion %} The only time you need to authenticate with your username and password is when you create your OAuth token or use the OAuth Authorizations API.{% endif %}
+{% endif %}
+{% if enterpriseServerVersions contains currentVersion %}
#### Using the OAuth Authorizations API with two-factor authentication
When you make calls to the OAuth Authorizations API, Basic Authentication requires that you use a one-time password (OTP) and your username and password instead of tokens. When you attempt to authenticate with the OAuth Authorizations API, the server will respond with a `401 Unauthorized` and one of these headers to let you know that you need a two-factor authentication code:
@@ -126,7 +133,6 @@ $ curl --request POST \
```
{% endif %}
-[create-access]: /v3/oauth_authorizations/#create-a-new-authorization
[curl]: http://curl.haxx.se/
[oauth-auth]: /v3/#authentication
[personal-access-tokens]: /articles/creating-a-personal-access-token-for-the-command-line
diff --git a/content/rest/overview/resources-in-the-rest-api.md b/content/rest/overview/resources-in-the-rest-api.md
index c275ff4b3a..103e4da35b 100644
--- a/content/rest/overview/resources-in-the-rest-api.md
+++ b/content/rest/overview/resources-in-the-rest-api.md
@@ -150,9 +150,9 @@ the API will temporarily reject all authentication attempts for that user
(including ones with valid credentials) with `403 Forbidden`:
```shell
-$ curl -i {% data variables.product.api_url_pre %} -u valid_username:valid_password
+$ curl -i {% data variables.product.api_url_pre %} -u {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" %}
+-u valid_username:valid_token {% endif %}{% if enterpriseServerVersions contains currentVersion %}-u valid_username:valid_password {% endif %}
> HTTP/1.1 403 Forbidden
-
> {
> "message": "Maximum number of login attempts exceeded. Please try again later.",
> "documentation_url": "{% data variables.product.doc_url_pre %}/v3"
@@ -185,19 +185,10 @@ $ curl -i -u username -d '{"scopes":["public_repo"]}' {% data variables.product.
You can issue a `GET` request to the root endpoint to get all the endpoint categories that the REST API supports:
```shell
-$ curl {% if currentVersion == "github-ae@latest" %}-u username:token {% endif %}{% if currentVersion == "free-pro-team@latest" or enterpriseServerVersions contains currentVersion %}-u username:password {% endif %}{% data variables.product.api_url_pre %}
+$ curl {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" %}
+-u username:token {% endif %}{% if enterpriseServerVersions contains currentVersion %}-u username:password {% endif %}{% data variables.product.api_url_pre %}
```
-{% if currentVersion == "free-pro-team@latest" or enterpriseServerVersions contains currentVersion %}
-
-{% note %}
-
-**Note:** For {% data variables.product.prodname_ghe_server %}, [as with all other endpoints](/v3/enterprise-admin/#endpoint-urls), you'll need to pass your username and password.
-
-{% endnote %}
-
-{% endif %}
-
### GraphQL global node IDs
See the guide on "[Using Global Node IDs](/v4/guides/using-global-node-ids)" for detailed information about how to find `node_id`s via the REST API and use them in GraphQL operations.
diff --git a/content/rest/overview/troubleshooting.md b/content/rest/overview/troubleshooting.md
index 24c83cfc37..d3b262ece7 100644
--- a/content/rest/overview/troubleshooting.md
+++ b/content/rest/overview/troubleshooting.md
@@ -14,7 +14,7 @@ versions:
If you're encountering some oddities in the API, here's a list of resolutions to
some of the problems you may be experiencing.
-### Why am I getting a `404` error on a repository that exists?
+### `404` error for an existing repository
Typically, we send a `404` error when your client isn't properly authenticated.
You might expect to see a `403 Forbidden` in these cases. However, since we don't
@@ -23,7 +23,7 @@ want to provide _any_ information about private repositories, the API returns a
To troubleshoot, ensure [you're authenticating correctly](/guides/getting-started/), [your OAuth access token has the required scopes](/apps/building-oauth-apps/understanding-scopes-for-oauth-apps/), and [third-party application restrictions][oap-guide] are not blocking access.
-### Why am I not seeing all my results?
+### Not all results returned
Most API calls accessing a list of resources (_e.g._, users, issues, _etc._) support
pagination. If you're making requests and receiving an incomplete set of results, you're
@@ -35,3 +35,40 @@ API call uses the same structure. Instead, extract the pagination information fr
[the Link Header](/v3/#pagination), which is sent with every request.
[oap-guide]: https://developer.github.com/changes/2015-01-19-an-integrators-guide-to-organization-application-policies/
+
+{% if currentVersion == "free-pro-team@latest" %}
+### Basic authentication errors
+
+On November 13, 2020 username and password authentication to the REST API and the OAuth Authorizations API were deprecated and no longer work.
+
+#### Using `username`/`password` for basic authentication
+
+If you're using `username` and `password` for API calls, then they are no longer able to authenticate. For example:
+
+```bash
+curl -u my_user:my_password https://api.github.com/user/repos
+```
+
+Instead, use a [personal access token](/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line) when testing endpoints or doing local development:
+
+```bash
+curl -H 'Authorization: token my_access_token' https://api.github.com/user/repos
+```
+
+For OAuth Apps, you should use the [web application flow](/apps/building-oauth-apps/authorizing-oauth-apps/#web-application-flow) to generate an OAuth token to use in the API call's header:
+
+```bash
+curl -H 'Authorization: token my-oauth-token' https://api.github.com/user/repos
+```
+
+#### Calls to OAuth Authorizations API
+
+If you're making [OAuth Authorization API](/enterprise-server@2.22/rest/reference/oauth-authorizations) calls to manage your OAuth app's authorizations or to generate access tokens, similar to this example:
+
+```bash
+curl -u my_username:my_password -X POST "https://api.github.com/authorizations" -d '{"scopes":["public_repo"], "note":"my token", "client_id":"my_client_id", "client_secret":"my_client_secret"}'
+```
+
+Then you must switch to the [web application flow](/apps/building-oauth-apps/authorizing-oauth-apps/#web-application-flow) to generate access tokens.
+
+{% endif %}
diff --git a/content/rest/reference/interactions.md b/content/rest/reference/interactions.md
index 9ab1cdd10c..1fb73f9948 100644
--- a/content/rest/reference/interactions.md
+++ b/content/rest/reference/interactions.md
@@ -6,7 +6,7 @@ versions:
free-pro-team: '*'
---
-Users interact with repositories by commenting, opening issues, and creating pull requests. The Interactions APIs allow people with owner or admin access to temporarily restrict certain users from interacting with public repositories.
+Users interact with repositories by commenting, opening issues, and creating pull requests. The Interactions APIs allow people with owner or admin access to temporarily restrict interaction with public repositories to a certain type of user.
{% for operation in currentRestOperations %}
{% unless operation.subcategory %}{% include rest_operation %}{% endunless %}
@@ -14,24 +14,42 @@ Users interact with repositories by commenting, opening issues, and creating pul
## Organization
-The Organization Interactions API allows organization owners to temporarily restrict which users can comment, open issues, or create pull requests in the organization's public repositories. {% data reusables.interactions.interactions-detail %} Here's more about the groups of {% data variables.product.product_name %} users:
+The Organization Interactions API allows organization owners to temporarily restrict which type of user can comment, open issues, or create pull requests in the organization's public repositories. {% data reusables.interactions.interactions-detail %} Here's more about the types of {% data variables.product.product_name %} users:
* {% data reusables.interactions.existing-user-limit-definition %} in the organization.
* {% data reusables.interactions.contributor-user-limit-definition %} in the organization.
* {% data reusables.interactions.collaborator-user-limit-definition %} in the organization.
+Setting the interaction limit at the organization level will overwrite any interaction limits that are set for individual repositories owned by the organization. To set different interaction limits for individual repositories owned by the organization, use the [Repository](#repository) interactions endpoints instead.
+
{% for operation in currentRestOperations %}
{% if operation.subcategory == 'orgs' %}{% include rest_operation %}{% endif %}
{% endfor %}
## Repository
-The Repository Interactions API allows people with owner or admin access to temporarily restrict which users can comment, open issues, or create pull requests in a public repository. {% data reusables.interactions.interactions-detail %} Here's more about the groups of {% data variables.product.product_name %} users:
+The Repository Interactions API allows people with owner or admin access to temporarily restrict which type of user can comment, open issues, or create pull requests in a public repository. {% data reusables.interactions.interactions-detail %} Here's more about the types of {% data variables.product.product_name %} users:
* {% data reusables.interactions.existing-user-limit-definition %} in the repository.
* {% data reusables.interactions.contributor-user-limit-definition %} in the repository.
* {% data reusables.interactions.collaborator-user-limit-definition %} in the repository.
+If an interaction limit is enabled for the user or organization that owns the repository, the limit cannot be changed for the individual repository. Instead, use the [User](#user) or [Organization](#organization) interactions endpoints to change the interaction limit.
+
{% for operation in currentRestOperations %}
{% if operation.subcategory == 'repos' %}{% include rest_operation %}{% endif %}
{% endfor %}
+
+## User
+
+The User Interactions API allows you to temporarily restrict which type of user can comment, open issues, or create pull requests on your public repositories. {% data reusables.interactions.interactions-detail %} Here's more about the types of {% data variables.product.product_name %} users:
+
+* {% data reusables.interactions.existing-user-limit-definition %} from interacting with your repositories.
+* {% data reusables.interactions.contributor-user-limit-definition %} from interacting with your repositories.
+* {% data reusables.interactions.collaborator-user-limit-definition %} from interacting with your repositories.
+
+Setting the interaction limit at the user level will overwrite any interaction limits that are set for individual repositories owned by the user. To set different interaction limits for individual repositories owned by the user, use the [Repository](#repository) interactions endpoints instead.
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'user' %}{% include rest_operation %}{% endif %}
+{% endfor %}
diff --git a/content/rest/reference/oauth-authorizations.md b/content/rest/reference/oauth-authorizations.md
index 8bb3e8fa72..356309baff 100644
--- a/content/rest/reference/oauth-authorizations.md
+++ b/content/rest/reference/oauth-authorizations.md
@@ -4,13 +4,9 @@ redirect_from:
- /v3/oauth_authorizations
- /v3/oauth-authorizations
versions:
- free-pro-team: '*'
enterprise-server: '*'
---
-{% data reusables.apps.deprecating_token_oauth_authorizations %}
-{% data reusables.apps.deprecating_password_auth %}
-
You can use this API to manage the access OAuth applications have to your account. You can only access this API via [Basic Authentication](/rest/overview/other-authentication-methods#basic-authentication) using your username and password, not tokens.
If you or your users have two-factor authentication enabled, make sure you understand how to [work with two-factor authentication](/rest/overview/other-authentication-methods#working-with-two-factor-authentication).
diff --git a/contributing/content-style-guide.md b/contributing/content-style-guide.md
index f103bf3dcb..ee29269186 100644
--- a/contributing/content-style-guide.md
+++ b/contributing/content-style-guide.md
@@ -193,8 +193,8 @@ Introduce links consistently using a standard format that clearly indicates wher
Links should be meaningful and provide high value to the user’s journey - link out carefully. Move links that are helpful but not necessary to an article’s further reading section. Do not repeat the same link more than once in the same article or under the same H3 header.
For accessibility and readability, avoid inline or midsentence links.
-- **Use:** OAuth2 tokens can be acquired programmatically for applications that are not websites. For more information, see "[Setting up and registering OAuth Apps](https://developer.github.com/apps/building-integrations/setting-up-and-registering-oauth-apps/)" and "[Create a new authorization](https://developer.github.com/v3/oauth_authorizations/#create-a-new-authorization)."
-- **Avoid:** Read [more about OAuth2.](https://developer.github.com/apps/building-integrations/setting-up-and-registering-oauth-apps/) Note that OAuth2 tokens can be [acquired programmatically](https://developer.github.com/v3/oauth_authorizations/#create-a-new-authorization), for applications that are not websites.
+- **Use:** OAuth2 tokens can be acquired programmatically for applications that are not websites. For more information, see "[Setting up and registering OAuth Apps](https://developer.github.com/apps/building-integrations/setting-up-and-registering-oauth-apps/)" and "[Create a new authorization](https://docs.github.com/en/enterprise-server@2.22/rest/reference/oauth-authorizations/#create-a-new-authorization)."
+- **Avoid:** Read [more about OAuth2.](https://developer.github.com/apps/building-integrations/setting-up-and-registering-oauth-apps/) Note that OAuth2 tokens can be [acquired programmatically](https://docs.github.com/en/enterprise-server@2.22/rest/reference/oauth-authorizations/#create-a-new-authorization), for applications that are not websites.
For more information on links and accessibility, see “[Links](https://readabilityguidelines.co.uk/content-design/links/)” in the Readability Guidelines project.
diff --git a/contributing/development.md b/contributing/development.md
index 0b2f9682e4..7c6f3b297b 100644
--- a/contributing/development.md
+++ b/contributing/development.md
@@ -26,6 +26,12 @@ When you're ready to stop your local server, type CTRLc in
Note that `npm run build` is a one-time step that create static assets.
+### Using GitHub Codespaces
+
+As an alternative, you can simply use [GitHub Codespaces](https://github.com/features/codespaces).
+
+In a matter of minutes, you will be ready to edit, preview and test your changes directly from the comfort of your browser.
+
## Site structure
This site was originally a Ruby on Rails web application. Some time later it was converted into a static site powered by [Jekyll](https://jekyllrb.com/). A few years after that it was migrated to [Nanoc](https://nanoc.ws/), another Ruby static site generator.
diff --git a/contributing/localization-checklist.md b/contributing/localization-checklist.md
index 432384699e..31eba65e9a 100644
--- a/contributing/localization-checklist.md
+++ b/contributing/localization-checklist.md
@@ -1,6 +1,6 @@
# Localization Prep Checklist
-Use the following checklist to help make your files more translation-friendly. For additional information, refer to the [style guide](contribution/content-style-guide.md).
+Use the following checklist to help make your files more translation-friendly. For additional information, refer to the [style guide](content-style-guide.md).
- [ ] Use examples that are generic and can be understood by most people.
- [ ] Avoid controversial examples or culturally specific to a group.
@@ -26,10 +26,10 @@ Use the following checklist to help make your files more translation-friendly. F
| Guideline | Avoid | Use instead |
| --------- | ----- | ----------- |
| Avoid country specific information. | 800 numbers, addresses, etc. | If necessary, mention what countries the information applies to. |
-| Avoid the excessive use of stacked modifiers (Noun strings). This can lead to incorrect translations because it is not easy to tell what modifies what. | “public repository default source settings” or “Oauth app access restrictions” | "Default source settings for the public repository" or "restrictions for Oath app access." If using a stacked modifier is essential, make sure the background information and context are clear so the linguist understands what is the noun that is being modified. |
+| Avoid the excessive use of stacked modifiers (Noun strings). This can lead to incorrect translations because it is not easy to tell what modifies what. | “public repository default source settings” or “OAuth app access restrictions” | "Default source settings for the public repository" or "restrictions for OAuth app access." If using a stacked modifier is essential, make sure the background information and context are clear so the linguist understands what is the noun that is being modified. |
| Avoid invisible plurals. | "Program update" or "File retrieval". Is this an update of one program or a general procedure for multiple programs? For "File retrieval", Are you retrieving one file or all of them? | Write the sentence more clearly or provide additional context to eliminate ambiguity that can result in an incorrect translation. |
| Avoid nominalization. | "To reach a conclusion" | Use "Conclude." |
| Avoid using ambiguous modal auxiliary verbs. | May, might, ought, could, used to, etc. | Be more clear when writing to avoid ambiguity. |
| Avoid prepositional phrases. | "According to the repository log..." or "After trying many times..." | Write the sentence more directly. |
| Avoid vague nouns and pronouns. | "Maintainers and contributors have access to files and comments. In the pull request they make changes to it." In this example it is not clear if the changes are being made to the file or to the comments. Another example “After saving the file in the folder, the user deleted it.” In this sentence it is not clear what was deleted (file or folder). | If a pronoun seems to refer to more than one antecedent, either reword the sentence to make the antecedent clear or replace the pronoun by a noun to eliminate ambiguity. |
-| Keep inline links to a minimum. | Read [more about OAuth2.](https://developer.github.com/apps/building-integrations/setting-up-and-registering-oauth-apps/) Note that OAuth2 tokens can be [acquired programmatically](https://developer.github.com/v3/oauth_authorizations/#create-a-new-authorization), for applications that are not websites. | OAuth2 tokens can be acquired programmatically for applications that are not websites. For more information, see "[Setting up and registering OAuth Apps](https://developer.github.com/apps/building-integrations/setting-up-and-registering-oauth-apps/)" and "[Create a new authorization](https://developer.github.com/v3/oauth_authorizations/#create-a-new-authorization)." |
+| Keep inline links to a minimum. | Read [more about OAuth2.](https://developer.github.com/apps/building-integrations/setting-up-and-registering-oauth-apps/) Note that OAuth2 tokens can be [acquired programmatically](https://docs.github.com/en/enterprise-server@2.22/rest/reference/oauth-authorizations/#create-a-new-authorization), for applications that are not websites. | OAuth2 tokens can be acquired programmatically for applications that are not websites. For more information, see "[Setting up and registering OAuth Apps](https://developer.github.com/apps/building-integrations/setting-up-and-registering-oauth-apps/)" and "[Create a new authorization](https://docs.github.com/en/enterprise-server@2.22/rest/reference/oauth-authorizations/#create-a-new-authorization)." |
diff --git a/data/reusables/apps/deprecating_password_auth.md b/data/reusables/apps/deprecating_password_auth.md
deleted file mode 100644
index 402d3b14b6..0000000000
--- a/data/reusables/apps/deprecating_password_auth.md
+++ /dev/null
@@ -1,9 +0,0 @@
-{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %}
-{% warning %}
-
-**Deprecation Notice:** {% data variables.product.prodname_dotcom %} will discontinue password authentication to the API. You must now authenticate to the {% data variables.product.prodname_dotcom %} API with an API token, such as an OAuth access token, GitHub App installation access token, or personal access token, depending on what you need to do with the token.{% if currentVersion == "free-pro-team@latest" %} Password authentication to the API will be removed on November 13, 2020.{% endif %} For more information,{% if currentVersion == "free-pro-team@latest" %} including scheduled brownouts,{% endif %} see the [blog post](https://developer.github.com/changes/2020-02-14-deprecating-password-auth/).
-
-{% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %} Authenticating to the API using a password is currently available and not yet deprecated in {% data variables.product.product_name %}. {% data variables.product.prodname_dotcom %} will announce the deprecation and provide advanced notice before removing support for this feature.{% endif %}
-
-{% endwarning %}
-{% endif %}
diff --git a/data/reusables/gated-features/secret-scanning.md b/data/reusables/gated-features/secret-scanning.md
new file mode 100644
index 0000000000..bd279034ee
--- /dev/null
+++ b/data/reusables/gated-features/secret-scanning.md
@@ -0,0 +1 @@
+{% data variables.product.prodname_secret_scanning_caps %} is available in public repositories, and in private repositories owned by organizations with an {% data variables.product.prodname_advanced_security %} license. {% data reusables.gated-features.more-info %}
diff --git a/data/reusables/interactions/interactions-detail.md b/data/reusables/interactions/interactions-detail.md
index 9193cd04e7..187a3e7307 100644
--- a/data/reusables/interactions/interactions-detail.md
+++ b/data/reusables/interactions/interactions-detail.md
@@ -1 +1 @@
-When restrictions are enabled, only the specified group of {% data variables.product.product_name %} users will be able to participate in interactions. Restrictions expire 24 hours from the time they are set.
+When restrictions are enabled, only the specified type of {% data variables.product.product_name %} user will be able to participate in interactions. Restrictions automatically expire after a defined duration.
diff --git a/data/reusables/package_registry/container-registry-beta.md b/data/reusables/package_registry/container-registry-beta.md
index a5e3b6f7f8..df0f9843b0 100644
--- a/data/reusables/package_registry/container-registry-beta.md
+++ b/data/reusables/package_registry/container-registry-beta.md
@@ -1,5 +1,5 @@
{% note %}
-**Note:** {% data variables.product.prodname_github_container_registry %} is currently in public beta and subject to change. Currently, {% data variables.product.prodname_github_container_registry %} only supports Docker image formats. During the beta, storage and bandwidth is free. For more information, see "[About {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry/about-github-container-registry)."
+**Note:** {% data variables.product.prodname_github_container_registry %} is currently in public beta and subject to change. During the beta, storage and bandwidth are free. For more information, see "[About {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry/about-github-container-registry)."
{% endnote %}
diff --git a/data/reusables/package_registry/lowercase-name-field.md b/data/reusables/package_registry/lowercase-name-field.md
deleted file mode 100644
index cbf0a71e49..0000000000
--- a/data/reusables/package_registry/lowercase-name-field.md
+++ /dev/null
@@ -1 +0,0 @@
-Because upper case letters aren't supported, you must use lowercase letters for the repository owner even if the {% data variables.product.prodname_dotcom %} user or organization name contains uppercase letters.
diff --git a/data/reusables/secret-scanning/beta.md b/data/reusables/secret-scanning/beta.md
index 68ed06f9c9..3625bb7a3e 100644
--- a/data/reusables/secret-scanning/beta.md
+++ b/data/reusables/secret-scanning/beta.md
@@ -1,5 +1,5 @@
{% note %}
-**Note:** {% data variables.product.prodname_secret_scanning_caps %} for private repositories is currently in beta and subject to change. To request access to the beta, [join the waitlist](https://github.com/features/security/advanced-security/signup).
+**Note:** {% data variables.product.prodname_secret_scanning_caps %} for private repositories is currently in beta and subject to change.
{% endnote %}
diff --git a/data/ui.yml b/data/ui.yml
index 76efeee181..bbd8b3b1c3 100644
--- a/data/ui.yml
+++ b/data/ui.yml
@@ -4,6 +4,9 @@ header:
notices:
ghae_silent_launch:
GitHub AE is currently under limited release. Please contact our Sales Team to find out more.
+ release_candidate:
+ # The version name is rendered before the below text via includes/header-notification.html
+ ' is currently under limited release as a release candidate.'
localization_complete:
We publish frequent updates to our documentation, and translation of this page may still be in progress.
For the most current information, please visit the
@@ -15,9 +18,6 @@ header:
still in translation. For the most up-to-date and accurate information,
please visit our
English documentation.
- product_in_progress:
- 👋 Hello, explorer! This page is under active development. For the
- most up-to-date and accurate information, please visit our developer documentation.
early_access:
👋 This page contains content about an early access feature. Please do not share this URL publicly.
search:
@@ -134,4 +134,4 @@ footer:
shop: Shop
product_landing:
quick_start: Quickstart
- reference_guides: Reference guides
\ No newline at end of file
+ reference_guides: Reference guides
diff --git a/data/variables/action_code_examples.yml b/data/variables/action_code_examples.yml
new file mode 100644
index 0000000000..a0f12b0384
--- /dev/null
+++ b/data/variables/action_code_examples.yml
@@ -0,0 +1,131 @@
+- title: Starter workflows
+ description: Workflow files for helping people get started with GitHub Actions
+ languages: TypeScript
+ href: actions/starter-workflows
+ tags:
+ - official
+ - workflows
+- title: Example services
+ description: Example workflows using service containers
+ languages: JavaScript
+ href: actions/example-services
+ tags:
+ - service containers
+- title: Declaratively setup GitHub Labels
+ description: GitHub Action to declaratively setup labels across repos
+ languages: JavaScript
+ href: lannonbr/issue-label-manager-action
+ tags:
+ - issues
+ - labels
+- title: Declaratively sync GitHub lables
+ description: GitHub Action to sync GitHub labels in the declarative way
+ languages: 'Go, Dockerfile'
+ href: micnncim/action-label-syncer
+ tags:
+ - issues
+ - labels
+- title: Add releases to GitHub
+ description: Publish Github releases in an action
+ languages: 'Dockerfile, Shell'
+ href: elgohr/Github-Release-Action
+ tags:
+ - releases
+ - publishing
+- title: Publish a docker image to Dockerhub
+ description: A Github Action used to build and publish Docker images
+ languages: 'Dockerfile, Shell'
+ href: elgohr/Publish-Docker-Github-Action
+ tags:
+ - docker
+ - publishing
+ - build
+- title: Create an issue using content from a file
+ description: A GitHub action to create an issue using content from a file
+ languages: 'JavaScript, Python'
+ href: peter-evans/create-issue-from-file
+ tags:
+ - issues
+- title: Publish GitHub Releases with Assets
+ description: GitHub Action for creating GitHub Releases
+ languages: 'TypeScript, Shell, JavaScript'
+ href: softprops/action-gh-release
+ tags:
+ - releases
+ - publishing
+- title: GitHub Project Automation+
+ description: Automate GitHub Project cards with any webhook event.
+ languages: JavaScript
+ href: alex-page/github-project-automation-plus
+ tags:
+ - projects
+ - automation
+ - issues
+ - pull requests
+- title: Run GitHub Actions Locally with a web interface
+ description: Runs GitHub Actions workflows locally (local)
+ languages: 'JavaScript, HTML, Dockerfile, CSS'
+ href: phishy/wflow
+ tags:
+ - local-development
+ - devops
+ - docker
+- title: Run your GitHub Actions locally
+ description: Run GitHub Actions Locally in Terminal
+ languages: 'Go, Shell'
+ href: nektos/act
+ tags:
+ - local-development
+ - devops
+ - docker
+- title: Build and Publish Android debug APK
+ description: Build and release debug APK from your Android project
+ languages: 'Shell, Dockerfile'
+ href: ShaunLWM/action-release-debugapk
+ tags:
+ - android
+ - build
+- title: Generate sequential build numbers for GitHub Actions
+ description: GitHub action for generating sequential build numbers.
+ languages: JavaScript
+ href: einaregilsson/build-number
+ tags:
+ - build
+ - automation
+- title: GitHub actions to push back to repository
+ description: Push Git changes to GitHub repository without authentication difficulties
+ languages: 'JavaScript, Shell'
+ href: ad-m/github-push-action
+ tags:
+ - publishing
+- title: Generate release notes based on your events
+ description: Action to auto generate a release note based on your events
+ languages: 'Shell, Dockerfile'
+ href: Decathlon/release-notes-generator-action
+ tags:
+ - releases
+ - publishing
+- title: Create a GitHub wiki page based on the provided markdown file
+ description: Create a GitHub wiki page based on the provided markdown file
+ languages: 'Shell, Dockerfile'
+ href: Decathlon/wiki-page-creator-action
+ tags:
+ - wiki
+ - publishing
+- title: Label your Pull Requests auto-magically (using committed files)
+ description: >-
+ Github action to label your pull requests auto-magically (using committed
+ files)
+ languages: 'TypeScript, Dockerfile, JavaScript'
+ href: Decathlon/pull-request-labeler-action
+ tags:
+ - projects
+ - issues
+ - labels
+- title: Add Label to your Pull Requests based on the author team name
+ description: Github action to label your pull requests based on the author name
+ languages: 'TypeScript, JavaScript'
+ href: JulienKode/team-labeler-action
+ tags:
+ - pull request
+ - labels
diff --git a/data/variables/release_candidate.yml b/data/variables/release_candidate.yml
new file mode 100644
index 0000000000..026d2f7e61
--- /dev/null
+++ b/data/variables/release_candidate.yml
@@ -0,0 +1 @@
+version: ''
diff --git a/includes/all-articles.html b/includes/all-articles.html
new file mode 100644
index 0000000000..5267da011e
--- /dev/null
+++ b/includes/all-articles.html
@@ -0,0 +1,47 @@
+{% assign product = siteTree[currentLanguage][currentVersion].products[currentProduct] %}
+{% assign maxArticles = 10 %}
+
+
+ All {{ product.title }} docs
+
+
+ {% for category in product.categories %}
+ {% unless category[1].standalone %}
+
+ {{ category[1].title }}
+
+ {% if category[1].maptopics %}
+
+ {% for maptopic in category[1].maptopics %}
+ {% unless maptopic[1].hidden %}
+ {% assign numArticles = maptopic[1].articles | obj_size %}
+ -
+ {{ maptopic[1].title }}
+
+ {% if numArticles > maxArticles %}
+
+ {% endif %}
+
+ {% endunless %}
+ {% endfor %}
+
+ {% else %}
+
+ {% assign numArticles = category[1].articles | obj_size %}
+ {% for article in category[1].articles %}
+ - {{ article[1].title }}
+ {% endfor %}
+
+ {% if numArticles > maxArticles %}
+
+ {% endif %}
+ {% endif %}
+
+ {% endunless %}
+ {% endfor %}
+
+
diff --git a/includes/code-example-card.html b/includes/code-example-card.html
new file mode 100644
index 0000000000..a1a1d8c5be
--- /dev/null
+++ b/includes/code-example-card.html
@@ -0,0 +1,20 @@
+
diff --git a/includes/guide-card.html b/includes/guide-card.html
new file mode 100644
index 0000000000..feb6779b45
--- /dev/null
+++ b/includes/guide-card.html
@@ -0,0 +1,37 @@
+{% assign authorsString = guide.page.authors | join: ", @" %}
+
+
diff --git a/includes/header-notification.html b/includes/header-notification.html
index 928ba01d94..49f2198523 100644
--- a/includes/header-notification.html
+++ b/includes/header-notification.html
@@ -1,11 +1,47 @@
+
+
+{% if currentLanguage != 'en' and page.relativePath contains '/site-policy/' %}
+ {% assign translation_notification_type = "true" %}
+ {% assign translation_notification = site.data.reusables.policies.translation %}
+
+
+{% elsif currentLanguage != 'en' && !languages[currentLanguage].wip %}
+ {% assign translation_notification_type = "true" %}
+ {% assign translation_notification = site.data.ui.header.notices.localization_complete %}
+
+
+{% elsif currentLanguage != 'en' && languages[currentLanguage].wip %}
+ {% assign translation_notification_type = "true" %}
+ {% assign translation_notification = site.data.ui.header.notices.localization_in_progress %}
+{% endif %}
+
+
+
+
{% if currentVersion == "github-ae@latest" %}
-
- {% data ui.header.notices.ghae_silent_launch %}
+ {% assign release_notification_type = "true" %}
+ {% assign release_notification = site.data.ui.header.notices.ghae_silent_launch %}
+
+
+{% elsif currentVersion == site.data.variables.release_candidate.version %}
+ {% assign release_notification_type = "true" %}
+ {% assign release_notification = allVersions[currentVersion].versionTitle | append: site.data.ui.header.notices.release_candidate %}
+{% endif %}
+
+
+{% if page.hidden %}
+ {% assign header_notification_type = "early_access" %}
+ {% assign header_notification = site.data.ui.header.notices.early_access %}
+{% endif %}
+
+{% if translation_notification_type %}
+
+ {{ translation_notification }}
{% endif %}
-{% if header_notification %}
-
- {{ header_notification }}
+{% if release_notification_type %}
+
+ {{ release_notification }}
{% endif %}
diff --git a/includes/header.html b/includes/header.html
index 14866b22f7..978031b26b 100644
--- a/includes/header.html
+++ b/includes/header.html
@@ -1,26 +1,4 @@
-
- {% if currentLanguage != 'en' and page.relativePath contains '/site-policy/' %}
- {% assign header_notification_type = "translation_policy" %}
- {% assign header_notification = site.data.reusables.policies.translation %}
-
- {% elsif site.data.ui.header.notices.flags.localization_complete == true %}
- {% assign header_notification_type = "localization_complete" %}
- {% assign header_notification = site.data.ui.header.notices.localization_complete %}
-
- {% elsif site.data.ui.header.notices.flags.localization_in_progress == true %}
- {% assign header_notification_type = "localization_in_progress" %}
- {% assign header_notification = site.data.ui.header.notices.localization_in_progress %}
-
- {% elsif currentLanguage == 'en' and site.data.ui.header.notices.flags.product_in_progress == true %}
- {% assign header_notification_type = "product_in_progress" %}
- {% assign header_notification = site.data.ui.header.notices.product_in_progress %}
-
- {% elsif page.hidden %}
- {% assign header_notification_type = "early_access" %}
- {% assign header_notification = site.data.ui.header.notices.early_access %}
- {% endif %}
-
{% include header-notification %}
diff --git a/javascripts/all-articles.js b/javascripts/all-articles.js
new file mode 100644
index 0000000000..45fddf6605
--- /dev/null
+++ b/javascripts/all-articles.js
@@ -0,0 +1,18 @@
+/**
+ * Handles the client-side events for `includes/all-articles.html`.
+ */
+export default function allArticles () {
+ const buttons = document.querySelectorAll('button.js-all-articles-show-more')
+
+ for (const btn of buttons) {
+ btn.addEventListener('click', evt => {
+ // Show all hidden links
+ const hiddenLinks = evt.currentTarget.parentElement.querySelectorAll('li.d-none')
+ for (const link of hiddenLinks) {
+ link.classList.remove('d-none')
+ }
+ // Remove the button, since we don't need it anymore
+ evt.currentTarget.parentElement.removeChild(evt.currentTarget)
+ })
+ }
+}
diff --git a/javascripts/events.js b/javascripts/events.js
index 4a05744635..1f60567b63 100644
--- a/javascripts/events.js
+++ b/javascripts/events.js
@@ -63,6 +63,7 @@ export function sendEvent ({
// Content information
path: location.pathname,
+ hostname: location.hostname,
referrer: document.referrer,
search: location.search,
href: location.href,
diff --git a/javascripts/experiment.js b/javascripts/experiment.js
index 2a136fdccd..a75fc7d2ce 100644
--- a/javascripts/experiment.js
+++ b/javascripts/experiment.js
@@ -41,4 +41,26 @@ export default function () {
// const xbucket = bucket(testName)
// if (xbucket === TREATMENT) { ... }
// x.addEventListener('click', evt => evt.preventDefault(); await sendSuccess(testName); evt())
+
+ const treatment = document.getElementById('quickstart-treatment')
+ if (!treatment) return
+
+ const testName = 'quickstart-hello'
+ const xbucket = bucket(testName)
+
+ if (xbucket === TREATMENT) {
+ Array.from(
+ document.querySelectorAll('#article-contents > *')
+ ).forEach(el => { el.hidden = true })
+ treatment.hidden = false
+ }
+
+ document.documentElement.addEventListener('copy', () => {
+ sendSuccess(testName)
+ })
+
+ // Hide sidebar navigation during test
+ Array.from(
+ document.querySelectorAll('.article-grid-toc-content > h3, .article-grid-toc-content ul')
+ ).forEach(el => { el.hidden = true })
}
diff --git a/javascripts/filter-code-examples.js b/javascripts/filter-code-examples.js
new file mode 100644
index 0000000000..c6592672e4
--- /dev/null
+++ b/javascripts/filter-code-examples.js
@@ -0,0 +1,92 @@
+function filterCards (cards, value) {
+ const noResults = document.querySelector('.js-code-example-no-results')
+ const matchReg = new RegExp(value, 'i')
+
+ // Track whether or not we had at least one match
+ let hasMatches = false
+
+ for (let index = 0; index < cards.length; index++) {
+ const card = cards[index]
+
+ // Filter was emptied
+ if (!value) {
+ // Make sure we don't show the "No results" blurb
+ hasMatches = true
+
+ // Hide all but the first 6
+ if (index > 5) {
+ card.classList.add('d-none')
+ } else {
+ card.classList.remove('d-none')
+ }
+
+ continue
+ }
+
+ // Check if this card matches
+ const { title, description, tags } = card.dataset
+ const cardMatches = (
+ matchReg.test(title) ||
+ matchReg.test(description) ||
+ matchReg.test(tags)
+ )
+
+ if (cardMatches) {
+ card.classList.remove('d-none')
+ hasMatches = true
+ } else {
+ card.classList.add('d-none')
+ }
+ }
+
+ // If there wasn't at least one match, show the "no results" text
+ if (!hasMatches) {
+ document.querySelector('.js-code-example-filter-value').textContent = value
+ noResults.classList.remove('d-none')
+ } else {
+ noResults.classList.add('d-none')
+ }
+}
+
+export default function filterCodeExamples () {
+ const filter = document.querySelector('.js-code-example-filter')
+ if (!filter) return
+
+ const cards = Array.from(document.querySelectorAll('.js-code-example-card'))
+ const showMoreButton = document.querySelector('.js-code-example-show-more')
+
+ filter.addEventListener('keyup', evt => {
+ const value = evt.currentTarget.value
+
+ // Show or hide the "Show more" button if there is a value
+ if (value) showMoreButton.classList.add('d-none')
+ else showMoreButton.classList.remove('d-none')
+
+ filterCards(cards, value)
+ })
+
+ showMoreButton.addEventListener('click', evt => {
+ // Number of cards that are currently visible
+ const numShown = cards.filter(card => !card.classList.contains('d-none')).length
+ // We want to show 6 more
+ const totalToShow = numShown + 6
+
+ for (let index = numShown; index < cards.length; index++) {
+ const card = cards[index]
+
+ // If the card we're at is less than the total number of cards
+ // we should show, show this one
+ if (index < totalToShow) {
+ card.classList.remove('d-none')
+ } else {
+ // Otherwise, we've shown the ones we intend to so exit the loop
+ break
+ }
+ }
+
+ // They're all shown now, we should hide the button
+ if (totalToShow === cards.length) {
+ evt.currentTarget.style.display = 'none'
+ }
+ })
+}
diff --git a/javascripts/index.js b/javascripts/index.js
index 8d381eff36..803d7a1553 100644
--- a/javascripts/index.js
+++ b/javascripts/index.js
@@ -15,6 +15,8 @@ import experiment from './experiment'
import copyCode from './copy-code'
import { fillCsrf } from './get-csrf'
import initializeEvents from './events'
+import filterCodeExamples from './filter-code-examples'
+import allArticles from './all-articles'
document.addEventListener('DOMContentLoaded', async () => {
displayPlatformSpecificContent()
@@ -32,4 +34,6 @@ document.addEventListener('DOMContentLoaded', async () => {
experiment()
copyCode()
initializeEvents()
+ filterCodeExamples()
+ allArticles()
})
diff --git a/javascripts/wrap-code-terms.js b/javascripts/wrap-code-terms.js
index c28a30320c..95d07b2306 100644
--- a/javascripts/wrap-code-terms.js
+++ b/javascripts/wrap-code-terms.js
@@ -1,7 +1,8 @@
-const wordsLongerThan18Chars = /[\w:/\\]{18,}/g
+const wordsLongerThan18Chars = /[\S]{18,}/g
const camelCaseChars = /([a-z])([A-Z])/g
const underscoresAfter12thChar = /([\w:]{12}[^_]*?)_/g
const slashChars = /([/\\])/g
+const { escape } = require('lodash')
// This module improves table rendering on reference pages by inserting a
// tag in code terms that use camelcase, slashes, or underscores, inspired by
@@ -12,7 +13,7 @@ export default function () {
codeTerms.forEach(node => {
// Do the wrapping on the inner text only, so we don't modify hrefs
- const oldText = node.textContent
+ const oldText = escape(node.textContent)
const newText = oldText.replace(wordsLongerThan18Chars, (str) => {
return str
diff --git a/layouts/product-landing.html b/layouts/product-landing.html
index 32a8af6fe5..505425b5bc 100644
--- a/layouts/product-landing.html
+++ b/layouts/product-landing.html
@@ -28,41 +28,51 @@
-
- {% data ui.toc.guides %}
+
+ {% data ui.toc.guides %}
+ View all {% octicon "arrow-right" height="14" class="v-align-middle" %}
{% for link in featuredLinks.guides %}
- -
- {% include featured-link %}
+
-
+
+
{{ link.title }}→
+ {{ link.intro | truncatewords: 12 }}
+
{% endfor %}
-
- {% data ui.toc.popular_articles %}
+
+ {% data ui.toc.popular_articles %}
{% for link in featuredLinks.popular %}
- -
- {% include featured-link %}
+
-
+
+
{{ link.title }}→
+
{% endfor %}
-
- {% data ui.toc.whats_new %}
+
+ {% data ui.toc.whats_new %}
+ View all {% octicon "arrow-right" height="14" class="v-align-middle" %}
+ {% if featuredLinks.guideCards %}
+
+
+ Guides
+
+
+ {% assign guideCards = featuredLinks.guideCards %}
+ {% render "guide-card" for guideCards as guide %}
+
+
+ Explore guides {% octicon "arrow-right" %}
+
+
+ {% endif %}
+
+
+ {% include all-articles %}
+
+
{% include small-footer %}
diff --git a/lib/excluded-links.js b/lib/excluded-links.js
index 8f9896718b..22f8540240 100644
--- a/lib/excluded-links.js
+++ b/lib/excluded-links.js
@@ -1,28 +1,20 @@
+// Linkinator treats the following as regex.
module.exports = [
- // GitHub search links fail with "429 Too Many Requests"
- 'https://github.com/search?*',
+ // Skip GitHub search links.
+ 'https://github.com/search?.*',
'https://github.com/github/gitignore/search?',
- // LinkedIn links fail due to bug: https://github.com/stevenvachon/broken-link-checker/issues/91
- 'https://www.linkedin.com/*',
-
- // blc returns "BLC_UNKNOWN" on this link, even though cURL returns "302 Found"
- 'https://www.ilo.org/dyn/normlex/en/f?p=NORMLEXPUB:12100:0::NO::P12100_ILO_CODE:P029',
-
- // the codercat link works but blc reports a false 404
- 'https://github.com/Codertocat/hello-world-npm/packages/10696?version=1.0.1',
-
- // this URL started returning 403 to blc and cURL even though it works in a browser; see docs-internal #10124
- 'https://haveibeenpwned.com/',
- 'https://haveibeenpwned.com/*',
-
- // this is a private repo customers are given access to when they purchase Insights; see docs-internal #12037
+ // These links require auth.
+ 'https://github.com/settings/profile',
+ 'https://github.com/github/docs/edit',
'https://github.com/github/insights-releases/releases/latest',
- // developer content uses these for examples; they should not be checked
- 'http://localhost:1234/*',
+ // Developer content uses these for examples; they should not be checked.
+ 'http://localhost:1234',
'localhost:3000',
- // this URL works but blc reports a false 404
+ // Oneoff links that link checkers think are broken but are not.
+ 'https://haveibeenpwned.com/',
+ 'https://www.ilo.org/dyn/normlex/en/f?p=NORMLEXPUB:12100:0::NO::P12100_ILO_CODE:P029',
'http://www.w3.org/wiki/LinkHeader/'
]
diff --git a/lib/frontmatter.js b/lib/frontmatter.js
index e09af0eb2e..d04d3e339a 100644
--- a/lib/frontmatter.js
+++ b/lib/frontmatter.js
@@ -60,6 +60,12 @@ const schema = {
reference: { type: 'string' }
}
},
+ authors: {
+ type: 'array',
+ items: {
+ type: 'string'
+ }
+ },
featuredLinks: {
type: 'object',
additionalProperties: false,
diff --git a/lib/page.js b/lib/page.js
index d08729b004..9927edb32a 100644
--- a/lib/page.js
+++ b/lib/page.js
@@ -19,6 +19,7 @@ const renderContent = require('./render-content')
const frontmatter = require('./frontmatter')
const products = require('./all-products')
const slash = require('slash')
+const statsd = require('./statsd')
class Page {
constructor (opts) {
@@ -84,6 +85,10 @@ class Page {
: true
}
+ // Instrument the `_render` method, so externally we call #render
+ // but it's wrapped in a timer that reports to Datadog
+ this.render = statsd.asyncTimer(this._render.bind(this), 'page.render')
+
return this
}
@@ -116,7 +121,7 @@ class Page {
: this.renderProp('title', context, opts)
}
- async render (context) {
+ async _render (context) {
this.intro = await renderContent(this.rawIntro, context)
this.introPlainText = await renderContent(this.rawIntro, context, { textOnly: true })
this.title = await renderContent(this.rawTitle, context, { textOnly: true, encodeEntities: true })
diff --git a/lib/redirects/get-docs-path-from-developer-path.js b/lib/redirects/get-docs-path-from-developer-path.js
index 6de6323d12..861e04155f 100644
--- a/lib/redirects/get-docs-path-from-developer-path.js
+++ b/lib/redirects/get-docs-path-from-developer-path.js
@@ -18,6 +18,12 @@ module.exports = function getDocsPathFromDeveloperPath (oldDeveloperPath, allRed
newPath = newPath.replace(v3OrgPreReceiveHooks, '/v3/enterprise-admin/org_pre_receive_hooks')
}
+ // oneoff redirect for a dotcom developer path to Enterprise-only path on docs.github.com
+ const oauthAuthorizations = '/v3/oauth_authorizations'
+ if (newPath.endsWith(oauthAuthorizations)) {
+ newPath = newPath.replace(oauthAuthorizations, '/enterprise-server/v3/oauth_authorizations')
+ }
+
// Change /v4/foo/bar to /v4/foo#bar
// Change /v3/foo/bar to /v3/foo#bar
// Then we can look up the hashless path in the redirect object,
diff --git a/lib/render-content.js b/lib/render-content.js
index a9a482811e..ff18773c5d 100644
--- a/lib/render-content.js
+++ b/lib/render-content.js
@@ -18,4 +18,15 @@ for (const tag in tags) {
renderContent.liquid.registerTag(tag, ExtendedMarkdown)
}
+renderContent.liquid.registerFilters({
+ /**
+ * Like the `size` filter, but specifically for
+ * getting the number of keys in an object
+ */
+ obj_size: (input) => {
+ if (!input) return 0
+ return Object.keys(input).length
+ }
+})
+
module.exports = renderContent
diff --git a/lib/schema-event.js b/lib/schema-event.js
index bf7fcb429e..059a9112f1 100644
--- a/lib/schema-event.js
+++ b/lib/schema-event.js
@@ -39,6 +39,11 @@ const context = {
description: 'The browser value of `location.pathname`.',
format: 'uri-reference'
},
+ hostname: {
+ type: 'string',
+ description: 'The browser value of `location.hostname.`',
+ format: 'uri-reference'
+ },
referrer: {
type: 'string',
description: 'The browser value of `document.referrer`.',
diff --git a/lib/statsd.js b/lib/statsd.js
new file mode 100644
index 0000000000..22e61e1208
--- /dev/null
+++ b/lib/statsd.js
@@ -0,0 +1,14 @@
+const StatsD = require('hot-shots')
+
+const mock = Boolean(process.env.NODE_ENV === 'test' || !process.env.DD_API_KEY)
+
+/**
+ * @type {import('hot-shots').StatsD}
+ */
+module.exports = new StatsD({
+ prefix: 'docs.',
+ mock,
+ globalTags: {
+ app: 'docs'
+ }
+})
diff --git a/middleware/csp.js b/middleware/csp.js
index ad381c54dd..b31f04b26c 100644
--- a/middleware/csp.js
+++ b/middleware/csp.js
@@ -21,7 +21,9 @@ module.exports = contentSecurityPolicy({
'github.githubassets.com',
'github-images.s3.amazonaws.com',
'octodex.github.com',
- 'placehold.it'
+ 'placehold.it',
+ '*.githubusercontent.com',
+ 'github.com'
],
objectSrc: [
"'self'"
diff --git a/middleware/featured-links.js b/middleware/featured-links.js
index d8851c2020..ed58a26948 100644
--- a/middleware/featured-links.js
+++ b/middleware/featured-links.js
@@ -43,7 +43,8 @@ async function getLinkData (rawLinks, context) {
links.push({
href,
title: await linkedPage.renderTitle(context, opts),
- intro: await linkedPage.renderProp('intro', context, opts)
+ intro: await linkedPage.renderProp('intro', context, opts),
+ page: linkedPage
})
}
diff --git a/middleware/index.js b/middleware/index.js
index 5d12cfd8b0..f5c98fb599 100644
--- a/middleware/index.js
+++ b/middleware/index.js
@@ -40,7 +40,6 @@ module.exports = function (app) {
app.use(asyncMiddleware(require('./context')))
app.use('/csrf', require('./csrf-route'))
app.use(require('./find-page'))
- app.use(require('./notices'))
app.use(require('./archived-enterprise-versions'))
app.use(require('./archived-enterprise-versions-assets'))
app.use('/assets', express.static('assets'))
diff --git a/middleware/notices.js b/middleware/notices.js
deleted file mode 100644
index 5b8e5a1b7d..0000000000
--- a/middleware/notices.js
+++ /dev/null
@@ -1,38 +0,0 @@
-const { set } = require('lodash')
-const patterns = require('../lib/patterns')
-const languages = require('../lib/languages')
-
-module.exports = (req, res, next) => {
- // Skip asset paths
- if (patterns.assetPaths.test(req.path)) return next()
-
- const language = languages[req.language]
-
- // Set flag that enables `localization_complete` message for no-longer-WIP languages
- set(
- req.context,
- 'site.data.ui.header.notices.flags.localization_complete',
- language.code !== 'en' && !language.wip
- )
-
- // Set flag that enables `localization_in_progress` message for WIP languages
- set(
- req.context,
- 'site.data.ui.header.notices.flags.localization_in_progress',
- language.wip
- )
-
- const currentProduct = req.context.allProducts[req.context.currentProduct]
-
- // if this is the homepage and no product is chosen yet, return early
- if (!currentProduct) return next()
-
- // Set flag that enables `product_in_progress` message for WIP products
- set(
- req.context,
- 'site.data.ui.header.notices.flags.product_in_progress',
- currentProduct.wip
- )
-
- return next()
-}
diff --git a/middleware/render-page.js b/middleware/render-page.js
index e7921135db..904744bfae 100644
--- a/middleware/render-page.js
+++ b/middleware/render-page.js
@@ -4,6 +4,7 @@ const patterns = require('../lib/patterns')
const layouts = require('../lib/layouts')
const getMiniTocItems = require('../lib/get-mini-toc-items')
const Page = require('../lib/page')
+const statsd = require('../lib/statsd')
// We've got lots of memory, let's use it
// We can eventually throw this into redis
@@ -17,6 +18,7 @@ module.exports = async function renderPage (req, res, next) {
if (!process.env.CI && process.env.NODE_ENV !== 'test') {
if (req.method === 'GET' && pageCache[originalUrl]) {
console.log(`Serving from cached version of ${originalUrl}`)
+ statsd.increment('page.sent_from_cache')
return res.send(pageCache[originalUrl])
}
}
diff --git a/package.json b/package.json
index 382979d614..399dc0c4ad 100644
--- a/package.json
+++ b/package.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.6.2",
+ "@github/rest-api-operations": "^3.7.1",
"@octokit/rest": "^16.38.1",
"@primer/css": "^15.1.0",
"@primer/octicons": "^11.0.0",
@@ -42,6 +42,7 @@
"got": "^9.6.0",
"gray-matter": "^4.0.1",
"helmet": "^3.21.2",
+ "hot-shots": "^8.2.0",
"html-entities": "^1.2.1",
"html-truncate": "^1.2.2",
"imurmurhash": "^0.1.4",
@@ -49,6 +50,7 @@
"is-url": "^1.2.4",
"js-cookie": "^2.2.1",
"js-yaml": "^3.14.0",
+ "linkinator": "^2.2.2",
"liquid": "^5.1.0",
"lodash": "^4.17.19",
"mini-css-extract-plugin": "^0.9.0",
@@ -78,7 +80,6 @@
"await-sleep": "0.0.1",
"aws-sdk": "^2.610.0",
"babel-eslint": "^10.1.0",
- "broken-link-checker": "^0.7.8",
"chalk": "^4.0.0",
"commander": "^6.2.0",
"count-array-values": "^1.2.1",
diff --git a/script/README.md b/script/README.md
index a9d3e7c624..e11c0b615f 100644
--- a/script/README.md
+++ b/script/README.md
@@ -368,6 +368,13 @@ An automated test checks for discrepancies between filenames and [autogenerated
---
+### [`release-banner.js`](release-banner.js)
+
+This script creates or removes a release candidate banner for a specified version.
+
+
+---
+
### [`remove-deprecated-enterprise-version-markup.js`](remove-deprecated-enterprise-version-markup.js)
Run this script after an Enterprise deprecation to remove Liquid statements and frontmatter that contain the deprecated Enterprise version. See the Enterprise deprecation issue template for instructions.
@@ -487,4 +494,3 @@ Run this script to: [upload individual files to S3](https://github.com/github/pr
---
-
diff --git a/script/check-english-links.js b/script/check-english-links.js
new file mode 100755
index 0000000000..1fc5743c57
--- /dev/null
+++ b/script/check-english-links.js
@@ -0,0 +1,95 @@
+#!/usr/bin/env node
+
+const path = require('path')
+const fs = require('fs')
+const linkinator = require('linkinator')
+const dedent = require('dedent')
+const program = require('commander')
+const { escapeRegExp } = require('lodash')
+const checker = new linkinator.LinkChecker()
+const rimraf = require('rimraf').sync
+const root = 'https://docs.github.com'
+const englishRoot = `${root}/en`
+const { deprecated } = require('../lib/enterprise-server-releases')
+
+// [start-readme]
+//
+// This script runs once per day via a scheduled GitHub Action to check all links in
+// English content, not including deprecated Enterprise Server content. It opens an issue
+// if it finds broken links. To exclude a link, add it to `lib/excluded-links.js`.
+//
+// [end-readme]
+
+program
+ .description('Check all links in the English docs.')
+ .option('-d, --dry-run', 'Turn off recursion to get a fast minimal report (useful for previewing output).')
+ .parse(process.argv)
+
+// Skip excluded links defined in separate file.
+const excludedLinks = require('../lib/excluded-links')
+ .map(link => escapeRegExp(link))
+
+// Skip non-English content.
+const languagesToSkip = Object.keys(require('../lib/languages'))
+ .filter(code => code !== 'en')
+ .map(code => `${root}/${code}`)
+
+// Skip deprecated Enterprise content.
+// Capture the old format https://docs.github.com/enterprise/2.1/
+// and the new format https://docs.github.com/enterprise-server@2.19/.
+const enterpriseReleasesToSkip = new RegExp(`${root}.+?[/@](${deprecated.join('|')})/`)
+
+const config = {
+ path: englishRoot,
+ concurrency: 300,
+ // If this is a dry run, turn off recursion.
+ recurse: !program.dryRun,
+ silent: true,
+ // The values in this array are treated as regexes.
+ linksToSkip: [
+ enterpriseReleasesToSkip,
+ ...languagesToSkip,
+ ...excludedLinks
+ ]
+}
+
+main()
+
+async function main () {
+ const startTime = new Date()
+
+ // Clear and recreate a directory for logs.
+ const logFile = path.join(__dirname, '../.linkinator/full.log')
+ rimraf(path.dirname(logFile))
+ fs.mkdirSync(path.dirname(logFile), { recursive: true })
+
+ // Update CLI output and append to logfile after each checked link.
+ checker.on('link', result => {
+ fs.appendFileSync(logFile, JSON.stringify(result) + '\n')
+ })
+
+ // Start the scan; events will be logged as they occur.
+ const result = await checker.check(config)
+
+ // Scan is complete! Display the results.
+ const endTime = new Date()
+ const skippedLinks = result.links.filter(x => x.state === 'SKIPPED')
+ const brokenLinks = result.links.filter(x => x.state === 'BROKEN')
+
+ console.log(dedent`
+ ${brokenLinks.length} broken links found on docs.github.com
+
+ Link scan completed in ${endTime - startTime}ms
+ Total links: ${result.links.length}
+ Skipped links: ${skippedLinks.length}
+ Broken links: ${brokenLinks.length}
+ For more details see ${path.relative(process.cwd(), logFile)}
+ `)
+
+ if (brokenLinks.length) {
+ console.log('\n\n' + JSON.stringify(brokenLinks, null, 2))
+ process.exit(1)
+ }
+
+ process.exit(0)
+}
diff --git a/script/check-external-links b/script/check-external-links
deleted file mode 100755
index e13ac75f0b..0000000000
--- a/script/check-external-links
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env bash
-
-# [start-readme]
-# The script is run once per day via a scheduled GitHub Action to check all links in the site. It automatically opens an issue if it finds broken links.
-# To exclude a URL from the link check, add it to `lib/excluded-links.js`.
-#
-# For checking internal links, see `script/check-internal-links`.
-# [end-readme]
-
-internal=""
-while getopts "h?i" opt; do
- case "${opt}" in
- h|\?) echo "Usage:"
- echo " script/check-external-links [OPTIONS] [two-letter language code]"
- echo ""
- echo " script/check-external-links -i Check internal links. Without this flag, check all links."
- echo " script/check-external-links -h Display this help message."
- exit 0
- ;;
- i) internal=" --internalOnly"
- ;;
- esac
-done
-shift $((OPTIND -1))
-
-if [ -z "${1}" ]
-then
- echo "error: must provide two-letter language code"
- exit 1
-fi
-
-languageCode=${1}
-
-# Pass options to script to construct blc command
-blcCommand="$(./script/get-blc-command.js ${internal} --language ${languageCode})"
-
-# Exit if script returned an error
-if test $? -eq 1
-then
- exit 1
-fi
-
-# Determine logfile name based on options
-logfile=""
-if [ -z "${internal}" ]
-then
- logfile="blc_output.log"
-else
- logfile="blc_output_internal.log"
-fi
-
-# Kill any server running in the background, then start the server
-killall node >/dev/null 2>&1
-node server.js >/dev/null &
-sleep 5
-
-host="http://localhost:4000"
-
-# Check whether localhost is accessible
-hostStatus=$(curl -I --silent "${host}" | head -1)
-isHostOK=$(echo "${hostStatus}" | grep "[2|3][0-9][0-9]")
-if [ -z "${isHostOK}" ]
-then
- echo "Can't connect to ${host}!"
- echo ${hostStatus}
- echo ${isHostOK}
- exit 1
-fi
-
-# Execute blc and save output
-${blcCommand[@]} > ${logfile}
-
-# We're done with the server now, so end the process
-# killall node will also terminate this script, so find and kill the specific pid
-pid=$(ps aux | grep "node server.js" | grep -v "grep" | awk '{ print $2 }'); kill -INT $pid >/dev/null 2>&1
-
-# Recheck "403 Forbidden" results due to a bug
-# https://github.com/stevenvachon/broken-link-checker/issues/58
-# Also recheck "429" GitHub results
-urlsToRecheck=$(egrep "HTTP_4(03|29)" ${logfile} | grep -o "http.* ")
-
-if [ ! -z "${urlsToRecheck}" ]
-then
- for url in ${urlsToRecheck}
- do
- # Curl each URL and grep for 4xx or 5xx in status code response
- status=$(curl -I --silent "${url}" | head -1 | grep "[4|5][0-9][0-9]")
- if [ -z "${status}" ]
- then
- # If no 4/5xx found, the link is NOT really broken, so remove it from the list
- # This command needs to work in all implementations of sed (Mac/GNU/etc)
- sed -i'.bak' -e "s|^.*$url.*$||" ${logfile}
- # Remove backup file
- find . -name "${logfile}.bak" | xargs rm
- fi
- done
-fi
-
-# Count number of broken links in output
-# Ignore "308 Permanent Redirect" results, which are not actually broken
-numberOfBrokenLinks=$(grep "BROKEN" ${logfile} | grep -vc HTTP_308)
-brokenLinks=$(grep "BROKEN" ${logfile} | grep -v HTTP_308)
-
-# If broken links are found, exit with status 1 so the check run fails
-if [ ${numberOfBrokenLinks} -gt 0 ]
-then
- # Print "links" or "link" in message depending on the number found
- if [ ${numberOfBrokenLinks} -gt 1 ]
- then
- linkOrLinks="links"
- else
- linkOrLinks="link"
- fi
- echo -e "\n${numberOfBrokenLinks} broken ${linkOrLinks} found on help.github.com\n"
- echo -e "Note: links that start with 'http://localhost:4000/' are internal links.\n"
-
- # List broken links
- echo "${brokenLinks}"
-
- # Update final number of broken links
- echo -e "\n$(tail -2 ${logfile})" | sed "s|. [0-9]* broken.|. ${numberOfBrokenLinks} broken.|"
-
- # Exit without failure when checking all links so script/open-broken-links-issue can run
- if [ -z "${internal}" ]
- then
- exit 0
- else
- exit 1
- fi
-else
- echo "All links are good!"
- echo -e "\n$(tail -2 ${logfile})"
- exit 0
-fi
diff --git a/script/check-internal-links b/script/check-internal-links
deleted file mode 100755
index 743b968ea9..0000000000
--- a/script/check-internal-links
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-# [start-readme]
-# This script wraps tests/links-and-images.js and provides an option to output results to a file.
-#
-# For more information, see `tests/README.md#broken-link-test`.
-# [end-readme]
-
-# check if npx is installed
-command -v npx >/dev/null 2>&1 || { echo -e "npx is not installed. Run:\n\n\$ npm install -g npx" >&2; exit 1; }
-
-while getopts "h?f:" opt; do
- case "${opt}" in
- h|\?) echo "Usage:"
- echo " script/check-internal-links [OPTIONS]"
- echo ""
- echo " script/check-internal-links -f [FILENAME] Output the results of tests/links-and-images to a file."
- echo " script/check-internal-links -h Display this help message."
- exit 0
- ;;
- f) FILENAME="${OPTARG}"
- ;;
- esac
-done
-shift $((OPTIND -1))
-
-if [ "${FILENAME}" = "" ]
-then
- npx jest links-and-images
-else
- echo -e "Running tests/links-and-images.js\n"
-
- npx jest links-and-images --no-color > ${FILENAME} 2>&1
-
- echo "Done! Results in ${FILENAME}."
-fi
diff --git a/script/content-migrations/README.md b/script/content-migrations/README.md
new file mode 100644
index 0000000000..b27ce9d774
--- /dev/null
+++ b/script/content-migrations/README.md
@@ -0,0 +1,7 @@
+# Content migration scripts
+
+This directory stores scripts that modify content and/or data files. Because
+writers are updating content all the time, scripts in here require more
+cross-team coordination and planning before they are run. Make sure to consider
+whether a script added here also needs to be run on translation files or if we
+can wait for the changes to come in organically via Crowdin.
diff --git a/script/content-migrations/update-developer-site-links.js b/script/content-migrations/update-developer-site-links.js
new file mode 100755
index 0000000000..06adcbb990
--- /dev/null
+++ b/script/content-migrations/update-developer-site-links.js
@@ -0,0 +1,73 @@
+#!/usr/bin/env node
+
+const fs = require('fs')
+const path = require('path')
+const walk = require('walk-sync')
+const frontmatter = require('@github-docs/frontmatter')
+const loadPages = require('../../lib/pages')
+const patterns = require('../../lib/patterns')
+const loadRedirects = require('../../lib/redirects/precompile')
+const allVersions = Object.keys(require('../../lib/all-versions'))
+
+// get all content and data files
+const files = ['content', 'data'].map(dir => {
+ return walk(path.join(process.cwd(), dir), { includeBasePath: true, directories: false })
+ .filter(file => file.endsWith('.md') && !file.endsWith('README.md'))
+}).flat()
+
+// match [foo](/v3) and [bar](/v4) Markdown links
+const linkRegex = new RegExp('\\(/v[34].*?\\)', 'g')
+
+main()
+
+async function main () {
+ // we need to load the pages so we can get the redirects
+ const englishPages = (await loadPages()).filter(p => p.languageCode === 'en')
+ const redirects = await loadRedirects(englishPages)
+
+ for (const file of files) {
+ const { data, content } = frontmatter(fs.readFileSync(file, 'utf8'))
+
+ const links = content.match(linkRegex)
+ if (!links) continue
+
+ // remove parentheses: (/v3) -> /v3
+ // also remove trailing slash before closing parens if there is one
+ const devLinks = links
+ .map(link => link.replace('(', '').replace(/\/?\)/, ''))
+
+ let newContent = content
+
+ for (const devLink of devLinks) {
+ const [link, fragment] = devLink.split(/\/?#/)
+
+ let redirect = redirects[link]
+
+ if (!redirect) {
+ console.log(`no redirect found for ${devLink} in ${file}`)
+ continue
+ }
+
+ // do some cleanup
+ redirect = redirect
+ // remove language code segment
+ .replace(patterns.getLanguageCode, '')
+ // remove version segment
+ .replace(new RegExp(`/(${allVersions.join('|')})`), '')
+
+ // re-add the fragment
+ const newLink = fragment
+ ? redirect + '#' + fragment
+ : redirect
+
+ // first remove any trailing slashes from the old link,
+ // then replace with the new link
+ newContent = newContent
+ .replace(`${devLink}/`, devLink)
+ .replace(devLink, newLink)
+ }
+
+ fs.writeFileSync(file, frontmatter.stringify(newContent, data, { lineWidth: 10000 }))
+ }
+ console.log('Done!')
+}
diff --git a/script/get-blc-command.js b/script/get-blc-command.js
deleted file mode 100755
index 718d99d82c..0000000000
--- a/script/get-blc-command.js
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env node
-
-const supportedLanguages = Object.values(require('../lib/languages')).map(language => language.code)
-const excludedLinks = require('../lib/excluded-links')
-const program = require('commander')
-
-// [start-readme]
-//
-// This script parses options for `script/check-external-links`.
-//
-// [end-readme]
-
-program
- .description('Construct a blc command to run in script/check-external-links')
- .option('-L, --language ', 'required language code')
- .option('-i, --internalOnly', 'check internal links only')
- .parse(process.argv)
-
-const languageCode = program.language
-
-if (!languageCode || !supportedLanguages.includes(languageCode)) {
- console.error(`error: you must provide a currently supported language code: ${supportedLanguages.join(', ')}\n`)
- process.exit(1)
-}
-
-// options for blc: https://github.com/stevenvachon/broken-link-checker#command-line-usage
-const blcPackage = './node_modules/broken-link-checker/bin/blc'
-const host = 'http://localhost:4000'
-const hostWithLanguage = `${host}/${languageCode}`
-const maintainOrder = '--ordered' // maintain order of links in html
-const recursive = '--recursive'
-const requestMethod = '--get'
-const filterLevel = '--filter-level 3' // level 3 checks the most assets
-const excludeExternal = program.internalOnly ? ' --exclude-external' : ''
-
-let command = `${blcPackage} ${hostWithLanguage} ${maintainOrder} ${recursive} ${requestMethod} ${filterLevel}${excludeExternal}`
-
-let excludeStrings = ''
-
-// blc can only except one string per --exclude option
-// so we need to construct multiple strings from exclusions array
-excludedLinks.forEach(excludedLink => {
- excludeStrings = `${excludeStrings} --exclude ${excludedLink}`
-})
-
-// prevent link checker from crawling other languages
-// for example, if we're checking links on the English site
-// we need to exclude links on Japanese, Chinese, Spanish, etc.
-supportedLanguages.forEach(supportedLanguage => {
- if (supportedLanguage === languageCode) return
- const internalLink = `${host}/${supportedLanguage}/*`
- const externalLink = `https://help.github.com/${supportedLanguage}/*`
- excludeStrings = `${excludeStrings} --exclude ${internalLink}`
- excludeStrings = `${excludeStrings} --exclude ${externalLink}`
-})
-
-// get final command
-command = command + excludeStrings
-
-// output final command
-console.log(command)
diff --git a/script/release-banner.js b/script/release-banner.js
new file mode 100755
index 0000000000..b5a1bd414a
--- /dev/null
+++ b/script/release-banner.js
@@ -0,0 +1,60 @@
+#!/usr/bin/env node
+
+const fs = require('fs')
+const path = require('path')
+const program = require('commander')
+const yaml = require('js-yaml')
+const allVersions = require('../lib/all-versions')
+const releaseCandidateFile = 'data/variables/release_candidate.yml'
+const releaseCandidateYaml = path.join(process.cwd(), releaseCandidateFile)
+
+const allowedActions = ['create', 'remove']
+
+// [start-readme]
+//
+// This script creates or removes a release candidate banner for a specified version.
+//
+// [end-readme]
+
+program
+ .description('Create or remove a release candidate banner for the provided docs version.')
+ // The following two settings let us use `version` as a flag without clashing with reserved opts
+ .storeOptionsAsProperties(false)
+ .passCommandToAction(false)
+ .option(`-a, --action <${allowedActions.join(' or ')}>`, 'Create or remove the banner.')
+ .option('-v, --version ', 'The version the banner applies to. Must be in format.')
+ .parse(process.argv)
+
+const options = program.opts()
+
+if (!allowedActions.includes(options.action)) {
+ console.log(`Error! You must specify --action <${allowedActions.join(' or ')}>.`)
+ process.exit(1)
+}
+
+if (!(Object.keys(allVersions).includes(options.version))) {
+ console.log('Error! You must specify --version with the full name of a supported version, e.g., enterprise-server@2.22.')
+ process.exit(1)
+}
+
+// Load the release candidate variable
+const releaseCandidateData = yaml.safeLoad(fs.readFileSync(releaseCandidateYaml, 'utf8'))
+
+// Create or remove the variable
+if (options.action === 'create') {
+ releaseCandidateData.version = options.version
+}
+
+if (options.action === 'remove') {
+ releaseCandidateData.version = ''
+}
+
+// Update the file
+fs.writeFileSync(releaseCandidateYaml, yaml.safeDump(releaseCandidateData))
+
+// Display next steps
+console.log(`\nDone! Commit the update to ${releaseCandidateFile}. This ${options.action}s the banner for ${options.version}.
+
+- To change the banner text, you can edit header.notices.release_candidate in data/ui.yml.
+- To change the banner styling, you can edit includes/header-notification.html.
+`)
diff --git a/stylesheets/index.scss b/stylesheets/index.scss
index f3bdf20018..b2882d2447 100644
--- a/stylesheets/index.scss
+++ b/stylesheets/index.scss
@@ -27,6 +27,7 @@
@import "@primer/css/tooltips/index.scss";
@import "@primer/css/truncate/index.scss";
@import "@primer/css/utilities/index.scss";
+@import "@primer/css/avatars/index.scss";
// END CUSTOM CORE IMPORT
@import "@primer/css/markdown/index.scss";
@@ -52,3 +53,5 @@ $marketing-font-path: "/dist/fonts/";
@import "tables.scss";
@import "opacity.scss";
@import "print.scss";
+@import "shadows.scss";
+@import "product-landing.scss";
diff --git a/stylesheets/product-landing.scss b/stylesheets/product-landing.scss
new file mode 100644
index 0000000000..bc4d195fbd
--- /dev/null
+++ b/stylesheets/product-landing.scss
@@ -0,0 +1,3 @@
+.bg-guides-gradient {
+ background: linear-gradient(0deg, rgba(33, 136, 255, 0.11) 0%, rgba(255, 255, 255, 0) 100%);
+}
diff --git a/stylesheets/shadows.scss b/stylesheets/shadows.scss
new file mode 100644
index 0000000000..8dc29c1081
--- /dev/null
+++ b/stylesheets/shadows.scss
@@ -0,0 +1,33 @@
+.hover-shadow {
+ & {
+ transition: box-shadow 0.3s ease-in-out;
+
+ &:hover {
+ box-shadow: $box-shadow !important;
+ }
+ }
+
+ &-medium {
+ transition: box-shadow 0.3s ease-in-out;
+
+ &:hover {
+ box-shadow: $box-shadow-medium !important;
+ }
+ }
+
+ &-large {
+ transition: box-shadow 0.3s ease-in-out;
+
+ &:hover {
+ box-shadow: $box-shadow-large !important;
+ }
+ }
+
+ &-extra-large {
+ transition: box-shadow 0.3s ease-in-out;
+
+ &:hover {
+ box-shadow: $box-shadow-extra-large !important;
+ }
+ }
+}
diff --git a/stylesheets/tables.scss b/stylesheets/tables.scss
index cc20e3115d..eb5cba8cc6 100644
--- a/stylesheets/tables.scss
+++ b/stylesheets/tables.scss
@@ -2,6 +2,7 @@
border-collapse: collapse;
position: relative;
font-size: 90%;
+ width: 100%;
/* We want to keep table-layout: auto so that column widths dynamically adjust;
otherwise entries get needlessly smushed into narrow columns. As a workaround,
we use javascripts/wrap-code-terms.js to prevent some reference table content
@@ -12,7 +13,6 @@
font-size: 100%;
background: none;
padding: 0;
- font-weight: bold;
}
thead tr {
@@ -57,7 +57,7 @@
td.has-nested-table {
width: 100%;
- table.slim {
+ table {
table-layout: auto;
}
}
diff --git a/tests/content/lint-files.js b/tests/content/lint-files.js
index 9bc28df59c..6b8073f72c 100644
--- a/tests/content/lint-files.js
+++ b/tests/content/lint-files.js
@@ -343,6 +343,7 @@ describe('lint-files', () => {
const matches = []
for (const [key, content] of Object.entries(dictionary)) {
+ if (typeof content !== 'string') continue
const valMatches = (content.match(relativeArticleLinkRegex) || [])
if (valMatches.length > 0) {
matches.push(...valMatches.map((match) => `Key "${key}": ${match}`))
@@ -357,6 +358,7 @@ describe('lint-files', () => {
const matches = []
for (const [key, content] of Object.entries(dictionary)) {
+ if (typeof content !== 'string') continue
const valMatches = (content.match(languageLinkRegex) || [])
if (valMatches.length > 0) {
matches.push(...valMatches.map((match) => `Key "${key}": ${match}`))
@@ -371,6 +373,7 @@ describe('lint-files', () => {
const matches = []
for (const [key, content] of Object.entries(dictionary)) {
+ if (typeof content !== 'string') continue
const valMatches = (content.match(versionLinkRegEx) || [])
if (valMatches.length > 0) {
matches.push(...valMatches.map((match) => `Key "${key}": ${match}`))
@@ -385,6 +388,7 @@ describe('lint-files', () => {
const matches = []
for (const [key, content] of Object.entries(dictionary)) {
+ if (typeof content !== 'string') continue
const valMatches = (content.match(domainLinkRegex) || [])
if (valMatches.length > 0) {
matches.push(...valMatches.map((match) => `Key "${key}": ${match}`))
@@ -449,6 +453,7 @@ describe('lint-files', () => {
const matches = []
for (const [key, content] of Object.entries(dictionary)) {
+ if (typeof content !== 'string') continue
const valMatches = (content.match(oldVariableRegex) || [])
if (valMatches.length > 0) {
matches.push(...valMatches.map((match) => {
@@ -467,6 +472,7 @@ describe('lint-files', () => {
const matches = []
for (const [key, content] of Object.entries(dictionary)) {
+ if (typeof content !== 'string') continue
const valMatches = (content.match(oldOcticonRegex) || [])
if (valMatches.length > 0) {
matches.push(...valMatches.map((match) => `Key "${key}": ${match}`))
@@ -481,6 +487,7 @@ describe('lint-files', () => {
const matches = []
for (const [key, content] of Object.entries(dictionary)) {
+ if (typeof content !== 'string') continue
const valMatches = (content.match(oldExtendedMarkdownRegex) || [])
if (valMatches.length > 0) {
matches.push(...valMatches.map((match) => `Key "${key}": ${match}`))
diff --git a/tests/content/liquid-line-breaks.js b/tests/content/liquid-line-breaks.js
index aed5f1f8f0..2a84492059 100644
--- a/tests/content/liquid-line-breaks.js
+++ b/tests/content/liquid-line-breaks.js
@@ -81,6 +81,7 @@ describe('Liquid references', () => {
const matches = []
for (const [key, content] of Object.entries(dictionary)) {
+ if (typeof content !== 'string') continue
const valMatches = (content.match(liquidRefsWithLinkBreaksRegex) || [])
if (valMatches.length > 0) {
matches.push(...valMatches.map((match) => `Key "${key}": ${match}`))
diff --git a/tests/fixtures/rest-redirects.json b/tests/fixtures/rest-redirects.json
index 771cd3f4d4..01470158f7 100644
--- a/tests/fixtures/rest-redirects.json
+++ b/tests/fixtures/rest-redirects.json
@@ -451,7 +451,7 @@
"/v3/migrations/orgs": "/en/free-pro-team@latest/rest/reference/migrations#orgs",
"/v3/migrations/source_imports": "/en/free-pro-team@latest/rest/reference/migrations#source-imports",
"/v3/migrations/users": "/en/free-pro-team@latest/rest/reference/migrations#users",
- "/v3/oauth_authorizations": "/en/free-pro-team@latest/rest/reference/oauth-authorizations",
+ "/v3/oauth_authorizations": "/en/enterprise-server/rest/reference/oauth-authorizations",
"/v3/orgs/blocking": "/en/free-pro-team@latest/rest/reference/orgs#blocking",
"/v3/orgs/hooks": "/en/free-pro-team@latest/rest/reference/orgs#hooks",
"/v3/orgs": "/en/free-pro-team@latest/rest/reference/orgs",
diff --git a/tests/rendering/events.js b/tests/rendering/events.js
index e7912ee80c..547f93a2f5 100644
--- a/tests/rendering/events.js
+++ b/tests/rendering/events.js
@@ -48,6 +48,7 @@ describe('POST /events', () => {
// Content information
path: '/github/docs/issues',
+ hostname: 'github.com',
referrer: 'https://github.com/github/docs',
search: '?q=is%3Aissue+is%3Aopen+example+',
href: 'https://github.com/github/docs/issues?q=is%3Aissue+is%3Aopen+example+',
@@ -138,6 +139,16 @@ describe('POST /events', () => {
}, 400)
)
+ it('should hostname be uri-reference', () =>
+ checkEvent({
+ ...pageExample,
+ context: {
+ ...pageExample.context,
+ hostname: ' '
+ }
+ }, 400)
+ )
+
it('should referrer be uri-reference', () =>
checkEvent({
...pageExample,
diff --git a/tests/rendering/header.js b/tests/rendering/header.js
index 0063274091..4965bc037d 100644
--- a/tests/rendering/header.js
+++ b/tests/rendering/header.js
@@ -42,15 +42,13 @@ describe('header', () => {
describe('notices', () => {
test('displays a "localization in progress" notice for WIP languages', async () => {
const $ = await getDOM('/de')
- expect($('.header-notifications.localization_in_progress').length).toBe(1)
- expect($('.localization_complete').length).toBe(0)
+ expect($('.header-notifications.translation_notice').length).toBe(1)
expect($('.header-notifications a[href="/en"]').length).toBe(1)
})
test('displays "complete" notice for non-WIP non-English languages', async () => {
const $ = await getDOM('/ja')
- expect($('.header-notifications.localization_complete').length).toBe(1)
- expect($('.localization_in_progress').length).toBe(0)
+ expect($('.header-notifications.translation_notice').length).toBe(1)
expect($('.header-notifications a[href="/en"]').length).toBe(1)
expect($('.header-notifications a[href*="github.com/contact"]').length).toBe(1)
})
@@ -62,7 +60,7 @@ describe('header', () => {
test('displays translation disclaimer notice on localized site-policy pages', async () => {
const $ = await getDOM('/ja/github/site-policy/github-logo-policy')
- expect($('.header-notifications.translation_policy a[href="https://github.com/github/site-policy/issues"]').length).toBe(1)
+ expect($('.header-notifications.translation_notice a[href="https://github.com/github/site-policy/issues"]').length).toBe(1)
})
})
diff --git a/translations/de-DE/content/actions/guides/building-and-testing-powershell.md b/translations/de-DE/content/actions/guides/building-and-testing-powershell.md
new file mode 100644
index 0000000000..131a590d61
--- /dev/null
+++ b/translations/de-DE/content/actions/guides/building-and-testing-powershell.md
@@ -0,0 +1,236 @@
+---
+title: Building and testing PowerShell
+intro: You can create a continuous integration (CI) workflow to build and test your PowerShell project.
+product: '{% data reusables.gated-features.actions %}'
+versions:
+ free-pro-team: '*'
+ enterprise-server: '>=2.22'
+---
+
+{% data reusables.actions.enterprise-beta %}
+{% data reusables.actions.enterprise-github-hosted-runners %}
+
+### Einführung
+
+This guide shows you how to use PowerShell for CI. It describes how to use Pester, install dependencies, test your module, and publish to the PowerShell Gallery.
+
+{% data variables.product.prodname_dotcom %}-hosted runners have a tools cache with pre-installed software, which includes PowerShell and Pester. For a full list of up-to-date software and the pre-installed versions of PowerShell and Pester, see "[Specifications for {% data variables.product.prodname_dotcom %}-hosted runners](/actions/reference/specifications-for-github-hosted-runners/#supported-software)".
+
+### Vorrausetzungen
+
+Du solltest mit YAML und der Syntax für {% data variables.product.prodname_actions %} vertraut sein. For more information, see "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)."
+
+We recommend that you have a basic understanding of PowerShell and Pester. Weitere Informationen findest Du unter:
+- [Getting started with PowerShell](https://docs.microsoft.com/powershell/scripting/learn/ps101/01-getting-started)
+- [Pester](https://pester.dev)
+
+{% data reusables.actions.enterprise-setup-prereq %}
+
+### Adding a workflow for Pester
+
+To automate your testing with PowerShell and Pester, you can add a workflow that runs every time a change is pushed to your repository. In the following example, `Test-Path` is used to check that a file called `resultsfile.log` is present.
+
+This example workflow file must be added to your repository's `.github/workflows/` directory:
+
+{% raw %}
+```yaml
+name: Test PowerShell on Ubuntu
+on: push
+
+jobs:
+ pester-test:
+ name: Pester test
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check out repository code
+ uses: actions/checkout@v2
+ - name: Perform a Pester test from the command-line
+ shell: pwsh
+ run: Test-Path resultsfile.log | Should -Be $true
+ - name: Perform a Pester test from the Tests.ps1 file
+ shell: pwsh
+ run: |
+ Invoke-Pester Unit.Tests.ps1 -Passthru
+```
+{% endraw %}
+
+* `shell: pwsh` - Configures the job to use PowerShell when running the `run` commands.
+* `run: Test-Path resultsfile.log` - Check whether a file called `resultsfile.log` is present in the repository's root directory.
+* `Should -Be $true` - Uses Pester to define an expected result. If the result is unexpected, then {% data variables.product.prodname_actions %} flags this as a failed test. Ein Beispiel:
+
+ 
+
+* `Invoke-Pester Unit.Tests.ps1 -Passthru` - Uses Pester to execute tests defined in a file called `Unit.Tests.ps1`. For example, to perform the same test described above, the `Unit.Tests.ps1` will contain the following:
+ ```
+ Describe "Check results file is present" {
+ It "Check results file is present" {
+ Test-Path resultsfile.log | Should -Be $true
+ }
+ }
+ ```
+
+### PowerShell module locations
+
+The table below describes the locations for various PowerShell modules in each {% data variables.product.prodname_dotcom %}-hosted runner.
+
+| | Ubuntu | macOS | Windows |
+| ----------------------------- | ------------------------------------------------ | ------------------------------------------------- | ------------------------------------------------------------ |
+| **PowerShell system modules** | `/opt/microsoft/powershell/7/Modules/*` | `/usr/local/microsoft/powershell/7/Modules/*` | `C:\program files\powershell\7\Modules\*` |
+| **PowerShell add-on modules** | `/usr/local/share/powershell/Modules/*` | `/usr/local/share/powershell/Modules/*` | `C:\Modules\*` |
+| **User-installed modules** | `/home/runner/.local/share/powershell/Modules/*` | `/Users/runner/.local/share/powershell/Modules/*` | `C:\Users\runneradmin\Documents\PowerShell\Modules\*` |
+
+### Abhängigkeiten installieren
+
+{% data variables.product.prodname_dotcom %}-hosted runners have PowerShell 7 and Pester installed. You can use `Install-Module` to install additional dependencies from the PowerShell Gallery before building and testing your code.
+
+{% note %}
+
+**Note:** The pre-installed packages (such as Pester) used by {% data variables.product.prodname_dotcom %}-hosted runners are regularly updated, and can introduce significant changes. As a result, it is recommended that you always specify the required package versions by using `Install-Module` with `-MaximumVersion`.
+
+{% endnote %}
+
+Du kannst Abhängigkeiten auch im Cache zwischenspeichern, um Deinen Workflow zu beschleunigen. Weitere Informationen findest Du unter „[Abhängigkeiten im Cache zwischenspeichern, um Deinen Workflow zu beschleunigen](/actions/automating-your-workflow-with-github-actions/caching-dependencies-to-speed-up-workflows)“.
+
+For example, the following job installs the `SqlServer` and `PSScriptAnalyzer` modules:
+
+{% raw %}
+```yaml
+jobs:
+ install-dependencies:
+ name: Install dependencies
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Install from PSGallery
+ shell: pwsh
+ run: |
+ Set-PSRepository PSGallery -InstallationPolicy Trusted
+ Install-Module SqlServer, PSScriptAnalyzer
+```
+{% endraw %}
+
+{% note %}
+
+**Note:** By default, no repositories are trusted by PowerShell. When installing modules from the PowerShell Gallery, you must explicitly set the installation policy for `PSGallery` to `Trusted`.
+
+{% endnote %}
+
+#### Abhängigkeiten „cachen“ (zwischenspeichern)
+
+You can cache PowerShell dependencies using a unique key, which allows you to restore the dependencies for future workflows with the [`cache`](https://github.com/marketplace/actions/cache) action. For more information, see "[Caching dependencies to speed up workflows](/actions/automating-your-workflow-with-github-actions/caching-dependencies-to-speed-up-workflows)."
+
+PowerShell caches its dependencies in different locations, depending on the runner's operating system. For example, the `path` location used in the following Ubuntu example will be different for a Windows operating system.
+
+{% raw %}
+```yaml
+steps:
+ - uses: actions/checkout@v2
+ - name: Setup PowerShell module cache
+ id: cacher
+ uses: actions/cache@v2
+ with:
+ path: "~/.local/share/powershell/Modules"
+ key: ${{ runner.os }}-SqlServer-PSScriptAnalyzer
+ - name: Install required PowerShell modules
+ if: steps.cacher.outputs.cache-hit != 'true'
+ shell: pwsh
+ run: |
+ Set-PSRepository PSGallery -InstallationPolicy Trusted
+ Install-Module SqlServer, PSScriptAnalyzer -ErrorAction Stop
+```
+{% endraw %}
+
+### Deinen Code testen
+
+Du kannst die gleichen Befehle verwenden, die Du auch lokal verwendest, um Deinen Code zu erstellen und zu testen.
+
+#### Using PSScriptAnalyzer to lint code
+
+The following example installs `PSScriptAnalyzer` and uses it to lint all `ps1` files in the repository. For more information, see [PSScriptAnalyzer on GitHub](https://github.com/PowerShell/PSScriptAnalyzer).
+
+{% raw %}
+```yaml
+ lint-with-PSScriptAnalyzer:
+ name: Install and run PSScriptAnalyzer
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Install PSScriptAnalyzer module
+ shell: pwsh
+ run: |
+ Set-PSRepository PSGallery -InstallationPolicy Trusted
+ Install-Module PSScriptAnalyzer -ErrorAction Stop
+ - name: Lint with PSScriptAnalyzer
+ shell: pwsh
+ run: |
+ Invoke-ScriptAnalyzer -Path *.ps1 -Recurse -Outvariable issues
+ $errors = $issues.Where({$_.Severity -eq 'Error'})
+ $warnings = $issues.Where({$_.Severity -eq 'Warning'})
+ if ($errors) {
+ Write-Error "There were $($errors.Count) errors and $($warnings.Count) warnings total." -ErrorAction Stop
+ } else {
+ Write-Output "There were $($errors.Count) errors and $($warnings.Count) warnings total."
+ }
+```
+{% endraw %}
+
+### Workflow-Daten als Artefakte paketieren
+
+You can upload artifacts to view after a workflow completes. Zum Beispiel kann es notwendig sein, Logdateien, Core Dumps, Testergebnisse oder Screenshots zu speichern. Weitere Informationen findest Du unter "[Workflow-Daten mittels Artefakten persistieren](/github/automating-your-workflow-with-github-actions/persisting-workflow-data-using-artifacts)."
+
+The following example demonstrates how you can use the `upload-artifact` action to archive the test results received from `Invoke-Pester`. For more information, see the [`upload-artifact` action](https://github.com/actions/upload-artifact).
+
+{% raw %}
+```yaml
+name: Upload artifact from Ubuntu
+
+on: [push]
+
+jobs:
+ upload-pester-results:
+ name: Run Pester and upload results
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Test with Pester
+ shell: pwsh
+ run: Invoke-Pester Unit.Tests.ps1 -Passthru | Export-CliXml -Path Unit.Tests.xml
+ - name: Upload test results
+ uses: actions/upload-artifact@v2
+ with:
+ name: ubuntu-Unit-Tests
+ path: Unit.Tests.xml
+ if: ${{ always() }}
+```
+{% endraw %}
+
+The `always()` function configures the job to continue processing even if there are test failures. For more information, see "[always](/actions/reference/context-and-expression-syntax-for-github-actions#always)."
+
+### Publishing to PowerShell Gallery
+
+You can configure your workflow to publish your PowerShell module to the PowerShell Gallery when your CI tests pass. You can use repository secrets to store any tokens or credentials needed to publish your package. Weitere Informationen findest Du unter "[Verschlüsselte Geheimnisse erstellen und verwenden](/github/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)".
+
+The following example creates a package and uses `Publish-Module` to publish it to the PowerShell Gallery:
+
+{% raw %}
+```yaml
+name: Publish PowerShell Module
+
+on:
+ release:
+ types: [created]
+
+jobs:
+ publish-to-gallery:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Build and publish
+ env:
+ NUGET_KEY: ${{ secrets.NUGET_KEY }}
+ shell: pwsh
+ run: |
+ ./build.ps1 -Path /tmp/samplemodule
+ Publish-Module -Path /tmp/samplemodule -NuGetApiKey $env:NUGET_KEY -Verbose
+```
+{% endraw %}
diff --git a/translations/de-DE/content/actions/guides/index.md b/translations/de-DE/content/actions/guides/index.md
index b9c81382af..9cb36676dc 100644
--- a/translations/de-DE/content/actions/guides/index.md
+++ b/translations/de-DE/content/actions/guides/index.md
@@ -29,6 +29,7 @@ You can use {% data variables.product.prodname_actions %} to create custom conti
{% link_in_list /about-continuous-integration %}
{% link_in_list /setting-up-continuous-integration-using-workflow-templates %}
{% link_in_list /building-and-testing-nodejs %}
+{% link_in_list /building-and-testing-powershell %}
{% link_in_list /building-and-testing-python %}
{% link_in_list /building-and-testing-java-with-maven %}
{% link_in_list /building-and-testing-java-with-gradle %}
diff --git a/translations/de-DE/content/actions/guides/storing-workflow-data-as-artifacts.md b/translations/de-DE/content/actions/guides/storing-workflow-data-as-artifacts.md
index 29644967a4..eb8e2e7626 100644
--- a/translations/de-DE/content/actions/guides/storing-workflow-data-as-artifacts.md
+++ b/translations/de-DE/content/actions/guides/storing-workflow-data-as-artifacts.md
@@ -171,12 +171,12 @@ Von den Artefakten eines vorherigen Auftrags abhängige Aufträge müssen auf de
Auftrag 1 führt die folgenden Schritte durch:
- Führt eine mathematische Berechnung aus und speichert das Ergebnis in einer Textdatei namens `math-homework.txt`.
-- Verwendet die Aktion `upload-artifact`, um die Datei `math-homework.txt` mit dem Namen `homework` hochzuladen. Die Aktion platziert die Datei in einem Verzeichnis mit dem Namen `homework`.
+- Uses the `upload-artifact` action to upload the `math-homework.txt` file with the artifact name `homework`.
Auftrag 2 verwendet das Ergebnis des vorherigen Auftrags:
- Lädt das im vorherigen Auftrag hochgeladene `homework`-Artefakt herunter. Die Aktion `download-artifact` lädt die Artefakte standardmäßig in das Verzeichnis der Arbeitsoberfläche, in dem der Schritt ausgeführt wird. Du kannst den Eingabeparameter `path` verwenden, um ein anderes Download-Verzeichnis anzugeben.
-- Liest den Wert in der Datei `homework/math-homework.txt`, führt eine mathematische Berechnung durch und speichert das Ergebnis in `math-homework.txt`.
-- Lädt die Datei `math-homework.txt` hoch. Dieser Upload überschreibt den vorherigen Upload, da beide Uploads den gleichen Namen haben.
+- Reads the value in the `math-homework.txt` file, performs a math calculation, and saves the result to `math-homework.txt` again, overwriting its contents.
+- Lädt die Datei `math-homework.txt` hoch. This upload overwrites the previously uploaded artifact because they share the same name.
Auftrag 3 zeigt das im vorherigen Auftrag hochgeladene Ergebnis an:
- Lädt das `homework`-Artefakt herunter.
diff --git a/translations/de-DE/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/translations/de-DE/content/actions/hosting-your-own-runners/about-self-hosted-runners.md
index 6711ce71a4..e80066c926 100644
--- a/translations/de-DE/content/actions/hosting-your-own-runners/about-self-hosted-runners.md
+++ b/translations/de-DE/content/actions/hosting-your-own-runners/about-self-hosted-runners.md
@@ -111,6 +111,7 @@ Du musst sicherstellen, dass der Rechner über den entsprechenden Netzwerkzugrif
github.com
api.github.com
*.actions.githubusercontent.com
+codeload.github.com
```
If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)" or "[Enforcing security settings in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account#using-github-actions-with-an-ip-allow-list)".
diff --git a/translations/de-DE/content/actions/index.md b/translations/de-DE/content/actions/index.md
index 6ed9692cc7..dc7833d422 100644
--- a/translations/de-DE/content/actions/index.md
+++ b/translations/de-DE/content/actions/index.md
@@ -4,17 +4,34 @@ shortTitle: GitHub Actions
intro: 'Mit {% data variables.product.prodname_actions %} kannst Du Deine Softwareentwicklungs-Workflows direkt in Ihrem Repository automatisieren, anpassen und ausführen. Du kannst Actions entdecken, erstellen und weitergeben, um beliebige Aufträge (einschließlich CI/CD) auszuführen. Du kannst auch Actions in einem vollständig angepassten Workflow kombinieren.'
introLinks:
quickstart: /actions/quickstart
- learn: /actions/learn-github-actions
+ reference: /actions/reference
featuredLinks:
+ guides:
+ - /actions/guides/setting-up-continuous-integration-using-workflow-templates
+ - /actions/guides/about-packaging-with-github-actions
gettingStarted:
- /actions/managing-workflow-runs
- /actions/hosting-your-own-runners
- guide:
- - /actions/guides/setting-up-continuous-integration-using-workflow-templates
- - /actions/guides/about-packaging-with-github-actions
popular:
- /actions/reference/workflow-syntax-for-github-actions
- /actions/reference/events-that-trigger-workflows
+changelog:
+ -
+ title: Self-Hosted Runner Group Access Changes
+ date: '2020-10-16'
+ href: https://github.blog/changelog/2020-10-16-github-actions-self-hosted-runner-group-access-changes/
+ -
+ title: Ability to change retention days for artifacts and logs
+ date: '2020-10-08'
+ href: https://github.blog/changelog/2020-10-08-github-actions-ability-to-change-retention-days-for-artifacts-and-logs
+ -
+ title: Deprecating set-env and add-path commands
+ date: '2020-10-01'
+ href: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands
+ -
+ title: Fine-tune access to external actions
+ date: '2020-10-01'
+ href: https://github.blog/changelog/2020-10-01-github-actions-fine-tune-access-to-external-actions
redirect_from:
- /articles/automating-your-workflow-with-github-actions/
- /articles/customizing-your-project-with-github-actions/
@@ -36,44 +53,8 @@ versions:
-
-
-
-
- {% data ui.toc.guides %}
-
-
- {% for link in featuredLinks.guide %}
- - {% include featured-link %}
- {% endfor %}
-
-
-
-
-
- {% data ui.toc.popular_articles %}
-
-
- {% for link in featuredLinks.popular %}
- - {% include featured-link %}
- {% endfor %}
-
-
-
-
-
- Manage workflows
-
-
- {% for link in featuredLinks.gettingStarted %}
- - {% include featured-link %}
- {% endfor %}
-
-
-
-
-
+
More guides
diff --git a/translations/de-DE/content/actions/learn-github-actions/finding-and-customizing-actions.md b/translations/de-DE/content/actions/learn-github-actions/finding-and-customizing-actions.md
index de40098d3f..bc97921641 100644
--- a/translations/de-DE/content/actions/learn-github-actions/finding-and-customizing-actions.md
+++ b/translations/de-DE/content/actions/learn-github-actions/finding-and-customizing-actions.md
@@ -87,7 +87,7 @@ For more information, see "[Using release management for actions](/actions/creat
### Using inputs and outputs with an action
-An action often accepts or requires inputs and generates outputs that you can use. For example, an action might require you to specify a path to a file, the name of a label, or other data it will uses as part of the action processing.
+An action often accepts or requires inputs and generates outputs that you can use. For example, an action might require you to specify a path to a file, the name of a label, or other data it will use as part of the action processing.
To see the inputs and outputs of an action, check the `action.yml` or `action.yaml` in the root directory of the repository.
@@ -149,7 +149,7 @@ jobs:
verwendet: docker://alpine:3.8
```
-For some examples of Docker actions, see the [Docker-image.yml workflow](https://github.com/actions/starter-workflows/blob/main/ci/docker-image.yml) and "[Creating a Docker container action](/articles/creating-a-docker-container-action)."
+Einige Beispiele für Docker-Aktionen findest Du im [Docker-image.yml-Workflow](https://github.com/actions/starter-workflows/blob/main/ci/docker-image.yml) oder unter „[Eine Docker-Container-Aktion erstellen](/articles/creating-a-docker-container-action)“.
### Nächste Schritte:
diff --git a/translations/de-DE/content/actions/learn-github-actions/index.md b/translations/de-DE/content/actions/learn-github-actions/index.md
index 50778b673a..c9f5407605 100644
--- a/translations/de-DE/content/actions/learn-github-actions/index.md
+++ b/translations/de-DE/content/actions/learn-github-actions/index.md
@@ -36,7 +36,8 @@ versions:
{% link_with_intro /managing-complex-workflows %}
{% link_with_intro /sharing-workflows-with-your-organization %}
{% link_with_intro /security-hardening-for-github-actions %}
+{% link_with_intro /migrating-from-azure-pipelines-to-github-actions %}
{% link_with_intro /migrating-from-circleci-to-github-actions %}
{% link_with_intro /migrating-from-gitlab-cicd-to-github-actions %}
-{% link_with_intro /migrating-from-azure-pipelines-to-github-actions %}
{% link_with_intro /migrating-from-jenkins-to-github-actions %}
+{% link_with_intro /migrating-from-travis-ci-to-github-actions %}
\ No newline at end of file
diff --git a/translations/de-DE/content/actions/learn-github-actions/introduction-to-github-actions.md b/translations/de-DE/content/actions/learn-github-actions/introduction-to-github-actions.md
index 0b01b9e938..24b55078a7 100644
--- a/translations/de-DE/content/actions/learn-github-actions/introduction-to-github-actions.md
+++ b/translations/de-DE/content/actions/learn-github-actions/introduction-to-github-actions.md
@@ -34,7 +34,7 @@ The workflow is an automated procedure that you add to your repository. Workflow
#### Ereignisse
-An event is a specific activity that triggers a workflow. Die Aktivität kann beispielsweise von {% data variables.product.prodname_dotcom %} stammen, wenn ein Commit an Repository gepusht oder wenn ein Issue oder ein Pull Request erstellt wird. You can also use the repository dispatch webhook to trigger a workflow when an external event occurs. For a complete list of events that can be used to trigger workflows, see [Events that trigger workflows](/actions/reference/events-that-trigger-workflows).
+An event is a specific activity that triggers a workflow. Die Aktivität kann beispielsweise von {% data variables.product.prodname_dotcom %} stammen, wenn ein Commit an Repository gepusht oder wenn ein Issue oder ein Pull Request erstellt wird. You can also use the [repository dispatch webhook](/rest/reference/repos#create-a-repository-dispatch-event) to trigger a workflow when an external event occurs. For a complete list of events that can be used to trigger workflows, see [Events that trigger workflows](/actions/reference/events-that-trigger-workflows).
#### Jobs
diff --git a/translations/de-DE/content/actions/learn-github-actions/managing-complex-workflows.md b/translations/de-DE/content/actions/learn-github-actions/managing-complex-workflows.md
index 2b440ca7a3..e9cd85487b 100644
--- a/translations/de-DE/content/actions/learn-github-actions/managing-complex-workflows.md
+++ b/translations/de-DE/content/actions/learn-github-actions/managing-complex-workflows.md
@@ -24,12 +24,13 @@ This example action demonstrates how to reference an existing secret as an envir
```yaml
jobs:
example-job:
+ runs-on: ubuntu-latest
steps:
- name: Retrieve secret
env:
super_secret: ${{ secrets.SUPERSECRET }}
run: |
- example-command "$SUPER_SECRET"
+ example-command "$super_secret"
```
{% endraw %}
@@ -49,6 +50,7 @@ jobs:
- run: ./setup_server.sh
build:
needs: setup
+ runs-on: ubuntu-latest
steps:
- run: ./build_server.sh
test:
@@ -141,7 +143,7 @@ This example shows how a workflow can use labels to specify the required runner:
```yaml
jobs:
example-job:
- runs-on: [self-hosted, linux, x64, gpu]
+ runs-on: [self-hosted, linux, x64, gpu]
```
For more information, see ["Using labels with self-hosted runners](/actions/hosting-your-own-runners/using-labels-with-self-hosted-runners)."
diff --git a/translations/de-DE/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md b/translations/de-DE/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md
index f4fde46986..4950231878 100644
--- a/translations/de-DE/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md
+++ b/translations/de-DE/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md
@@ -41,7 +41,7 @@ Jobs und Schritte in Azure-Pipelines sind sehr ähnlich zu Jobs und Schritten in
### Skriptschritte migrieren
-Du kannst in einem Workflow ein Skript oder einen Shell-Befehl als Schritt ausführen. In Azure-Pipelines können Skriptschritte mit dem Schlüssel `script`, `bash`, `powershell` oder `pwsh` festgelegt werden. Skripte können auch als Eingabe für den [Bash-Task](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/utility/bash?view=azure-devops) oder den [PowerShell-Task](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/utility/powershell?view=azure-devops) angegeben werden.
+Du kannst in einem Workflow ein Skript oder einen Shell-Befehl als Schritt ausführen. In Azure-Pipelines können Skriptschritte mit dem Schlüssel `script`, `bash`, `powershell` oder `pwsh` festgelegt werden. Skripte können auch als Eingabe für den [Bash-Task](https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/bash?view=azure-devops) oder den [PowerShell-Task](https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/powershell?view=azure-devops) angegeben werden.
In {% data variables.product.prodname_actions %} sind alle Skripte mit dem Schlüssel `run` spezifiziert. Um eine bestimmte Shell auszuwählen, kannst Du den Schlüssel `shell` angeben, wenn Du das Skript zur Verfügung stellst. Weitere Informationen findest Du unter „[Workflow-Syntax für {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun)“.
diff --git a/translations/de-DE/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md b/translations/de-DE/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
index 8d389fccd8..99de179d99 100644
--- a/translations/de-DE/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
+++ b/translations/de-DE/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
@@ -118,9 +118,9 @@ linux_job:
-For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on)."
+Weitere Informationen findest Du unter „[Workflow Syntax für {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on)."
-### Docker images
+### Docker-Images
Both GitLab CI/CD and {% data variables.product.prodname_actions %} support running jobs in a Docker image. In GitLab CI/CD, Docker images are defined with a `image` key, while in {% data variables.product.prodname_actions %} it is done with the `container` key.
@@ -156,7 +156,7 @@ jobs:
-For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer)."
+Weitere Informationen findest Du unter „[Workflow-Syntax für {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer)“.
### Condition and expression syntax
@@ -180,7 +180,7 @@ GitLab CI/CD
deploy_prod:
stage: deploy
script:
- - echo "Deply to production server"
+ - echo "Deploy to production server"
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
```
@@ -194,7 +194,7 @@ jobs:
if: contains( github.ref, 'master')
runs-on: ubuntu-latest
steps:
- - run: echo "Deply to production server"
+ - run: echo "Deploy to production server"
```
{% endraw %}
@@ -286,7 +286,7 @@ Weitere Informationen findest Du unter „[Workflow-Syntax für {% data variable
Both GitLab CI/CD and {% data variables.product.prodname_actions %} allow you to run workflows at a specific interval. In GitLab CI/CD, pipeline schedules are configured with the UI, while in {% data variables.product.prodname_actions %} you can trigger a workflow on a scheduled interval with the "on" key.
-For more information, see "[Events that trigger workflows](/actions/reference/events-that-trigger-workflows#scheduled-events)."
+Weitere Informationen findest Du unter "[Ereignisse, die Workflows auslösen](/actions/reference/events-that-trigger-workflows#scheduled-events)."
### Variables and secrets
@@ -346,7 +346,7 @@ jobs:
-For more information, see "[Caching dependencies to speed up workflows](/actions/guides/caching-dependencies-to-speed-up-workflows)."
+Weitere Informationen findest Du unter „[Abhängigkeiten zur Beschleunigung von Workflows im Cache zwischenspeichern](/actions/guides/caching-dependencies-to-speed-up-workflows)“.
### Artifacts
diff --git a/translations/de-DE/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md b/translations/de-DE/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md
index aede01bab1..6b38d484b5 100644
--- a/translations/de-DE/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md
+++ b/translations/de-DE/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md
@@ -232,12 +232,19 @@ Jenkins-Pipeline
```yaml
pipeline {
- agent none
- stages {
- stage('Run Tests') {
- parallel {
- stage('Test On MacOS') {
- agent { label "macos" }
+agent none
+stages {
+ stage('Run Tests') {
+ matrix {
+ axes {
+ axis {
+ name: 'PLATFORM'
+ values: 'macos', 'linux'
+ }
+ }
+ agent { label "${PLATFORM}" }
+ stages {
+ stage('test') {
tools { nodejs "node-12" }
steps {
dir("scripts/myapp") {
@@ -246,19 +253,10 @@ pipeline {
}
}
}
- stage('Test On Linux') {
- agent { label "linux" }
- tools { nodejs "node-12" }
- steps {
- dir("script/myapp") {
- sh(script: "npm install -g bats")
- sh(script: "bats tests")
- }
- }
- }
}
}
}
+}
}
```
diff --git a/translations/de-DE/content/actions/learn-github-actions/migrating-from-travis-ci-to-github-actions.md b/translations/de-DE/content/actions/learn-github-actions/migrating-from-travis-ci-to-github-actions.md
new file mode 100644
index 0000000000..521bc8c255
--- /dev/null
+++ b/translations/de-DE/content/actions/learn-github-actions/migrating-from-travis-ci-to-github-actions.md
@@ -0,0 +1,408 @@
+---
+title: Migrating from Travis CI to GitHub Actions
+intro: '{% data variables.product.prodname_actions %} and Travis CI share multiple similarities, which helps make it relatively straightforward to migrate to {% data variables.product.prodname_actions %}.'
+redirect_from:
+ - /actions/migrating-to-github-actions/migrating-from-travis-ci-to-github-actions
+versions:
+ free-pro-team: '*'
+ enterprise-server: '>=2.22'
+---
+
+### Einführung
+
+This guide helps you migrate from Travis CI to {% data variables.product.prodname_actions %}. It compares their concepts and syntax, describes the similarities, and demonstrates their different approaches to common tasks.
+
+### Before you start
+
+Before starting your migration to {% data variables.product.prodname_actions %}, it would be useful to become familiar with how it works:
+
+- For a quick example that demonstrates a {% data variables.product.prodname_actions %} job, see "[Quickstart for {% data variables.product.prodname_actions %}](/actions/quickstart)."
+- To learn the essential {% data variables.product.prodname_actions %} concepts, see "[Introduction to GitHub Actions](/actions/learn-github-actions/introduction-to-github-actions)."
+
+### Comparing job execution
+
+To give you control over when CI tasks are executed, a {% data variables.product.prodname_actions %} _workflow_ uses _jobs_ that run in parallel by default. Each job contains _steps_ that are executed in a sequence that you define. If you need to run setup and cleanup actions for a job, you can define steps in each job to perform these.
+
+### Key similarities
+
+{% data variables.product.prodname_actions %} and Travis CI share certain similarities, and understanding these ahead of time can help smooth the migration process.
+
+#### Using YAML syntax
+
+Travis CI and {% data variables.product.prodname_actions %} both use YAML to create jobs and workflows, and these files are stored in the code's repository. For more information on how {% data variables.product.prodname_actions %} uses YAML, see ["Creating a workflow file](/actions/learn-github-actions/introduction-to-github-actions#create-an-example-workflow)."
+
+#### Custom environment variables
+
+Travis CI lets you set environment variables and share them between stages. Similarly, {% data variables.product.prodname_actions %} lets you define environment variables for a step, job, or workflow. For more information, see ["Environment variables](/actions/reference/environment-variables)."
+
+#### Standard-Umgebungsvariablen
+
+Travis CI and {% data variables.product.prodname_actions %} both include default environment variables that you can use in your YAML files. For {% data variables.product.prodname_actions %}, you can see these listed in "[Default environment variables](/actions/reference/environment-variables#default-environment-variables)."
+
+#### Parallele Verarbeitungvon Jobs
+
+Travis CI can use `stages` to run jobs in parallel. Similarly, {% data variables.product.prodname_actions %} runs `jobs` in parallel. For more information, see "[Creating dependent jobs](/actions/learn-github-actions/managing-complex-workflows#creating-dependent-jobs)."
+
+#### Status badges
+
+Travis CI and {% data variables.product.prodname_actions %} both support status badges, which let you indicate whether a build is passing or failing. For more information, see ["Adding a workflow status badge to your repository](/actions/managing-workflow-runs/adding-a-workflow-status-badge)."
+
+#### Using a build matrix
+
+Travis CI and {% data variables.product.prodname_actions %} both support a build matrix, allowing you to perform testing using combinations of operating systems and software packages. For more information, see "[Using a build matrix](/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix)."
+
+Below is an example comparing the syntax for each system:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+matrix:
+ include:
+ - rvm: 2.5
+ - rvm: 2.6.3
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+jobs:
+ build:
+ strategy:
+ matrix:
+ ruby: [2.5, 2.6.3]
+```
+{% endraw %}
+
+
+
+
+#### Targeting specific branches
+
+Travis CI and {% data variables.product.prodname_actions %} both allow you to target your CI to a specific branch. Weitere Informationen findest Du unter „[Workflow-Syntax für GitHub-Aktionen](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestbranchestags)."
+
+Nachfolgend ein Beispiel für die Syntax in jedem System:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+branches:
+ only:
+ - main
+ - 'mona/octocat'
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+on:
+ push:
+ branches:
+ - main
+ - 'mona/octocat'
+```
+{% endraw %}
+
+
+
+
+#### Checking out submodules
+
+Travis CI and {% data variables.product.prodname_actions %} both allow you to control whether submodules are included in the repository clone.
+
+Nachfolgend ein Beispiel für die Syntax in jedem System:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+git:
+ submodules: false
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+ - uses: actions/checkout@v2
+ with:
+ submodules: false
+```
+{% endraw %}
+
+
+
+
+### Key features in {% data variables.product.prodname_actions %}
+
+When migrating from Travis CI, consider the following key features in {% data variables.product.prodname_actions %}:
+
+#### Storing secrets
+
+{% data variables.product.prodname_actions %} allows you to store secrets and reference them in your jobs. {% data variables.product.prodname_actions %} also includes policies that allow you to limit access to secrets at the repository and organization level. For more information, see "[Encrypted secrets](/actions/reference/encrypted-secrets)."
+
+#### Sharing files between jobs and workflows
+
+{% data variables.product.prodname_actions %} includes integrated support for artifact storage, allowing you to share files between jobs in a workflow. You can also save the resulting files and share them with other workflows. For more information, see "[Sharing data between jobs](/actions/learn-github-actions/essential-features-of-github-actions#sharing-data-between-jobs)."
+
+#### Deinen eigenen Runner hosten
+
+If your jobs require specific hardware or software, {% data variables.product.prodname_actions %} allows you to host your own runners and send your jobs to them for processing. {% data variables.product.prodname_actions %} also lets you use policies to control how these runners are accessed, granting access at the organization or repository level. For more information, see ["Hosting your own runners](/actions/hosting-your-own-runners)."
+
+#### Concurrent jobs and execution time
+
+The concurrent jobs and workflow execution times in {% data variables.product.prodname_actions %} can vary depending on your {% data variables.product.company_short %} plan. For more information, see "[Usage limits, billing, and administration](/actions/reference/usage-limits-billing-and-administration)."
+
+#### Using different languages in {% data variables.product.prodname_actions %}
+
+When working with different languages in {% data variables.product.prodname_actions %}, you can create a step in your job to set up your language dependencies. For more information about working with a particular language, see the specific guide:
+ - [Building and testing Node.js](/actions/guides/building-and-testing-nodejs)
+ - [Building and testing PowerShell](/actions/guides/building-and-testing-powershell)
+ - [Building and testing Python](/actions/guides/building-and-testing-python)
+ - [Java bauen und testen mit Maven](/actions/guides/building-and-testing-java-with-maven)
+ - [Java bauen und testen mit Gradle](/actions/guides/building-and-testing-java-with-gradle)
+ - [Java bauen und testen mit Ant](/actions/guides/building-and-testing-java-with-ant)
+
+### Executing scripts
+
+{% data variables.product.prodname_actions %} can use `run` steps to run scripts or shell commands. To use a particular shell, you can specify the `shell` type when providing the path to the script. Weitere Informationen findest Du unter „[Workflow-Syntax für {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun)“.
+
+Ein Beispiel:
+
+```yaml
+ steps:
+ - name: Run build script
+ run: ./.github/scripts/build.sh
+ shell: bash
+```
+
+### Error handling in {% data variables.product.prodname_actions %}
+
+When migrating to {% data variables.product.prodname_actions %}, there are different approaches to error handling that you might need to be aware of.
+
+#### Script error handling
+
+{% data variables.product.prodname_actions %} stops a job immediately if one of the steps returns an error code. Weitere Informationen findest Du unter „[Workflow-Syntax für {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference)“.
+
+#### Job error handling
+
+{% data variables.product.prodname_actions %} uses `if` conditionals to execute jobs or steps in certain situations. For example, you can run a step when another step results in a `failure()`. Weitere Informationen findest Du unter „[Workflow-Syntax für {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#example-using-status-check-functions)“. You can also use [`continue-on-error`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontinue-on-error) to prevent a workflow run from stopping when a job fails.
+
+### Migrating syntax for conditionals and expressions
+
+To run jobs under conditional expressions, Travis CI and {% data variables.product.prodname_actions %} share a similar `if` condition syntax. {% data variables.product.prodname_actions %} lets you use the `if` conditional to prevent a job or step from running unless a condition is met. Weitere Informationen findest Du unter „[Kontext- und Ausdrucks-Syntax für {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)“.
+
+This example demonstrates how an `if` conditional can control whether a step is executed:
+
+```yaml
+jobs:
+ conditional:
+ runs-on: ubuntu-latest
+ steps:
+ - run: echo "This step runs with str equals 'ABC' and num equals 123"
+ if: env.str == 'ABC' && env.num == 123
+```
+
+### Migrating phases to steps
+
+Where Travis CI uses _phases_ to run _steps_, {% data variables.product.prodname_actions %} has _steps_ which execute _actions_. You can find prebuilt actions in the [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?type=actions), or you can create your own actions. Weitere Informationen findest Du unter „[Aktionen bauen](/actions/building-actions)“.
+
+Nachfolgend ein Beispiel für die Syntax in jedem System:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+language: python
+python:
+ - "3.7"
+
+script:
+ - python script.py
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+jobs:
+ run_python:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/setup-python@v2
+ with:
+ python-version: '3.7'
+ architecture: 'x64'
+ - run: python script.py
+```
+{% endraw %}
+
+
+
+
+### Abhängigkeiten „cachen“ (zwischenspeichern)
+
+Travis CI and {% data variables.product.prodname_actions %} let you manually cache dependencies for later reuse. This example demonstrates the cache syntax for each system.
+
+
+
+
+Travis CI
+
+
+GitHub Actions
+
+
+
+
+{% raw %}
+```yaml
+language: node_js
+cache: npm
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+- name: Cache node modules
+ uses: actions/cache@v2
+ with:
+ path: ~/.npm
+ key: v1-npm-deps-${{ hashFiles('**/package-lock.json') }}
+ restore-keys: v1-npm-deps-
+```
+{% endraw %}
+
+
+
+
+Weitere Informationen findest Du unter „[Abhängigkeiten zur Beschleunigung von Workflows im Cache zwischenspeichern](/actions/guides/caching-dependencies-to-speed-up-workflows)“.
+
+### Beispiele für häufige Aufgaben
+
+This section compares how {% data variables.product.prodname_actions %} and Travis CI perform common tasks.
+
+#### Configuring environment variables
+
+You can create custom environment variables in a {% data variables.product.prodname_actions %} job. Ein Beispiel:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}-Workflow
+
+
+
+
+
+ ```yaml
+env:
+ - MAVEN_PATH="/usr/local/maven"
+ ```
+
+
+
+
+ ```yaml
+ jobs:
+ maven-build:
+ env:
+ MAVEN_PATH: '/usr/local/maven'
+ ```
+
+
+
+
+
+#### Building with Node.js
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}-Workflow
+
+
+
+
+{% raw %}
+ ```yaml
+install:
+ - npm install
+script:
+ - npm run build
+ - npm test
+ ```
+{% endraw %}
+
+
+{% raw %}
+ ```yaml
+name: Node.js CI
+on: [push]
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Use Node.js
+ uses: actions/setup-node@v1
+ with:
+ node-version: '12.x'
+ - run: npm install
+ - run: npm run build
+ - run: npm test
+ ```
+{% endraw %}
+
+
+
+
+### Nächste Schritte:
+
+To continue learning about the main features of {% data variables.product.prodname_actions %}, see "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)."
diff --git a/translations/de-DE/content/actions/learn-github-actions/security-hardening-for-github-actions.md b/translations/de-DE/content/actions/learn-github-actions/security-hardening-for-github-actions.md
index 14801aeb3a..0f2e888b06 100644
--- a/translations/de-DE/content/actions/learn-github-actions/security-hardening-for-github-actions.md
+++ b/translations/de-DE/content/actions/learn-github-actions/security-hardening-for-github-actions.md
@@ -26,7 +26,7 @@ Secrets use [Libsodium sealed boxes](https://libsodium.gitbook.io/doc/public-key
To help prevent accidental disclosure, {% data variables.product.product_name %} uses a mechanism that attempts to redact any secrets that appear in run logs. This redaction looks for exact matches of any configured secrets, as well as common encodings of the values, such as Base64. However, because there are multiple ways a secret value can be transformed, this redaction is not guaranteed. As a result, there are certain proactive steps and good practices you should follow to help ensure secrets are redacted, and to limit other risks associated with secrets:
- **Never use structured data as a secret**
- - Unstructured data can cause secret redaction within logs to fail, because redaction largely relies on finding an exact match for the specific secret value. For example, do not use a blob of JSON, XML, or YAML (or similar) to encapsulate a secret value, as this significantly reduces the probability the secrets will be properly redacted. Instead, create individual secrets for each sensitive value.
+ - Structured data can cause secret redaction within logs to fail, because redaction largely relies on finding an exact match for the specific secret value. For example, do not use a blob of JSON, XML, or YAML (or similar) to encapsulate a secret value, as this significantly reduces the probability the secrets will be properly redacted. Instead, create individual secrets for each sensitive value.
- **Register all secrets used within workflows**
- If a secret is used to generate another sensitive value within a workflow, that generated value should be formally [registered as a secret](https://github.com/actions/toolkit/tree/main/packages/core#setting-a-secret), so that it will be redacted if it ever appears in the logs. For example, if using a private key to generate a signed JWT to access a web API, be sure to register that JWT as a secret or else it won’t be redacted if it ever enters the log output.
- Registering secrets applies to any sort of transformation/encoding as well. If your secret is transformed in some way (such as Base64 or URL-encoded), be sure to register the new value as a secret too.
@@ -98,7 +98,7 @@ You should also consider the environment of the self-hosted runner machines:
### Auditing {% data variables.product.prodname_actions %} events
-You can use the audit log to monitor administrative tasks in an organization. The audit log records the type of action, when it was run, and which user account perfomed the action.
+You can use the audit log to monitor administrative tasks in an organization. The audit log records the type of action, when it was run, and which user account performed the action.
For example, you can use the audit log to track the `action:org.update_actions_secret` event, which tracks changes to organization secrets: 
diff --git a/translations/de-DE/content/actions/managing-workflow-runs/manually-running-a-workflow.md b/translations/de-DE/content/actions/managing-workflow-runs/manually-running-a-workflow.md
index 81404760ac..b4323a2e0f 100644
--- a/translations/de-DE/content/actions/managing-workflow-runs/manually-running-a-workflow.md
+++ b/translations/de-DE/content/actions/managing-workflow-runs/manually-running-a-workflow.md
@@ -10,7 +10,9 @@ versions:
{% data reusables.actions.enterprise-beta %}
{% data reusables.actions.enterprise-github-hosted-runners %}
-To run a workflow manually, the workflow must be configured to run on the `workflow_dispatch` event. Weitere Informationen findest Du unter "[Ereignisse, die Workflows auslösen](/actions/reference/events-that-trigger-workflows)."
+### Configuring a workflow to run manually
+
+To run a workflow manually, the workflow must be configured to run on the `workflow_dispatch` event. For more information about configuring the `workflow_dispatch` event, see "[Events that trigger workflows](/actions/reference/events-that-trigger-workflows#workflow_dispatch)".
### Running a workflow on {% data variables.product.prodname_dotcom %}
diff --git a/translations/de-DE/content/actions/reference/encrypted-secrets.md b/translations/de-DE/content/actions/reference/encrypted-secrets.md
index ad3bf96e4d..f0eb9a3131 100644
--- a/translations/de-DE/content/actions/reference/encrypted-secrets.md
+++ b/translations/de-DE/content/actions/reference/encrypted-secrets.md
@@ -105,7 +105,7 @@ steps:
```
{% endraw %}
-Wann immer dies möglich ist, vermeide die Übergabe von Geheimnissen zwischen Prozessen von der Befehlszeile aus. Befehlszeilen-Prozesse können für andere Benutzer (mithilfe des Befehls `ps`) sichtbar sein oder von [„security audit events“ (Ereignissen zur Sicherheits-Überprüfung)](https://docs.microsoft.com/en-us/windows-server/identity/ad-ds/manage/component-updates/command-line-process-auditing) erfasst werden. Um den Schutz von Geheimnissen zu unterstützen, solltest Du die Verwendung von Umgebungsvariablen, `STDIN` oder andere vom Zielprozess unterstützte Mechanismen in Betracht ziehen.
+Wann immer dies möglich ist, vermeide die Übergabe von Geheimnissen zwischen Prozessen von der Befehlszeile aus. Befehlszeilen-Prozesse können für andere Benutzer (mithilfe des Befehls `ps`) sichtbar sein oder von [„security audit events“ (Ereignissen zur Sicherheits-Überprüfung)](https://docs.microsoft.com/windows-server/identity/ad-ds/manage/component-updates/command-line-process-auditing) erfasst werden. Um den Schutz von Geheimnissen zu unterstützen, solltest Du die Verwendung von Umgebungsvariablen, `STDIN` oder andere vom Zielprozess unterstützte Mechanismen in Betracht ziehen.
Wenn Sie Geheimnisse innerhalb einer Kommandozeile übergeben müssen, umschließe sie im Rahmen der gültigen Quotierungsregeln. Geheimnisse enthalten oft Sonderzeichen, die in Deiner Shell unbeabsichtigte Wirkungen entfalten können. Um diese Sonderzeichen zu vermeiden, verwende Deine Umgebungsvariablen mit Anführungszeichen. Ein Beispiel:
diff --git a/translations/de-DE/content/actions/reference/events-that-trigger-workflows.md b/translations/de-DE/content/actions/reference/events-that-trigger-workflows.md
index 074d1c90db..82b4892eb9 100644
--- a/translations/de-DE/content/actions/reference/events-that-trigger-workflows.md
+++ b/translations/de-DE/content/actions/reference/events-that-trigger-workflows.md
@@ -98,30 +98,39 @@ You can manually trigger a workflow run using the {% data variables.product.prod
To trigger the custom `workflow_dispatch` webhook event using the REST API, you must send a `POST` request to a {% data variables.product.prodname_dotcom %} API endpoint and provide the `ref` and any required `inputs`. For more information, see the "[Create a workflow dispatch event](/rest/reference/actions/#create-a-workflow-dispatch-event)" REST API endpoint.
+##### Beispiel
+
+To use the `workflow_dispatch` event, you need to include it as a trigger in your GitHub Actions workflow file. The example below only runs the workflow when it's manually triggered:
+
+```yaml
+on: workflow_dispatch
+```
+
##### Example workflow configuration
-In diesem Beispiel wird der `Name` definiert und ein- und `zu Hause verwendet, und sie werden mit den Kontexten github.event.inputs.name` und `github.event.inputs.home` gedruckt. Wenn ein `Name` nicht angegeben wird, wird der Standardwert 'Mona the Octocat' gedruckt.
+In diesem Beispiel wird der `Name` definiert und ein- und `zu Hause verwendet, und sie werden mit den Kontexten github.event.inputs.name` und `github.event.inputs.home` gedruckt. If a `home` isn't provided, the default value 'The Octoverse' is printed.
{% raw %}
```yaml
-Name: Manuell ausgelöster Workflow
-auf:
+name: Manually triggered workflow
+on:
workflow_dispatch:
- Eingaben:
- Name:
- Beschreibung: 'Person zu grüßen'
- erforderlich: true
- Standard: 'Mona the Octocat'
- Home:
- Beschreibung: 'Standort'
- erforderlich: falsche
+ inputs:
+ name:
+ description: 'Person to greet'
+ required: true
+ default: 'Mona the Octocat'
+ home:
+ description: 'location'
+ required: false
+ default: 'The Octoverse'
-Jobs:
+jobs:
say_hello:
- läuft auf: ubuntu-latest
- Schritte:
- - laufen: |
- Echo "Hallo{{ github.event.inputs.name }}!"
+ runs-on: ubuntu-latest
+ steps:
+ - run: |
+ echo "Hello ${{ github.event.inputs.name }}!"
echo "- in{{ github.event.inputs.home }}!"
```
{% endraw %}
@@ -314,6 +323,33 @@ on:
types: [created, deleted]
```
+The `issue_comment` event occurs for comments on both issues and pull requests. To determine whether the `issue_comment` event was triggered from an issue or pull request, you can check the event payload for the `issue.pull_request` property and use it as a condition to skip a job.
+
+For example, you can choose to run the `pr_commented` job when comment events occur in a pull request, and the `issue_commented` job when comment events occur in an issue.
+
+```yaml
+on: issue_comment
+
+jobs:
+ pr_commented:
+ # This job only runs for pull request comments
+ name: PR comment
+ if: ${{ github.event.issue.pull_request }}
+ runs-on: ubuntu-latest
+ steps:
+ - run: |
+ echo "Comment on PR #${{ github.event.issue.number }}"
+
+ issue-commented:
+ # This job only runs for issue comments
+ name: Issue comment
+ if: ${{ !github.event.issue.pull_request }}
+ runs-on: ubuntu-latest
+ steps:
+ - run: |
+ echo "Comment on issue #${{ github.event.issue.number }}"
+```
+
#### `Issues (Lieferungen)`
Führt den Workflow aus, wenn das Ereignis `issues` eintritt. {% data reusables.developer-site.multiple_activity_types %} For information about the REST API, see "[Issues](/v3/issues)."
@@ -326,7 +362,7 @@ Führt den Workflow aus, wenn das Ereignis `issues` eintritt. {% data reusables.
{% data reusables.developer-site.limit_workflow_to_activity_types %}
-Sie können einen Workflow beispielsweise ausführen, wenn ein Issue geöffnet (`opened`) oder bearbeitet (`edited`) oder wenn ein Meilenstein gesetzt (`milestoned`) wurde.
+Du kannst einen Workflow beispielsweise ausführen, wenn ein Problem geöffnet (`opened`) oder bearbeitet (`edited`) wurde oder wenn dafür ein Meilenstein gesetzt wurde (`milestoned`).
```yaml
on:
@@ -356,7 +392,7 @@ on:
#### `Meilensteine`
-Führt den Workflow aus, wenn das Ereignis `milestone` eintritt. {% data reusables.developer-site.multiple_activity_types %} For information about the REST API, see "[Milestones](/v3/issues/milestones/)."
+Führt Deinen Workflow aus, wenn das Ereignis `milestone` eintritt. {% data reusables.developer-site.multiple_activity_types %} For information about the REST API, see "[Milestones](/v3/issues/milestones/)."
{% data reusables.github-actions.branch-requirement %}
@@ -413,7 +449,7 @@ on:
#### `project_card`
-Führt den Workflow aus, wenn das Ereignis `project_ticket` eintritt. {% data reusables.developer-site.multiple_activity_types %} For information about the REST API, see "[Project cards](/v3/projects/cards)."
+Führt den Workflow aus, wenn das Ereignis `project_card` eintritt. {% data reusables.developer-site.multiple_activity_types %} For information about the REST API, see "[Project cards](/v3/projects/cards)."
{% data reusables.github-actions.branch-requirement %}
@@ -433,7 +469,7 @@ on:
#### `project_column`
-Führt den Workflow aus, wenn das Ereignis `project_column` eintritt. {% data reusables.developer-site.multiple_activity_types %} For information about the REST API, see "[Project columns](/v3/projects/columns)."
+Führt Deinen Workflow aus, wenn das Ereignis `project_column` eintritt. {% data reusables.developer-site.multiple_activity_types %} For information about the REST API, see "[Project columns](/v3/projects/columns)."
{% data reusables.github-actions.branch-requirement %}
@@ -443,7 +479,7 @@ Führt den Workflow aus, wenn das Ereignis `project_column` eintritt. {% data re
{% data reusables.developer-site.limit_workflow_to_activity_types %}
-Sie können einen Workflow beispielsweise ausführen, wenn eine Projektspalte erstellt (`created`) oder gelöscht (`deleted`) wurde.
+Du kannst einen Workflow beispielsweise ausführen, wenn eine Projektspalte erstellt (`created`) oder gelöscht (`deleted`) wurde.
```yaml
on:
@@ -453,7 +489,7 @@ on:
#### `public`
-Führt den Workflow aus, wenn ein Benutzer ein privates Repository öffentlich macht, wodurch das Ereignis `public` ausgelöst wird. For information about the REST API, see "[Edit repositories](/v3/repos/#edit)."
+Führt Deinen Workflow aus, wenn ein Benutzer ein privates Repository öffentlich macht, wodurch das Ereignis `public` ausgelöst wird. For information about the REST API, see "[Edit repositories](/v3/repos/#edit)."
{% data reusables.github-actions.branch-requirement %}
@@ -461,7 +497,7 @@ Führt den Workflow aus, wenn ein Benutzer ein privates Repository öffentlich m
| -------------------------------------------- | --------------- | --------------------------------- | --------------- |
| [`public`](/webhooks/event-payloads/#public) | – | Letzter Commit im Standard-Branch | Standard-Branch |
-Sie können einen Workflow beispielsweise ausführen, wenn das Ereignis `public` eintritt.
+Du kannst einen Workflow beispielsweise ausführen, wenn das Ereignis `public` eintritt.
```yaml
on:
@@ -470,11 +506,11 @@ on:
#### `pull_request`
-Führt den Workflow aus, wenn das Ereignis `pull_request` eintritt. {% data reusables.developer-site.multiple_activity_types %} For information about the REST API, see "[Pull requests](/v3/pulls)."
+Führt Deinen Workflow aus, wenn das Ereignis `pull_request` eintritt. {% data reusables.developer-site.multiple_activity_types %} For information about the REST API, see "[Pull requests](/v3/pulls)."
{% note %}
-**Hinweis:** Standardmäßig wird ein Workflow nur dann ausgeführt, wenn der `pull_request` den Aktivitätstyp `opened`, `synchronize` oder `reopened` aufweist. Sollen Workflows für weitere Aktivitätstypen ausgelöst werden, geben Sie das Stichwort `types` an.
+**Note:** By default, a workflow only runs when a `pull_request`'s activity type is `opened`, `synchronize`, or `reopened`. Sollen Workflows für weitere Aktivitätstypen ausgelöst werden, verwende das Schlüsselwort `types`.
{% endnote %}
@@ -496,7 +532,7 @@ on:
#### `pull_request_review`
-Führt den Workflow aus, wenn das Ereignis `pull_request_review` eintritt. {% data reusables.developer-site.multiple_activity_types %} For information about the REST API, see "[Pull request reviews](/v3/pulls/reviews)."
+Führt Deinen Workflow aus, wenn das Ereignis `pull_request_review` eintritt. {% data reusables.developer-site.multiple_activity_types %} For information about the REST API, see "[Pull request reviews](/v3/pulls/reviews)."
| Nutzlast des Webhook-Ereignisses | Aktivitätstypen | `GITHUB_SHA` | `GITHUB_REF` |
| ---------------------------------------------------------------------- | ---------------------------------------------------------- | ------------------------------------------- | ------------------------------------------- |
@@ -504,7 +540,7 @@ Führt den Workflow aus, wenn das Ereignis `pull_request_review` eintritt. {% da
{% data reusables.developer-site.limit_workflow_to_activity_types %}
-Sie können einen Workflow beispielsweise ausführen, wenn ein Pull-Request-Review bearbeitet (`edited`) oder verworfen (`dismissed`) wurde.
+Du kannst einen Workflow beispielsweise ausführen, wenn ein Pull-Request-Review bearbeitet (`edited`) oder verworfen (`dismissed`) wurde.
```yaml
on:
@@ -524,7 +560,7 @@ Führt den Workflow aus, wenn ein Kommentar zum vereinheitlichten Diff für eine
{% data reusables.developer-site.limit_workflow_to_activity_types %}
-Sie können einen Workflow beispielsweise ausführen, wenn ein Pull-Request-Review-Kommentar erstellt (`created`) oder gelöscht (`deleted`) wurde.
+Du kannst einen Workflow beispielsweise ausführen, wenn ein Pull-Request-Review-Kommentar erstellt (`created`) oder gelöscht (`deleted`) wurde.
```yaml
on:
@@ -542,7 +578,7 @@ This event is similar to `pull_request`, except that it runs in the context of t
| -------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------- | -------------- |
| [`pull_request`](/webhooks/event-payloads/#pull_request) | - `assigned`
- `unassigned`
- `labeled`
- `unlabeled`
- `opened`
- `edited`
- `closed`
- `reopened`
- `synchronize`
- `ready_for_review`
- `locked`
- `unlocked`
- `review_requested`
- `review_request_removed` | Last commit on the PR base branch | PR base branch |
-By default, a workflow only runs when a `pull_request_target`'s activity type is `opened`, `synchronize`, or `reopened`. Sollen Workflows für weitere Aktivitätstypen ausgelöst werden, geben Sie das Stichwort `types` an. Weitere Informationen findest Du unter „[Workflow-Syntax für {% data variables.product.prodname_actions %}](/articles/workflow-syntax-for-github-actions#onevent_nametypes)“.
+By default, a workflow only runs when a `pull_request_target`'s activity type is `opened`, `synchronize`, or `reopened`. Sollen Workflows für weitere Aktivitätstypen ausgelöst werden, verwende das Schlüsselwort `types`. Weitere Informationen findest Du unter „[Workflow-Syntax für {% data variables.product.prodname_actions %}](/articles/workflow-syntax-for-github-actions#onevent_nametypes)“.
Du kannst einen Workflow beispielsweise dann ausführen, wenn ein Pull Request zugewiesen (`assigned`), geöffnet (`opened`), synchronisiert (`synchronize`) oder erneut geöffnet (`reopened`) wurde.
@@ -655,6 +691,10 @@ on:
{% data reusables.webhooks.workflow_run_desc %}
+| Nutzlast des Webhook-Ereignisses | Aktivitätstypen | `GITHUB_SHA` | `GITHUB_REF` |
+| -------------------------------------------------------- | --------------- | --------------------------------- | --------------- |
+| [`workflow_run`](/webhooks/event-payloads/#workflow_run) | - n/a | Letzter Commit im Standard-Branch | Standard-Branch |
+
If you need to filter branches from this event, you can use `branches` or `branches-ignore`.
In this example, a workflow is configured to run after the separate “Run Tests” workflow completes.
diff --git a/translations/de-DE/content/actions/reference/specifications-for-github-hosted-runners.md b/translations/de-DE/content/actions/reference/specifications-for-github-hosted-runners.md
index e77a19176c..d81032eca4 100644
--- a/translations/de-DE/content/actions/reference/specifications-for-github-hosted-runners.md
+++ b/translations/de-DE/content/actions/reference/specifications-for-github-hosted-runners.md
@@ -29,7 +29,7 @@ Du kannst in einem Workflow für jeden Job die Art des Runners festlegen. Jeder
#### Cloud-Hosts für {% data variables.product.prodname_dotcom %}-gehostete Runner
-{% data variables.product.prodname_dotcom %} betreibt Linux- und Windows-Runner auf den virtuellen Maschinen nach Standard_DS2_v2 in Microsoft Azure, auf denen die Runner-Anwendung der {% data variables.product.prodname_actions %} installiert ist. Die Runner-Anwendung auf {% data variables.product.prodname_dotcom %}-gehosteten Runnern ist eine Fork-Kopie des Azure-Pipelines-Agenten. Bei Azure werden eingehende ICMP-Pakete werden für alle virtuellen Maschinen blockiert, so dass die Befehle ping und traceroute möglicherweise nicht funktionieren. Weitere Informationen zu den Ressourcen der Standard_DS2_v2-Maschinen findest Du unter „[Serien Dv2 und DSv2](https://docs.microsoft.com/en-us/azure/virtual-machines/dv2-dsv2-series#dsv2-series)“ in der Dokumentation zu Microsoft Azure.
+{% data variables.product.prodname_dotcom %} betreibt Linux- und Windows-Runner auf den virtuellen Maschinen nach Standard_DS2_v2 in Microsoft Azure, auf denen die Runner-Anwendung der {% data variables.product.prodname_actions %} installiert ist. Die Runner-Anwendung auf {% data variables.product.prodname_dotcom %}-gehosteten Runnern ist eine Fork-Kopie des Azure-Pipelines-Agenten. Bei Azure werden eingehende ICMP-Pakete werden für alle virtuellen Maschinen blockiert, so dass die Befehle ping und traceroute möglicherweise nicht funktionieren. Weitere Informationen zu den Ressourcen der Standard_DS2_v2-Maschinen findest Du unter „[Serien Dv2 und DSv2](https://docs.microsoft.com/azure/virtual-machines/dv2-dsv2-series#dsv2-series)“ in der Dokumentation zu Microsoft Azure.
{% data variables.product.prodname_dotcom %} verwendet [MacStadium](https://www.macstadium.com/), um die virtuellen macOS-Runner zu betreiben.
@@ -37,7 +37,7 @@ Du kannst in einem Workflow für jeden Job die Art des Runners festlegen. Jeder
Die virtuellen Maschinen unter Linux und macOS werden beide mit dem passwortlosen Befehl `sudo` ausgeführt. Wenn Sie Befehle ausführen oder Tools installieren müssen, die höhere Berechtigungen als der aktuelle Benutzer erfordern, können Sie `sudo` verwenden, ohne ein Passwort angeben zu müssen. Weitere Informationen findest Du im „[Sudo-Handbuch](https://www.sudo.ws/man/1.8.27/sudo.man.html)“.
-Die virtuellen Windows-Maschinen sind so konfiguriert, dass sie als Administratoren laufen, wobei die Benutzerkonten-Steuerung (UAC) deaktiviert ist. Weitere Informationen findest Du unter „[Funktionsweise der Benutzerkonten-Steuerung](https://docs.microsoft.com/de-de/windows/security/identity-protection/user-account-control/how-user-account-control-works)“ in der Dokumentation zu Windows.
+Die virtuellen Windows-Maschinen sind so konfiguriert, dass sie als Administratoren laufen, wobei die Benutzerkonten-Steuerung (UAC) deaktiviert ist. For more information, see "[How User Account Control works](https://docs.microsoft.com/windows/security/identity-protection/user-account-control/how-user-account-control-works)" in the Windows documentation.
### Unterstützte Runner und Hardwareressourcen
diff --git a/translations/de-DE/content/actions/reference/workflow-commands-for-github-actions.md b/translations/de-DE/content/actions/reference/workflow-commands-for-github-actions.md
index 20c544a042..99dd441c6b 100644
--- a/translations/de-DE/content/actions/reference/workflow-commands-for-github-actions.md
+++ b/translations/de-DE/content/actions/reference/workflow-commands-for-github-actions.md
@@ -164,6 +164,25 @@ Erstellt eine Fehlermeldung und fügt die Mitteilung in das Protokoll ein. Optio
echo "::error file=app.js,line=10,col=15::Something went wrong"
```
+### Grouping log lines
+
+```
+::group::{title}
+::endgroup::
+```
+
+Creates an expandable group in the log. To create a group, use the `group` command and specify a `title`. Anything you print to the log between the `group` and `endgroup` commands is nested inside an expandable entry in the log.
+
+#### Beispiel
+
+```bash
+echo "::group::My title"
+echo "Inside group"
+echo "::endgroup::"
+```
+
+
+
### Masking a value in log
`::add-mask::{value}`
@@ -259,7 +278,8 @@ echo "action_state=yellow" >> $GITHUB_ENV
Running `$action_state` in a future step will now return `yellow`
-#### Multline strings
+#### Multiline strings
+
For multiline strings, you may use a delimiter with the following syntax.
```
@@ -268,7 +288,8 @@ For multiline strings, you may use a delimiter with the following syntax.
{delimiter}
```
-#### Beispiel
+##### Beispiel
+
In this example, we use `EOF` as a delimiter and set the `JSON_RESPONSE` environment variable to the value of the curl response.
```
steps:
diff --git a/translations/de-DE/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md b/translations/de-DE/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
index 2da5e6c0df..43c31f32d6 100644
--- a/translations/de-DE/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
+++ b/translations/de-DE/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
@@ -10,7 +10,7 @@ versions:
### About authentication and user provisioning with Azure AD
-Azure Active Directory (Azure AD) is a service from Microsoft that allows you to centrally manage user accounts and access to web applications. For more information, see [What is Azure Active Directory?](https://docs.microsoft.com/en-us/azure/active-directory/fundamentals/active-directory-whatis) in the Microsoft Docs.
+Azure Active Directory (Azure AD) is a service from Microsoft that allows you to centrally manage user accounts and access to web applications. For more information, see [What is Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-whatis) in the Microsoft Docs.
To manage identity and access for {% data variables.product.product_name %}, you can use an Azure AD tenant as a SAML IdP for authentication. You can also configure Azure AD to automatically provision accounts and access with SCIM. This configuration allows you to assign or unassign the {% data variables.product.prodname_ghe_managed %} application for a user account in your Azure AD tenant to automatically create, grant access to, or deactivate a corresponding user account on {% data variables.product.product_name %}.
@@ -18,9 +18,9 @@ For more information about managing identity and access for your enterprise on {
### Vorrausetzungen
-To configure authentication and user provisioning for {% data variables.product.product_name %} using Azure AD, you must have an Azure AD account and tenant. For more information, see the [Azure AD website](https://azure.microsoft.com/en-us/free/active-directory) and [Quickstart: Create an Azure Active Directory tenant](https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-create-new-tenant) in the Microsoft Docs.
+To configure authentication and user provisioning for {% data variables.product.product_name %} using Azure AD, you must have an Azure AD account and tenant. For more information, see the [Azure AD website](https://azure.microsoft.com/free/active-directory) and [Quickstart: Create an Azure Active Directory tenant](https://docs.microsoft.com/azure/active-directory/develop/quickstart-create-new-tenant) in the Microsoft Docs.
-{% data reusables.saml.assert-the-administrator-attribute %} For more information about including the `administrator` attribute in the SAML claim from Azure AD, see [How to: customize claims issued in the SAML token for enterprise applications](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-saml-claims-customization) in the Microsoft Docs.
+{% data reusables.saml.assert-the-administrator-attribute %} For more information about including the `administrator` attribute in the SAML claim from Azure AD, see [How to: customize claims issued in the SAML token for enterprise applications](https://docs.microsoft.com/azure/active-directory/develop/active-directory-saml-claims-customization) in the Microsoft Docs.
{% data reusables.saml.create-a-machine-user %}
diff --git a/translations/de-DE/content/admin/authentication/using-saml.md b/translations/de-DE/content/admin/authentication/using-saml.md
index b105bd09db..3559146f1a 100644
--- a/translations/de-DE/content/admin/authentication/using-saml.md
+++ b/translations/de-DE/content/admin/authentication/using-saml.md
@@ -29,7 +29,7 @@ Jeder {% data variables.product.prodname_ghe_server %}-Benutzername wird nach Pr
Das Element `NameID` ist selbst dann erforderlich, wenn andere Attribute vorhanden sind.
-Zwischen `NameID` und dem {% data variables.product.prodname_ghe_server %}-Benutzernamen wird eine Zuordnung erstellt, daher sollte `NameID` persistent, eindeutig und für den Lebenszyklus des Benutzers nicht änderbar sein.
+A mapping is created between the `NameID` and the {% data variables.product.prodname_ghe_server %} username, so the `NameID` should be persistent, unique, and not subject to change for the lifecycle of the user.
{% note %}
diff --git a/translations/de-DE/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md b/translations/de-DE/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md
index 453cf1d088..cdbd47a7aa 100644
--- a/translations/de-DE/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md
+++ b/translations/de-DE/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md
@@ -1,11 +1,11 @@
---
title: Enabling alerts for vulnerable dependencies on GitHub Enterprise Server
-intro: 'You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_ghe_cloud %} and enable {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies in repositories in your instance.'
+intro: 'You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_ghe_cloud %} and enable {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies in repositories in your instance.'
redirect_from:
- /enterprise/admin/installation/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server
- /enterprise/admin/configuration/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server
- /enterprise/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server
-permissions: 'Site administrators for {% data variables.product.prodname_ghe_server %} who are also owners of the connected {% data variables.product.prodname_ghe_cloud %} organization or enterprise account can enable {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}.'
+permissions: 'Site administrators for {% data variables.product.prodname_ghe_server %} who are also owners of the connected {% data variables.product.prodname_ghe_cloud %} organization or enterprise account can enable {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}.'
versions:
enterprise-server: '*'
---
@@ -14,11 +14,11 @@ versions:
{% data reusables.repositories.tracks-vulnerabilities %} For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)."
-You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}, then sync vulnerability data to your instance and generate {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts in repositories with a vulnerable dependency.
+You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}, then sync vulnerability data to your instance and generate {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts in repositories with a vulnerable dependency.
-After connecting {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %} and enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies, vulnerability data is synced from {% data variables.product.prodname_dotcom_the_website %} to your instance once every hour. Sie können die Schwachstellendaten auch jederzeit manuell synchronisieren. Es werden weder Code noch Informationen zu Code von {% data variables.product.product_location %} auf {% data variables.product.prodname_dotcom_the_website %} hochgeladen.
+After connecting {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %} and enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies, vulnerability data is synced from {% data variables.product.prodname_dotcom_the_website %} to your instance once every hour. Sie können die Schwachstellendaten auch jederzeit manuell synchronisieren. Es werden weder Code noch Informationen zu Code von {% data variables.product.product_location %} auf {% data variables.product.prodname_dotcom_the_website %} hochgeladen.
-{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate {% data variables.product.prodname_dependabot_short %} alerts. You can customize how you receive {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)."
+{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate {% data variables.product.prodname_dependabot_alerts %}. You can customize how you receive {% data variables.product.prodname_dependabot_alerts %}. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-dependabot-alerts)."
{% endif %}
{% if currentVersion == "enterprise-server@2.21" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate security alerts. You can customize how you receive security alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)."
@@ -28,23 +28,25 @@ After connecting {% data variables.product.product_location %} to {% data variab
{% endif %}
{% if currentVersion ver_gt "enterprise-server@2.21" %}
-### Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}
+### Enabling {% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}
{% else %}
### Sicherheitsmeldungen für angreifbare Abhängigkeiten auf {% data variables.product.prodname_ghe_server %} aktivieren
{% endif %}
-Before enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}, you must connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}. Weitere Informationen finden Sie unter „[{% data variables.product.prodname_ghe_server %} mit {% data variables.product.prodname_ghe_cloud %} verbinden](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)“.
+Before enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}, you must connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}. Weitere Informationen finden Sie unter „[{% data variables.product.prodname_ghe_server %} mit {% data variables.product.prodname_ghe_cloud %} verbinden](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)“.
{% if currentVersion ver_gt "enterprise-server@2.20" %}
-{% if currentVersion ver_gt "enterprise-server@2.21" %}We recommend configuring {% data variables.product.prodname_dependabot_short %} alerts without notifications for the first few days to avoid an overload of emails. After a few days, you can enable notifications to receive {% data variables.product.prodname_dependabot_short %} alerts as usual.{% endif %}
+{% if currentVersion ver_gt "enterprise-server@2.21" %}We recommend configuring {% data variables.product.prodname_dependabot_alerts %} without notifications for the first few days to avoid an overload of emails. After a few days, you can enable notifications to receive {% data variables.product.prodname_dependabot_alerts %} as usual.{% endif %}
{% if currentVersion == "enterprise-server@2.21" %}We recommend configuring security alerts without notifications for the first few days to avoid an overload of emails. After a few days, you can enable notifications to receive security alerts as usual.{% endif %}
{% endif %}
{% data reusables.enterprise_site_admin_settings.sign-in %}
-1. In the administrative shell, enable the {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}:
+
+1. In the administrative shell, enable the {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}:
+
``` shell
$ ghe-dep-graph-enable
```
diff --git a/translations/de-DE/content/admin/enterprise-management/monitoring-cluster-nodes.md b/translations/de-DE/content/admin/enterprise-management/monitoring-cluster-nodes.md
index 3195e5f048..9b80d1f44e 100644
--- a/translations/de-DE/content/admin/enterprise-management/monitoring-cluster-nodes.md
+++ b/translations/de-DE/content/admin/enterprise-management/monitoring-cluster-nodes.md
@@ -34,26 +34,34 @@ Sie können [Nagios](https://www.nagios.org/) für die Überwachung von {% data
#### Nagios-Host konfigurieren
1. Generieren Sie einen SSH-Schlüssel mit einer leeren Passphrase. Nagios verwendet diese, um sich beim {% data variables.product.prodname_ghe_server %}-Cluster zu authentifizieren.
```shell
- nagiosuser@nagios:~$ ssh-keygen -t rsa -b 4096
- > Generating public/private rsa key pair.
- > Enter file in which to save the key (/home/nagiosuser/.ssh/id_rsa):
+ nagiosuser@nagios:~$ ssh-keygen -t ed25519
+ > Generating public/private ed25519 key pair.
+ > Enter file in which to save the key (/home/nagiosuser/.ssh/id_ed25519):
> Enter passphrase (empty for no passphrase): leave blank by pressing enter
> Enter same passphrase again: press enter again
- > Your identification has been saved in /home/nagiosuser/.ssh/id_rsa.
- > Your public key has been saved in /home/nagiosuser/.ssh/id_rsa.pub.
+ > Your identification has been saved in /home/nagiosuser/.ssh/id_ed25519.
+ > Your public key has been saved in /home/nagiosuser/.ssh/id_ed25519.pub.
```
{% danger %}
**Sicherheitswarnung:** Ein SSH-Schlüssel ohne eine Passphrase kann ein Sicherheitsrisiko darstellen, wenn er für den vollen Zugriff auf einen Host berechtigt ist. Begrenzen Sie die Autorisierung dieses Schlüssels auf einen einzelnen schreibgeschützten Befehl.
{% enddanger %}
-2. Kopieren Sie den privaten Schlüssel (`id_rsa`) in den Startordner `nagios`, und legen Sie die entsprechende Inhaberschaft fest.
+ {% note %}
+
+ **Note:** If you're using a distribution of Linux that doesn't support the Ed25519 algorithm, use the command:
```shell
- nagiosuser@nagios:~$ sudo cp .ssh/id_rsa /var/lib/nagios/.ssh/
- nagiosuser@nagios:~$ sudo chown nagios:nagios /var/lib/nagios/.ssh/id_rsa
+ nagiosuser@nagios:~$ ssh-keygen -t rsa -b 4096
```
-3. Verwenden Sie das Präfix `command=` in der Datei `/data/user/common/authorized_keys`, um den öffentlichen Schlüssel *nur* für den Befehl `ghe-cluster-status -n` zu autorisieren. Ändern Sie in der Verwaltungsshell oder auf einem beliebigen Knoten diese Datei, um den in Schritt 1 generierten öffentlichen Schlüssel hinzuzufügen. Zum Beispiel: `command="/usr/local/bin/ghe-cluster-status -n" ssh-rsa AAAA....`
+ {% endnote %}
+2. Copy the private key (`id_ed25519`) to the `nagios` home folder and set the appropriate ownership.
+ ```shell
+ nagiosuser@nagios:~$ sudo cp .ssh/id_ed25519 /var/lib/nagios/.ssh/
+ nagiosuser@nagios:~$ sudo chown nagios:nagios /var/lib/nagios/.ssh/id_ed25519
+ ```
+
+3. Verwenden Sie das Präfix `command=` in der Datei `/data/user/common/authorized_keys`, um den öffentlichen Schlüssel *nur* für den Befehl `ghe-cluster-status -n` zu autorisieren. Ändern Sie in der Verwaltungsshell oder auf einem beliebigen Knoten diese Datei, um den in Schritt 1 generierten öffentlichen Schlüssel hinzuzufügen. For example: `command="/usr/local/bin/ghe-cluster-status -n" ssh-ed25519 AAAA....`
4. Validieren und kopieren Sie die Konfiguration auf jeden Knoten im Cluster. Führen Sie dazu `ghe-cluster-config-apply` auf dem Knoten aus, auf dem Sie die Datei `/data/user/common/authorized_keys` geändert haben.
diff --git a/translations/de-DE/content/admin/enterprise-management/upgrading-github-enterprise-server.md b/translations/de-DE/content/admin/enterprise-management/upgrading-github-enterprise-server.md
index a42694e5f8..d546338d27 100644
--- a/translations/de-DE/content/admin/enterprise-management/upgrading-github-enterprise-server.md
+++ b/translations/de-DE/content/admin/enterprise-management/upgrading-github-enterprise-server.md
@@ -49,7 +49,7 @@ Es gibt zwei Snapshot-Typen:
| Plattform | Snapshot-Methode | URL zur Snapshot-Dokumentation |
| --------------------- | ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
| Amazon AWS | Disk | |
-| Azure | VM | |
+| Azure | VM | |
| Hyper-V | VM | |
| Google Compute Engine | Disk | |
| VMware | VM | [https://pubs.vmware.com/vsphere-50/topic/com.vmware.wssdk.pg.doc_50/PG_Ch11_VM_Manage.13.3.html](https://pubs.vmware.com/vsphere-50/topic/com.vmware.wssdk.pg.doc_50/PG_Ch11_VM_Manage.13.3.html) |
diff --git a/translations/de-DE/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/de-DE/content/admin/enterprise-support/about-github-enterprise-support.md
index 92ab4555dc..b531327a98 100644
--- a/translations/de-DE/content/admin/enterprise-support/about-github-enterprise-support.md
+++ b/translations/de-DE/content/admin/enterprise-support/about-github-enterprise-support.md
@@ -29,9 +29,16 @@ In addition to all of the benefits of {% data variables.contact.enterprise_suppo
- Schriftlicher Support rund um die Uhr über unser Supportportal
- Telefonischer Support rund um die Uhr
- A{% if currentVersion == "github-ae@latest" %}n enhanced{% endif %} Service Level Agreement (SLA) {% if enterpriseServerVersions contains currentVersion %}with guaranteed initial response times{% endif %}
- - Access to premium content{% if enterpriseServerVersions contains currentVersion %}
- - Scheduled health checks{% endif %}
- - Verwaltete Dienste
+{% if currentVersion == "github-ae@latest" %}
+ - An assigned Technical Service Account Manager
+ - Quarterly support reviews
+ - Managed Admin services
+{% else if enterpriseServerVersions contains currentVersion %}
+ - Technical account managers
+ - Zugriff auf Premium-Inhalte
+ - Geplante Zustandsprüfungen
+ - Managed Admin hours
+{% endif %}
{% data reusables.support.government-response-times-may-vary %}
diff --git a/translations/de-DE/content/admin/enterprise-support/submitting-a-ticket.md b/translations/de-DE/content/admin/enterprise-support/submitting-a-ticket.md
index 504c70e802..d0a0c79df2 100644
--- a/translations/de-DE/content/admin/enterprise-support/submitting-a-ticket.md
+++ b/translations/de-DE/content/admin/enterprise-support/submitting-a-ticket.md
@@ -51,7 +51,7 @@ After submitting your support request and optional diagnostic information,
{% if currentVersion == "github-ae@latest" %}
### Ticket über das {% data variables.contact.ae_azure_portal %} absenden
-Commercial customers can submit a support request in the {% data variables.contact.contact_ae_portal %}. Government customers should use the [Azure portal for government customers](https://portal.azure.us/#blade/Microsoft_Azure_Support/HelpAndSupportBlade). For more information, see [Create an Azure support request](https://docs.microsoft.com/en-us/azure/azure-portal/supportability/how-to-create-azure-support-request) in the Microsoft documentation.
+Commercial customers can submit a support request in the {% data variables.contact.contact_ae_portal %}. Government customers should use the [Azure portal for government customers](https://portal.azure.us/#blade/Microsoft_Azure_Support/HelpAndSupportBlade). For more information, see [Create an Azure support request](https://docs.microsoft.com/azure/azure-portal/supportability/how-to-create-azure-support-request) in the Microsoft documentation.
For urgent issues, to ensure a quick response, after you submit a ticket, please call the support hotline immediately. Your Technical Support Account Manager (TSAM) will provide you with the number to use in your onboarding session.
diff --git a/translations/de-DE/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md b/translations/de-DE/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md
index 60e03a011b..37a543f948 100644
--- a/translations/de-DE/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md
+++ b/translations/de-DE/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md
@@ -12,7 +12,7 @@ versions:
### About {% data variables.product.prodname_actions %} permissions for your enterprise
-When you enable {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %}, it is enabled for all organizations in your enterprise. You can choose to disable {% data variables.product.prodname_actions %} for all organizations in your enterprise, or only allow specific organizations. You can also limit the use of public actions, so that people can only use local actions that exist in an organization.
+When you enable {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %}, it is enabled for all organizations in your enterprise. You can choose to disable {% data variables.product.prodname_actions %} for all organizations in your enterprise, or only allow specific organizations. You can also limit the use of public actions, so that people can only use local actions that exist in your enterprise.
### Managing {% data variables.product.prodname_actions %} permissions for your enterprise
diff --git a/translations/de-DE/content/admin/installation/installing-github-enterprise-server-on-azure.md b/translations/de-DE/content/admin/installation/installing-github-enterprise-server-on-azure.md
index 500133538d..ea12c1bf74 100644
--- a/translations/de-DE/content/admin/installation/installing-github-enterprise-server-on-azure.md
+++ b/translations/de-DE/content/admin/installation/installing-github-enterprise-server-on-azure.md
@@ -14,7 +14,7 @@ Sie können {% data variables.product.prodname_ghe_server %} auf Global Azure od
- {% data reusables.enterprise_installation.software-license %}
- Sie müssen über ein Azure-Konto verfügen, das neue Computer bereitstellen kann. Weitere Informationen finden Sie auf der „[Microsoft Azure-Website](https://azure.microsoft.com)“.
-- Die meisten Aktionen, die zum Starten Ihrer virtuellen Maschine (VM) erforderlich sind, können auch mithilfe des Azure-Portals ausgeführt werden. Zur Ersteinrichtung sollten Sie jedoch die Azure-Befehlszeilenschnittstelle (CLI) installieren. Im Folgenden finden Sie Beispiele zur Verwendung der Azure CLI 2.0. Weitere Informationen finden Sie im Azure-Leitfaden „[Installieren der Azure CLI](https://docs.microsoft.com/de-de/cli/azure/install-azure-cli?view=azure-cli-latest)“.
+- Die meisten Aktionen, die zum Starten Ihrer virtuellen Maschine (VM) erforderlich sind, können auch mithilfe des Azure-Portals ausgeführt werden. Zur Ersteinrichtung sollten Sie jedoch die Azure-Befehlszeilenschnittstelle (CLI) installieren. Im Folgenden finden Sie Beispiele zur Verwendung der Azure CLI 2.0. For more information, see Azure's guide "[Install Azure CLI 2.0](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest)."
### Grundlegendes zur Hardware
@@ -26,9 +26,9 @@ Bevor Sie {% data variables.product.product_location %} auf Azure starten, müss
#### Unterstützte VM-Typen und -Regionen
-Für die {% data variables.product.prodname_ghe_server %}-Appliance ist eine Premium-Storage-Daten-Disk erforderlich. Zudem wird sie auf jeder Azure-VM unterstützt, die Premium-Storage unterstützt. Weitere Informationen finden Sie unter „[SSD Premium](https://docs.microsoft.com/en-us/azure/storage/common/storage-premium-storage#supported-vms)“ in der Azure-Dokumentation. Allgemeine Informationen zu den verfügbaren VMs finden Sie auf der Übersichtsseite zu [Azure-VMs](https://azure.microsoft.com/de-de/pricing/details/virtual-machines/linux/#Linux).
+Für die {% data variables.product.prodname_ghe_server %}-Appliance ist eine Premium-Storage-Daten-Disk erforderlich. Zudem wird sie auf jeder Azure-VM unterstützt, die Premium-Storage unterstützt. Weitere Informationen finden Sie unter „[SSD Premium](https://docs.microsoft.com/azure/storage/common/storage-premium-storage#supported-vms)“ in der Azure-Dokumentation. For general information about available VMs, see [the Azure virtual machines overview page](https://azure.microsoft.com/pricing/details/virtual-machines/#Linux).
-{% data variables.product.prodname_ghe_server %} unterstützt jede Region, die Ihren VM-Typ unterstützt. Weitere Informationen zu den unterstützten Regionen für jede VM finden Sie auf der Azure-Website „[Verfügbare Produkte nach Region](https://azure.microsoft.com/de-de/regions/services/)“.
+{% data variables.product.prodname_ghe_server %} unterstützt jede Region, die Ihren VM-Typ unterstützt. For more information about the supported regions for each VM, see Azure's "[Products available by region](https://azure.microsoft.com/regions/services/)."
#### Empfohlene VM-Typen
@@ -47,20 +47,20 @@ Sie sollten einen DS v2-Instanztyp mit mindestens 14 GB RAM verwenden. Sie könn
{% data reusables.enterprise_installation.create-ghe-instance %}
-1. Suchen Sie nach dem neuesten {% data variables.product.prodname_ghe_server %}-Appliance-Image. Weitere Informationen zum Befehl `vm image list` finden Sie unter „[az vm image list](https://docs.microsoft.com/en-us/cli/azure/vm/image?view=azure-cli-latest#az_vm_image_list)“ in der Microsoft-Dokumentation.
+1. Suchen Sie nach dem neuesten {% data variables.product.prodname_ghe_server %}-Appliance-Image. Weitere Informationen zum Befehl `vm image list` finden Sie unter „[az vm image list](https://docs.microsoft.com/cli/azure/vm/image?view=azure-cli-latest#az_vm_image_list)“ in der Microsoft-Dokumentation.
```shell
$ az vm image list --all -f GitHub-Enterprise | grep '"urn":' | sort -V
```
-2. Erstellen Sie mithilfe des von Ihnen ermittelten Appliance-Images eine neue VM. Weitere Informationen finden Sie unter „[az vm create](https://docs.microsoft.com/en-us/cli/azure/vm?view=azure-cli-latest#az_vm_create)“ in der Microsoft-Dokumentation.
+2. Erstellen Sie mithilfe des von Ihnen ermittelten Appliance-Images eine neue VM. Weitere Informationen finden Sie unter „[az vm create](https://docs.microsoft.com/cli/azure/vm?view=azure-cli-latest#az_vm_create)“ in der Microsoft-Dokumentation.
- Übergeben Sie Optionen für den Namen Ihrer VM, den Ressourcentyp, die Größe Ihrer VM, den Namen Ihrer bevorzugten Azure-Region, den Namen der von Ihnen im vorherigen Schritt aufgelisteten Appliance-Image-VM und die Storage-SKU für den Premium-Storage. Weitere Informationen zu Ressourcengruppen finden Sie unter „[Ressourcengruppen](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-overview#resource-groups)“ in der Microsoft-Dokumentation.
+ Übergeben Sie Optionen für den Namen Ihrer VM, den Ressourcentyp, die Größe Ihrer VM, den Namen Ihrer bevorzugten Azure-Region, den Namen der von Ihnen im vorherigen Schritt aufgelisteten Appliance-Image-VM und die Storage-SKU für den Premium-Storage. Weitere Informationen zu Ressourcengruppen finden Sie unter „[Ressourcengruppen](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-overview#resource-groups)“ in der Microsoft-Dokumentation.
```shell
$ az vm create -n VM_NAME -g RESOURCE_GROUP --size VM_SIZE -l REGION --image APPLIANCE_IMAGE_NAME --storage-sku Premium_LRS
```
-3. Konfigurieren Sie die Sicherheitseinstellungen auf Ihrer VM, um die erforderlichen Ports zu öffnen. Weitere Informationen finden Sie unter „[az vm open-port](https://docs.microsoft.com/en-us/cli/azure/vm?view=azure-cli-latest#az_vm_open_port)“ in der Microsoft-Dokumentation. In der folgenden Tabelle finden Sie eine Beschreibung der einzelnen Ports, um festzustellen, welche Ports Sie öffnen müssen.
+3. Konfigurieren Sie die Sicherheitseinstellungen auf Ihrer VM, um die erforderlichen Ports zu öffnen. Weitere Informationen finden Sie unter „[az vm open-port](https://docs.microsoft.com/cli/azure/vm?view=azure-cli-latest#az_vm_open_port)“ in der Microsoft-Dokumentation. In der folgenden Tabelle finden Sie eine Beschreibung der einzelnen Ports, um festzustellen, welche Ports Sie öffnen müssen.
```shell
$ az vm open-port -n VM_NAME -g RESOURCE_GROUP --port PORT_NUMBER
@@ -70,7 +70,7 @@ Sie sollten einen DS v2-Instanztyp mit mindestens 14 GB RAM verwenden. Sie könn
{% data reusables.enterprise_installation.necessary_ports %}
-4. Erstelle eine neue unverschlüsselte Daten-Festplatte, hänge sie an die VM und konfiguriere die Größe entsprechend Deiner Anzahl von Benutzerlizenzen. Weitere Informationen finden Sie unter „[az vm disk attach](https://docs.microsoft.com/en-us/cli/azure/vm/disk?view=azure-cli-latest#az_vm_disk_attach)“ in der Microsoft-Dokumentation.
+4. Erstelle eine neue unverschlüsselte Daten-Festplatte, hänge sie an die VM und konfiguriere die Größe entsprechend Deiner Anzahl von Benutzerlizenzen. Weitere Informationen finden Sie unter „[az vm disk attach](https://docs.microsoft.com/cli/azure/vm/disk?view=azure-cli-latest#az_vm_disk_attach)“ in der Microsoft-Dokumentation.
Übergeben Sie Optionen für den Namen Ihrer VM (z. B. `ghe-acme-corp`), die Ressourcengruppe, die Premium-Storage-SKU, die Größe der Disk (z. B. `100`) und einen Namen für die resultierende VHD.
@@ -86,7 +86,7 @@ Sie sollten einen DS v2-Instanztyp mit mindestens 14 GB RAM verwenden. Sie könn
### {% data variables.product.prodname_ghe_server %}-VM konfigurieren
-1. Vor der VM-Konfiguration müssen Sie darauf warten, dass sie den Status „ReadyRole“ aufweist. Führen Sie den Befehl `vm list` aus, um den Status der VM zu überprüfen. Weitere Informationen finden Sie unter „[az vm list](https://docs.microsoft.com/en-us/cli/azure/vm?view=azure-cli-latest#az_vm_list)“ in der Microsoft-Dokumentation.
+1. Vor der VM-Konfiguration müssen Sie darauf warten, dass sie den Status „ReadyRole“ aufweist. Führen Sie den Befehl `vm list` aus, um den Status der VM zu überprüfen. Weitere Informationen finden Sie unter „[az vm list](https://docs.microsoft.com/cli/azure/vm?view=azure-cli-latest#az_vm_list)“ in der Microsoft-Dokumentation.
```shell
$ az vm list -d -g RESOURCE_GROUP -o table
> Name ResourceGroup PowerState PublicIps Fqdns Location Zones
@@ -96,7 +96,7 @@ Sie sollten einen DS v2-Instanztyp mit mindestens 14 GB RAM verwenden. Sie könn
```
{% note %}
- **Hinweis:** Azure erstellt nicht automatisch einen FQDN-Eintrag für die VM. Weitere Informationen finden Sie im Azure-Leitfaden „[Erstellen eines vollqualifizierten Domänennamens im Azure-Portal für eine Linux-VM](https://docs.microsoft.com/de-de/azure/virtual-machines/linux/portal-create-fqdn)“.
+ **Hinweis:** Azure erstellt nicht automatisch einen FQDN-Eintrag für die VM. For more information, see Azure's guide on how to "[Create a fully qualified domain name in the Azure portal for a Linux VM](https://docs.microsoft.com/azure/virtual-machines/linux/portal-create-fqdn)."
{% endnote %}
diff --git a/translations/de-DE/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md b/translations/de-DE/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md
index ac8437259c..996a3ea72f 100644
--- a/translations/de-DE/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md
+++ b/translations/de-DE/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md
@@ -12,7 +12,7 @@ versions:
- {% data reusables.enterprise_installation.software-license %}
- Sie müssen über Windows Server 2008 bis Windows Server 2016 mit Hyper-V-Unterstützung verfügen.
-- Die meisten Aktionen, die zum Erstellen Ihrer virtuellen Maschine (VM) erforderlich sind, können auch mit dem [Hyper-V-Manager](https://docs.microsoft.com/de-de/windows-server/virtualization/hyper-v/manage/remotely-manage-hyper-v-hosts) ausgeführt werden. Zur Ersteinrichtung sollten Sie jedoch die Windows PowerShell-Befehlszeilenshell verwenden. Im Folgenden finden Sie Beispiele zur Verwendung der PowerShell. Weitere Informationen finden Sie im Microsoft-Leitfaden unter „[Erste Schritte mit Windows PowerShell](https://docs.microsoft.com/de-de/powershell/scripting/getting-started/getting-started-with-windows-powershell?view=powershell-5.1)“.
+- Most actions needed to create your virtual machine (VM) may also be performed using the [Hyper-V Manager](https://docs.microsoft.com/windows-server/virtualization/hyper-v/manage/remotely-manage-hyper-v-hosts). Zur Ersteinrichtung sollten Sie jedoch die Windows PowerShell-Befehlszeilenshell verwenden. Im Folgenden finden Sie Beispiele zur Verwendung der PowerShell. For more information, see the Microsoft guide "[Getting Started with Windows PowerShell](https://docs.microsoft.com/powershell/scripting/getting-started/getting-started-with-windows-powershell?view=powershell-5.1)."
### Grundlegendes zur Hardware
@@ -30,23 +30,23 @@ versions:
{% data reusables.enterprise_installation.create-ghe-instance %}
-1. Erstelle in PowerShell eine neue virtuelle Maschine der 1. Generation, konfiguriere die Größe anhand der Anzahl Deiner verfügbaren Benutzerlizenzen, und hänge das von Dir heruntergeladene {% data variables.product.prodname_ghe_server %}-Image an. Weitere Informationen finden Sie unter „[New-VM](https://docs.microsoft.com/en-us/powershell/module/hyper-v/new-vm?view=win10-ps)“ in der Microsoft-Dokumentation.
+1. Erstelle in PowerShell eine neue virtuelle Maschine der 1. Generation, konfiguriere die Größe anhand der Anzahl Deiner verfügbaren Benutzerlizenzen, und hänge das von Dir heruntergeladene {% data variables.product.prodname_ghe_server %}-Image an. Weitere Informationen finden Sie unter „[New-VM](https://docs.microsoft.com/powershell/module/hyper-v/new-vm?view=win10-ps)“ in der Microsoft-Dokumentation.
```shell
PS C:\> New-VM -Generation 1 -Name VM_NAME -MemoryStartupBytes MEMORY_SIZE -BootDevice VHD -VHDPath PATH_TO_VHD
```
-{% data reusables.enterprise_installation.create-attached-storage-volume %} Ersetzen Sie `PATH_TO_DATA_DISK` durch den Verzeichnispfad, an dem Sie die Disk erstellen. Weitere Informationen finden Sie unter „[New-VHD](https://docs.microsoft.com/en-us/powershell/module/hyper-v/new-vhd?view=win10-ps)“ in der Microsoft-Dokumentation.
+{% data reusables.enterprise_installation.create-attached-storage-volume %} Ersetzen Sie `PATH_TO_DATA_DISK` durch den Verzeichnispfad, an dem Sie die Disk erstellen. Weitere Informationen finden Sie unter „[New-VHD](https://docs.microsoft.com/powershell/module/hyper-v/new-vhd?view=win10-ps)“ in der Microsoft-Dokumentation.
```shell
PS C:\> New-VHD -Path PATH_TO_DATA_DISK -SizeBytes DISK_SIZE
```
-3. Hängen Sie die Daten-Disk an Ihre Instanz an. Weitere Informationen finden Sie unter „[Add-VMHardDiskDrive](https://docs.microsoft.com/en-us/powershell/module/hyper-v/add-vmharddiskdrive?view=win10-ps)“ in der Microsoft-Dokumentation.
+3. Hängen Sie die Daten-Disk an Ihre Instanz an. Weitere Informationen finden Sie unter „[Add-VMHardDiskDrive](https://docs.microsoft.com/powershell/module/hyper-v/add-vmharddiskdrive?view=win10-ps)“ in der Microsoft-Dokumentation.
```shell
PS C:\> Add-VMHardDiskDrive -VMName VM_NAME -Path PATH_TO_DATA_DISK
```
-4. Starten Sie die VM. Weitere Informationen finden Sie unter „[Start-VM](https://docs.microsoft.com/en-us/powershell/module/hyper-v/start-vm?view=win10-ps)“ in der Microsoft-Dokumentation.
+4. Starten Sie die VM. Weitere Informationen finden Sie unter „[Start-VM](https://docs.microsoft.com/powershell/module/hyper-v/start-vm?view=win10-ps)“ in der Microsoft-Dokumentation.
```shell
PS C:\> Start-VM -Name VM_NAME
```
-5. Rufen Sie die IP-Adresse Ihrer VM ab. Weitere Informationen finden Sie unter „[Get-VMNetworkAdapter](https://docs.microsoft.com/en-us/powershell/module/hyper-v/get-vmnetworkadapter?view=win10-ps)“ in der Microsoft-Dokumentation.
+5. Rufen Sie die IP-Adresse Ihrer VM ab. Weitere Informationen finden Sie unter „[Get-VMNetworkAdapter](https://docs.microsoft.com/powershell/module/hyper-v/get-vmnetworkadapter?view=win10-ps)“ in der Microsoft-Dokumentation.
```shell
PS C:\> (Get-VMNetworkAdapter -VMName VM_NAME).IpAddresses
```
diff --git a/translations/de-DE/content/admin/packages/configuring-third-party-storage-for-packages.md b/translations/de-DE/content/admin/packages/configuring-third-party-storage-for-packages.md
index f3dfd6acb5..523834c7e4 100644
--- a/translations/de-DE/content/admin/packages/configuring-third-party-storage-for-packages.md
+++ b/translations/de-DE/content/admin/packages/configuring-third-party-storage-for-packages.md
@@ -13,7 +13,7 @@ versions:
{% data variables.product.prodname_registry %} on {% data variables.product.prodname_ghe_server %} uses external blob storage to store your packages. The amount of storage required depends on your usage of {% data variables.product.prodname_registry %}.
-At this time, {% data variables.product.prodname_registry %} supports blob storage with Amazon Web Services (AWS) S3. MinIO is also supported, but configuration is not currently implemented in the {% data variables.product.product_name %} interface. You can use MinIO for storage by following the instructions for AWS S3, entering the analagous information for your MinIO configuration.
+At this time, {% data variables.product.prodname_registry %} supports blob storage with Amazon Web Services (AWS) S3. MinIO is also supported, but configuration is not currently implemented in the {% data variables.product.product_name %} interface. You can use MinIO for storage by following the instructions for AWS S3, entering the analogous information for your MinIO configuration.
For the best experience, we recommend using a dedicated bucket for {% data variables.product.prodname_registry %}, separate from the bucket you use for {% data variables.product.prodname_actions %} storage.
diff --git a/translations/de-DE/content/admin/policies/creating-a-pre-receive-hook-script.md b/translations/de-DE/content/admin/policies/creating-a-pre-receive-hook-script.md
index 659b79cbb3..eb8e2b696d 100644
--- a/translations/de-DE/content/admin/policies/creating-a-pre-receive-hook-script.md
+++ b/translations/de-DE/content/admin/policies/creating-a-pre-receive-hook-script.md
@@ -102,8 +102,8 @@ Sie können ein Pre-Receive-Hook-Skript lokal testen, bevor Sie es auf Ihrer {%
adduser git -D -G root -h /home/git -s /bin/bash && \
passwd -d git && \
su git -c "mkdir /home/git/.ssh && \
- ssh-keygen -t rsa -b 4096 -f /home/git/.ssh/id_rsa -P '' && \
- mv /home/git/.ssh/id_rsa.pub /home/git/.ssh/authorized_keys && \
+ ssh-keygen -t ed25519 -f /home/git/.ssh/id_ed25519 -P '' && \
+ mv /home/git/.ssh/id_ed25519.pub /home/git/.ssh/authorized_keys && \
mkdir /home/git/test.git && \
git --bare init /home/git/test.git"
@@ -135,7 +135,7 @@ Sie können ein Pre-Receive-Hook-Skript lokal testen, bevor Sie es auf Ihrer {%
> Sending build context to Docker daemon 3.584 kB
> Step 1 : FROM gliderlabs/alpine:3.3
> ---> 8944964f99f4
- > Step 2 : RUN apk add --no-cache git openssh bash && ssh-keygen -A && sed -i "s/#AuthorizedKeysFile/AuthorizedKeysFile/g" /etc/ssh/sshd_config && adduser git -D -G root -h /home/git -s /bin/bash && passwd -d git && su git -c "mkdir /home/git/.ssh && ssh-keygen -t rsa -b 4096 -f /home/git/.ssh/id_rsa -P ' && mv /home/git/.ssh/id_rsa.pub /home/git/.ssh/authorized_keys && mkdir /home/git/test.git && git --bare init /home/git/test.git"
+ > Step 2 : RUN apk add --no-cache git openssh bash && ssh-keygen -A && sed -i "s/#AuthorizedKeysFile/AuthorizedKeysFile/g" /etc/ssh/sshd_config && adduser git -D -G root -h /home/git -s /bin/bash && passwd -d git && su git -c "mkdir /home/git/.ssh && ssh-keygen -t ed25519 -f /home/git/.ssh/id_ed25519 -P ' && mv /home/git/.ssh/id_ed25519.pub /home/git/.ssh/authorized_keys && mkdir /home/git/test.git && git --bare init /home/git/test.git"
> ---> Running in e9d79ab3b92c
> fetch http://alpine.gliderlabs.com/alpine/v3.3/main/x86_64/APKINDEX.tar.gz
> fetch http://alpine.gliderlabs.com/alpine/v3.3/community/x86_64/APKINDEX.tar.gz
@@ -143,9 +143,9 @@ Sie können ein Pre-Receive-Hook-Skript lokal testen, bevor Sie es auf Ihrer {%
> OK: 34 MiB in 26 packages
> ssh-keygen: generating new host keys: RSA DSA ECDSA ED25519
> Password for git changed by root
- > Generating public/private rsa key pair.
- > Your identification has been saved in /home/git/.ssh/id_rsa.
- > Your public key has been saved in /home/git/.ssh/id_rsa.pub.
+ > Generating public/private ed25519 key pair.
+ > Your identification has been saved in /home/git/.ssh/id_ed25519.
+ > Your public key has been saved in /home/git/.ssh/id_ed25519.pub.
....truncated output....
> Initialized empty Git repository in /home/git/test.git/
> Successfully built dd8610c24f82
@@ -173,7 +173,7 @@ Sie können ein Pre-Receive-Hook-Skript lokal testen, bevor Sie es auf Ihrer {%
9. Kopieren Sie den generierten SSH-Schlüssel aus dem Datencontainer auf den lokalen Computer:
```shell
- $ docker cp data:/home/git/.ssh/id_rsa .
+ $ docker cp data:/home/git/.ssh/id_ed25519 .
```
10. Ändern Sie die Remote-Instanz eines Test-Repositorys, und übertragen Sie das Repository `test.git` per Push-Vorgang innerhalb des Docker-Containers. In diesem Beispiel wird `git@github.com:octocat/Hello-World.git` verwendet. Sie können jedoch auch andere Repositorys verwenden. In diesem Beispiel wird davon ausgegangen, dass Ihr lokaler Computer (127.0.0.1) den Port 52311 bindet. Sie können jedoch eine andere IP-Adresse verwenden, wenn Docker auf einem Remote-Computer ausgeführt wird.
@@ -182,7 +182,7 @@ Sie können ein Pre-Receive-Hook-Skript lokal testen, bevor Sie es auf Ihrer {%
$ git clone git@github.com:octocat/Hello-World.git
$ cd Hello-World
$ git remote add test git@127.0.0.1:test.git
- $ GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 52311 -i ../id_rsa" git push -u test main
+ $ GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 52311 -i ../id_ed25519" git push -u test main
> Warning: Permanently added '[192.168.99.100]:52311' (ECDSA) to the list of known hosts.
> Counting objects: 7, done.
> Delta compression using up to 4 threads.
diff --git a/translations/de-DE/content/admin/user-management/auditing-users-across-your-enterprise.md b/translations/de-DE/content/admin/user-management/auditing-users-across-your-enterprise.md
index 440fcaaf6f..5693a7d9a0 100644
--- a/translations/de-DE/content/admin/user-management/auditing-users-across-your-enterprise.md
+++ b/translations/de-DE/content/admin/user-management/auditing-users-across-your-enterprise.md
@@ -66,9 +66,9 @@ Sie können nur einen {% data variables.product.product_name %}-Benutzernamen ve
Der Kennzeichner `org` begrenzt Aktionen auf eine bestimmte Organisation. Ein Beispiel:
-* `org:my-org` sucht nach allen Ereignissen in Bezug auf die Organisation `my-org`.
+* `org:my-org` finds all events that occurred for the `my-org` organization.
* `org:my-org action:team` sucht nach allen Teamereignissen, die in der Organisation `my-org` durchgeführt wurden.
-* `-org:my-org` schließt alle Ereignisse in Bezug auf die Organisation`my-org` aus.
+* `-org:my-org` excludes all events that occurred for the `my-org` organization.
#### Suche nach der Art der durchgeführten Aktion
diff --git a/translations/de-DE/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md b/translations/de-DE/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md
index df68fc1e77..0254ced011 100644
--- a/translations/de-DE/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md
+++ b/translations/de-DE/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md
@@ -80,12 +80,8 @@ Now that you've created and published your repository, you're ready to make chan
2. Make some changes to the _README.md_ file that you previously created. You can add information that describes your project, like what it does and why it is useful. When you are satisfied with your changes, save them in your text editor.
3. In {% data variables.product.prodname_desktop %}, navigate to the **Changes** view. In der Dateiliste sollte Ihre _README.md_-Datei angezeigt werden. The checkmark to the left of the _README.md_ file indicates that the changes you've made to the file will be part of the commit you make. Künftig möchten Sie möglicherweise an mehreren Dateien Änderungen vornehmen, gleichzeitig aber nur die Änderungen committen, die Sie an einigen der Dateien vorgenommen haben. If you click the checkmark next to a file, that file will not be included in the commit. 
-4. Geben Sie im unteren Bereich der Liste **Changes** eine Commit-Mitteilung ein. Geben Sie rechts neben Ihrem Profilbild eine kurze Beschreibung zum Commit ein. Da die Datei _README.md_ geändert wird, wäre „Informationen zum Projektzweck hinzufügen“ eine gute Commit-Zusammenfassung. Below the summary, you'll see a "Description" text field where you can type a longer description of the changes in the commit, which is helpful when looking back at the history of a project and understanding why changes were made. Da Sie eine grundlegende Aktualisierung an der Datei _README.md_ vornehmen, können Sie die Beschreibung auslassen.  <<<<<<< HEAD
-5. Click **Commit to BRANCH NAME**. The commit button shows your current branch so you can be sure to commit to the branch you want.
-
-=======
-5. Klicken Sie auf **Commit to master** (An master committen). The commit button shows your current branch, which in this case is `master`, so that you know which branch you are making a commit to. 
-> > > > > > > Master
+4. Geben Sie im unteren Bereich der Liste **Changes** eine Commit-Mitteilung ein. Geben Sie rechts neben Ihrem Profilbild eine kurze Beschreibung zum Commit ein. Da die Datei _README.md_ geändert wird, wäre „Informationen zum Projektzweck hinzufügen“ eine gute Commit-Zusammenfassung. Below the summary, you'll see a "Description" text field where you can type a longer description of the changes in the commit, which is helpful when looking back at the history of a project and understanding why changes were made. Da Sie eine grundlegende Aktualisierung an der Datei _README.md_ vornehmen, können Sie die Beschreibung auslassen. 
+5. Click **Commit to BRANCH NAME**. The commit button shows your current branch so you can be sure to commit to the branch you want. 
6. Klicken Sie auf **Push origin** (Per Push-Vorgang an origin übertragen), um Ihre Änderungen an das Remote-Repository auf {% data variables.product.product_name %} per Push-Vorgang zu übertragen. 
- The **Push origin** button is the same one that you clicked to publish your repository to {% data variables.product.product_name %}. This button changes contextually based on where you are at in the Git workflow. It should now say `Push origin` with a `1` next to it, indicating that there is one commit that has not been pushed up to {% data variables.product.product_name %}.
- The "origin" in **Push origin** means that you are pushing changes to the remote called `origin`, which in this case is your project's repository on {% data variables.product.prodname_dotcom_the_website %}. Bis Sie neue Commits per Push-Vorgang an {% data variables.product.product_name %} übertragen, gibt es Unterschiede zwischen dem Repository Ihres Projekts auf Ihrem Computer und dem Repository Ihres Projekts auf {% data variables.product.prodname_dotcom_the_website %}. This allows you to work locally and only push your changes to {% data variables.product.prodname_dotcom_the_website %} when you're ready.
diff --git a/translations/de-DE/content/developers/apps/creating-ci-tests-with-the-checks-api.md b/translations/de-DE/content/developers/apps/creating-ci-tests-with-the-checks-api.md
index d8d469a808..ad7bf69047 100644
--- a/translations/de-DE/content/developers/apps/creating-ci-tests-with-the-checks-api.md
+++ b/translations/de-DE/content/developers/apps/creating-ci-tests-with-the-checks-api.md
@@ -836,7 +836,7 @@ Here are a few common problems and some suggested solutions. If you run into any
* **Q:** My app isn't pushing code to GitHub. I don't see the fixes that RuboCop automatically makes!
- **A:** Make sure you have **Read & write** permissions for "Repository contents," and that you are cloning the repository with your intallation token. See [Step 2.2. Cloning the repository](#step-22-cloning-the-repository) for details.
+ **A:** Make sure you have **Read & write** permissions for "Repository contents," and that you are cloning the repository with your installation token. See [Step 2.2. Cloning the repository](#step-22-cloning-the-repository) for details.
* **Q:** I see an error in the `template_server.rb` debug output related to cloning my repository.
diff --git a/translations/de-DE/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md b/translations/de-DE/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
index bc6f1e753c..0ecffcb6b4 100644
--- a/translations/de-DE/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
+++ b/translations/de-DE/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
@@ -662,7 +662,7 @@ While most of your API interaction should occur using your server-to-server inst
* [Create commit signature protection](/v3/repos/branches/#create-commit-signature-protection)
* [Delete commit signature protection](/v3/repos/branches/#delete-commit-signature-protection)
* [Get status checks protection](/v3/repos/branches/#get-status-checks-protection)
-* [Update status check potection](/v3/repos/branches/#update-status-check-potection)
+* [Update status check protection](/v3/repos/branches/#update-status-check-protection)
* [Remove status check protection](/v3/repos/branches/#remove-status-check-protection)
* [Get all status check contexts](/v3/repos/branches/#get-all-status-check-contexts)
* [Add status check contexts](/v3/repos/branches/#add-status-check-contexts)
diff --git a/translations/de-DE/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md b/translations/de-DE/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md
index fbdcdf15c9..47531d7ba0 100644
--- a/translations/de-DE/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md
+++ b/translations/de-DE/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md
@@ -262,7 +262,7 @@ Before you can use the Octokit.rb library to make API calls, you'll need to init
# Instantiate an Octokit client authenticated as a GitHub App.
# GitHub App authentication requires that you construct a
# JWT (https://jwt.io/introduction/) signed with the app's private key,
-# so GitHub can be sure that it came from the app an not altererd by
+# so GitHub can be sure that it came from the app an not altered by
# a malicious third party.
def authenticate_app
payload = {
diff --git a/translations/de-DE/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md b/translations/de-DE/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md
index ffbc4c69fc..5ad1d2f177 100644
--- a/translations/de-DE/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md
+++ b/translations/de-DE/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md
@@ -1,6 +1,6 @@
---
title: REST endpoints for the GitHub Marketplace API
-intro: 'To help manage your app on {% data variables.product.prodname_marketplace %}, use these {% data variables.product.prodname_marketplace %} API endoints.'
+intro: 'To help manage your app on {% data variables.product.prodname_marketplace %}, use these {% data variables.product.prodname_marketplace %} API endpoints.'
redirect_from:
- /apps/marketplace/github-marketplace-api-endpoints/
- /apps/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-rest-api-endpoints/
diff --git a/translations/de-DE/content/github/administering-a-repository/about-dependabot-version-updates.md b/translations/de-DE/content/github/administering-a-repository/about-dependabot-version-updates.md
new file mode 100644
index 0000000000..dd0e47873e
--- /dev/null
+++ b/translations/de-DE/content/github/administering-a-repository/about-dependabot-version-updates.md
@@ -0,0 +1,45 @@
+---
+title: About Dependabot version updates
+intro: 'You can use {% data variables.product.prodname_dependabot %} to keep the packages you use updated to the latest versions.'
+redirect_from:
+ - /github/administering-a-repository/about-dependabot
+ - /github/administering-a-repository/about-github-dependabot-version-updates
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.dependabot.beta-note %}
+
+### Informationen zum {% data variables.product.prodname_dependabot_version_updates %}
+
+{% data variables.product.prodname_dependabot %} takes the effort out of maintaining your dependencies. You can use it to ensure that your repository automatically keeps up with the latest releases of the packages and applications it depends on.
+
+You enable {% data variables.product.prodname_dependabot_version_updates %} by checking a configuration file in to your repository. The configuration file specifies the location of the manifest, or other package definition files, stored in your repository. {% data variables.product.prodname_dependabot %} uses this information to check for outdated packages and applications. {% data variables.product.prodname_dependabot %} determines if there is a new version of a dependency by looking at the semantic versioning ([semver](https://semver.org/)) of the dependency to decide whether it should update to that version. For certain package managers, {% data variables.product.prodname_dependabot_version_updates %} also supports vendoring. Vendored (or cached) dependencies are dependencies that are checked in to a specific directory in a repository, rather than referenced in a manifest. Vendored dependencies are available at build time even if package servers are unavailable. {% data variables.product.prodname_dependabot_version_updates %} can be configured to check vendored dependencies for new versions and update them if necessary.
+
+When {% data variables.product.prodname_dependabot %} identifies an outdated dependency, it raises a pull request to update the manifest to the latest version of the dependency. For vendored dependencies, {% data variables.product.prodname_dependabot %} raises a pull request to directly replace the outdated dependency with the new version. You check that your tests pass, review the changelog and release notes included in the pull request summary, and then merge it. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)."
+
+If you enable security updates, {% data variables.product.prodname_dependabot %} also raises pull requests to update vulnerable dependencies. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
+
+{% data reusables.dependabot.dependabot-tos %}
+
+### Frequency of {% data variables.product.prodname_dependabot %} pull requests
+
+You specify how often to check each ecosystem for new versions in the configuration file: daily, weekly, or monthly.
+
+{% data reusables.dependabot.initial-updates %}
+
+If you've enabled security updates, you'll sometimes see extra pull requests for security updates. These are triggered by a {% data variables.product.prodname_dependabot %} alert for a dependency on your default branch. {% data variables.product.prodname_dependabot %} automatically raises a pull request to update the vulnerable dependency.
+
+### Supported repositories and ecosystems
+
+{% note %}
+
+{% data reusables.dependabot.private-dependencies %}
+
+{% endnote %}
+
+You can configure version updates for repositories that contain a dependency manifest or lock file for one of the supported package managers. For some package managers, you can also configure vendoring for dependencies. For more information, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates#vendor)."
+
+{% data reusables.dependabot.supported-package-managers %}
+
+If your repository already uses an integration for dependency management, you will need to disable this before enabling {% data variables.product.prodname_dependabot %}. For more information, see "[About integrations](/github/customizing-your-github-workflow/about-integrations)."
diff --git a/translations/de-DE/content/github/administering-a-repository/about-releases.md b/translations/de-DE/content/github/administering-a-repository/about-releases.md
index a4fba02ba3..859f67c001 100644
--- a/translations/de-DE/content/github/administering-a-repository/about-releases.md
+++ b/translations/de-DE/content/github/administering-a-repository/about-releases.md
@@ -32,7 +32,7 @@ People with admin permissions to a repository can choose whether
{% if currentVersion == "free-pro-team@latest" %}
If a release fixes a security vulnerability, you should publish a security advisory in your repository.
-{% data variables.product.prodname_dotcom %} reviews each published security advisory and may use it to send {% data variables.product.prodname_dependabot_short %} alerts to affected repositories. For more information, see "[About GitHub Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)."
+{% data variables.product.prodname_dotcom %} reviews each published security advisory and may use it to send {% data variables.product.prodname_dependabot_alerts %} to affected repositories. For more information, see "[About GitHub Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)."
You can view the **Dependents** tab of the dependency graph to see which repositories and packages depend on code in your repository, and may therefore be affected by a new release. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)."
{% endif %}
diff --git a/translations/de-DE/content/github/administering-a-repository/about-securing-your-repository.md b/translations/de-DE/content/github/administering-a-repository/about-securing-your-repository.md
index 024439503d..e8389335b4 100644
--- a/translations/de-DE/content/github/administering-a-repository/about-securing-your-repository.md
+++ b/translations/de-DE/content/github/administering-a-repository/about-securing-your-repository.md
@@ -21,13 +21,13 @@ The first step to securing a repository is to set up who can see and modify your
Privately discuss and fix security vulnerabilities in your repository's code. You can then publish a security advisory to alert your community to the vulnerability and encourage them to upgrade. Weitere Informationen findest Du unter „[ Über {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)."
-- **{% data variables.product.prodname_dependabot_short %} alerts and security updates**
+- **{% data variables.product.prodname_dependabot_alerts %} and security updates**
- View alerts about dependencies that are known to contain security vulnerabilities, and choose whether to have pull requests generated automatically to update these dependencies. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."
+ View alerts about dependencies that are known to contain security vulnerabilities, and choose whether to have pull requests generated automatically to update these dependencies. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
-- **{% data variables.product.prodname_dependabot_short %} version updates**
+- **{% data variables.product.prodname_dependabot %} version updates**
- Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. Weitere Informationen findest Du unter „[Informationen zu {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-github-dependabot-version-updates)“.
+ Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. Weitere Informationen findest Du unter „[Informationen zu {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-dependabot-version-updates)“.
- **{% data variables.product.prodname_code_scanning_capc %} alerts**
@@ -43,6 +43,6 @@ The first step to securing a repository is to set up who can see and modify your
* Ecosystems and packages that your repository depends on
* Repositories and packages that depend on your repository
-You must enable the dependency graph before {% data variables.product.prodname_dotcom %} can generate {% data variables.product.prodname_dependabot_short %} alerts for dependencies with security vulnerabilities.
+You must enable the dependency graph before {% data variables.product.prodname_dotcom %} can generate {% data variables.product.prodname_dependabot_alerts %} for dependencies with security vulnerabilities.
You can find the dependency graph on the **Insights** tab for your repository. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)."
diff --git a/translations/de-DE/content/github/administering-a-repository/configuration-options-for-dependency-updates.md b/translations/de-DE/content/github/administering-a-repository/configuration-options-for-dependency-updates.md
index d700f7091b..950bc3a00d 100644
--- a/translations/de-DE/content/github/administering-a-repository/configuration-options-for-dependency-updates.md
+++ b/translations/de-DE/content/github/administering-a-repository/configuration-options-for-dependency-updates.md
@@ -12,7 +12,7 @@ versions:
The {% data variables.product.prodname_dependabot %} configuration file, *dependabot.yml*, uses YAML syntax. Wenn Sie bislang noch nicht mit YAML gearbeitet haben, lesen Sie den Artikel „[Learn YAML in five minutes](https://www.codeproject.com/Articles/1214409/Learn-YAML-in-five-minutes)“.
-You must store this file in the `.github` directory of your repository. When you add or update the *dependabot.yml* file, this triggers an immediate check for version updates. Any options that also affect security updates are used the next time a security alert triggers a pull request with for security update. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."
+You must store this file in the `.github` directory of your repository. When you add or update the *dependabot.yml* file, this triggers an immediate check for version updates. Any options that also affect security updates are used the next time a security alert triggers a pull request for a security update. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)."
### Configuration options for *dependabot.yml*
@@ -56,13 +56,13 @@ In addition, the [`open-pull-requests-limit`](#open-pull-requests-limit) option
Security updates are raised for vulnerable package manifests only on the default branch. When configuration options are set for the same branch (true unless you use `target-branch`), and specify a `package-ecosystem` and `directory` for the vulnerable manifest, then pull requests for security updates use relevant options.
-In general, security updates use any configuration options that affect pull requests, for example, adding metadata or changing their behavior. For more information about security updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."
+In general, security updates use any configuration options that affect pull requests, for example, adding metadata or changing their behavior. For more information about security updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)."
{% endnote %}
### `package-ecosystem`
-**Required** You add one `package-ecosystem` element for each package manager that you want {% data variables.product.prodname_dependabot_short %} to monitor for new versions. The repository must also contain a dependency manifest or lock file for each of these package managers. If you want to enable vendoring for a package manager that supports it, the vendored dependencies must be located in the required directory. For more information, see [`vendor`](#vendor) below.
+**Required** You add one `package-ecosystem` element for each package manager that you want {% data variables.product.prodname_dependabot %} to monitor for new versions. The repository must also contain a dependency manifest or lock file for each of these package managers. If you want to enable vendoring for a package manager that supports it, the vendored dependencies must be located in the required directory. For more information, see [`vendor`](#vendor) below.
{% data reusables.dependabot.supported-package-managers %}
@@ -308,7 +308,7 @@ updates:
{% note %}
-**Note**: {% data variables.product.prodname_dependabot_version_updates %} can't run version updates for any dependencies in manifests containing private git dependencies or private git registries, even if you add the private dependencies to the `ignore` option of your configuration file. For more information, see "[About {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-github-dependabot#supported-repositories-and-ecosystems)."
+**Note**: {% data variables.product.prodname_dependabot_version_updates %} can't run version updates for any dependencies in manifests containing private git dependencies or private git registries, even if you add the private dependencies to the `ignore` option of your configuration file. Weitere Informationen findest Du unter „[Informationen zu {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-dependabot#supported-repositories-and-ecosystems)“.
{% endnote %}
@@ -543,7 +543,7 @@ updates:
### `vendor`
-Use the `vendor` option to tell {% data variables.product.prodname_dependabot_short %} to vendor dependencies when updating them.
+Use the `vendor` option to tell {% data variables.product.prodname_dependabot %} to vendor dependencies when updating them.
```yaml
# Configure version updates for both dependencies defined in manifests and vendored dependencies
@@ -558,7 +558,7 @@ updates:
interval: "weekly"
```
-{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository.
+{% data variables.product.prodname_dependabot %} only updates the vendored dependencies located in specific directories in a repository.
| Paketmanager | Required file path for vendored dependencies | Weitere Informationen |
| ------------ | ------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------- |
diff --git a/translations/de-DE/content/github/administering-a-repository/customizing-dependency-updates.md b/translations/de-DE/content/github/administering-a-repository/customizing-dependency-updates.md
index 26f64bba21..95340f31d2 100644
--- a/translations/de-DE/content/github/administering-a-repository/customizing-dependency-updates.md
+++ b/translations/de-DE/content/github/administering-a-repository/customizing-dependency-updates.md
@@ -20,7 +20,7 @@ After you've enabled version updates, you can customize how {% data variables.pr
For more information about the configuration options, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates)."
-When you update the *dependabot.yml* file in your repository, {% data variables.product.prodname_dependabot %} runs an immediate check with the new configuration. Within minutes you will see an updated list of dependencies on the **{% data variables.product.prodname_dependabot_short %}** tab, this may take longer if the repository has many dependencies. You may also see new pull requests for version updates. For more information, see "[Listing dependencies configured for version updates](/github/administering-a-repository/listing-dependencies-configured-for-version-updates)."
+When you update the *dependabot.yml* file in your repository, {% data variables.product.prodname_dependabot %} runs an immediate check with the new configuration. Within minutes you will see an updated list of dependencies on the **{% data variables.product.prodname_dependabot %}** tab, this may take longer if the repository has many dependencies. You may also see new pull requests for version updates. For more information, see "[Listing dependencies configured for version updates](/github/administering-a-repository/listing-dependencies-configured-for-version-updates)."
### Impact of configuration changes on security updates
diff --git a/translations/de-DE/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md b/translations/de-DE/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md
index 7b69ee25d8..c5b4f1b44c 100644
--- a/translations/de-DE/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md
+++ b/translations/de-DE/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md
@@ -63,7 +63,7 @@ You can disable all workflows for a repository or set a policy that configures w
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
{% data reusables.repositories.settings-sidebar-actions %}
-1. Under **Actions permissions**, select **Allow specific actions** and add your required actions to the list. 
+1. Under **Actions permissions**, select **Allow select actions** and add your required actions to the list. 
2. Klicke auf **Save** (Speichern).
{% endif %}
diff --git a/translations/de-DE/content/github/administering-a-repository/enabling-and-disabling-version-updates.md b/translations/de-DE/content/github/administering-a-repository/enabling-and-disabling-version-updates.md
index 0dbede3caf..ac4d471c64 100644
--- a/translations/de-DE/content/github/administering-a-repository/enabling-and-disabling-version-updates.md
+++ b/translations/de-DE/content/github/administering-a-repository/enabling-and-disabling-version-updates.md
@@ -10,7 +10,7 @@ versions:
### About version updates for dependencies
-You enable {% data variables.product.prodname_dependabot_version_updates %} by checking a *dependabot.yml* configuration file in to your repository's `.github` directory. {% data variables.product.prodname_dependabot_short %} then raises pull requests to keep the dependencies you configure up-to-date. For each package manager's dependencies that you want to update, you must specify the location of the package manifest files and how often to check for updates to the dependencies listed in those files. For information about enabling security updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."
+You enable {% data variables.product.prodname_dependabot_version_updates %} by checking a *dependabot.yml* configuration file in to your repository's `.github` directory. {% data variables.product.prodname_dependabot %} then raises pull requests to keep the dependencies you configure up-to-date. For each package manager's dependencies that you want to update, you must specify the location of the package manifest files and how often to check for updates to the dependencies listed in those files. For information about enabling security updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)."
{% data reusables.dependabot.initial-updates %} For more information, see "[Customizing dependency updates](/github/administering-a-repository/customizing-dependency-updates)."
@@ -72,7 +72,7 @@ On a fork, you also need to explicitly enable {% data variables.product.prodname
### Checking the status of version updates
-After you enable version updates, you'll see a new **Dependabot** tab in the dependency graph for the repository. This tab shows which package managers {% data variables.product.prodname_dependabot %} is configured to monitor and when {% data variables.product.prodname_dependabot_short %} last checked for new versions.
+After you enable version updates, you'll see a new **Dependabot** tab in the dependency graph for the repository. This tab shows which package managers {% data variables.product.prodname_dependabot %} is configured to monitor and when {% data variables.product.prodname_dependabot %} last checked for new versions.

diff --git a/translations/de-DE/content/github/administering-a-repository/index.md b/translations/de-DE/content/github/administering-a-repository/index.md
index b7c1001bd4..38ac86d0f3 100644
--- a/translations/de-DE/content/github/administering-a-repository/index.md
+++ b/translations/de-DE/content/github/administering-a-repository/index.md
@@ -91,11 +91,11 @@ versions:
{% topic_link_in_list /keeping-your-dependencies-updated-automatically %}
- {% link_in_list /about-github-dependabot-version-updates %}
+ {% link_in_list /about-dependabot-version-updates %}
{% link_in_list /enabling-and-disabling-version-updates %}
{% link_in_list /listing-dependencies-configured-for-version-updates %}
{% link_in_list /managing-pull-requests-for-dependency-updates %}
{% link_in_list /customizing-dependency-updates %}
{% link_in_list /configuration-options-for-dependency-updates %}
- {% link_in_list /keeping-your-actions-up-to-date-with-github-dependabot %}
+ {% link_in_list /keeping-your-actions-up-to-date-with-dependabot %}
diff --git a/translations/de-DE/content/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot.md b/translations/de-DE/content/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot.md
new file mode 100644
index 0000000000..112487e114
--- /dev/null
+++ b/translations/de-DE/content/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot.md
@@ -0,0 +1,49 @@
+---
+title: Keeping your actions up to date with Dependabot
+intro: 'You can use {% data variables.product.prodname_dependabot %} to keep the actions you use updated to the latest versions.'
+redirect_from:
+ - /github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.dependabot.beta-note %}
+
+### About {% data variables.product.prodname_dependabot_version_updates %} for actions
+
+Actions are often updated with bug fixes and new features to make automated processes more reliable, faster, and safer. When you enable {% data variables.product.prodname_dependabot_version_updates %} for {% data variables.product.prodname_actions %}, {% data variables.product.prodname_dependabot %} will help ensure that references to actions in a repository's *workflow.yml* file are kept up to date. For each action in the file, {% data variables.product.prodname_dependabot %} checks the action's reference (typically a version number or commit identifier associated with the action) against the latest version. If a more recent version of the action is available, {% data variables.product.prodname_dependabot %} will send you a pull request that updates the reference in the workflow file to the latest version. For more information about {% data variables.product.prodname_dependabot_version_updates %}, see "[About {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-dependabot-version-updates)." For more information about configuring workflows for {% data variables.product.prodname_actions %}, see "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)."
+
+### Enabling {% data variables.product.prodname_dependabot_version_updates %} for actions
+
+{% data reusables.dependabot.create-dependabot-yml %} If you have already enabled {% data variables.product.prodname_dependabot_version_updates %} for other ecosystems or package managers, simply open the existing *dependabot.yml* file.
+1. Specify `"github-actions"` as a `package-ecosystem` to monitor.
+1. Set the `directory` to `"/"` to check for workflow files in `.github/workflows`.
+1. Set a `schedule.interval` to specify how often to check for new versions.
+{% data reusables.dependabot.check-in-dependabot-yml %} If you have edited an existing file, save your changes.
+
+You can also enable {% data variables.product.prodname_dependabot_version_updates %} on forks. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates#enabling-version-updates-on-forks)."
+
+#### Example *dependabot.yml* file for {% data variables.product.prodname_actions %}
+
+The example *dependabot.yml* file below configures version updates for {% data variables.product.prodname_actions %}. The `directory` must be set to `"/"` to check for workflow files in `.github/workflows`. The `schedule.interval` is set to `"daily"`. After this file has been checked in or updated, {% data variables.product.prodname_dependabot %} checks for new versions of your actions. {% data variables.product.prodname_dependabot %} will raise pull requests for version updates for any outdated actions that it finds. After the initial version updates, {% data variables.product.prodname_dependabot %} will continue to check for outdated versions of actions once a day.
+
+```yaml
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ # Check for updates to GitHub Actions every weekday
+ interval: "daily"
+```
+
+### Configuring {% data variables.product.prodname_dependabot_version_updates %} for actions
+
+When enabling {% data variables.product.prodname_dependabot_version_updates %} for actions, you must specify values for `package-ecosystem`, `directory`, and `schedule.interval`. There are many more optional properties that you can set to further customize your version updates. For more information, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates)."
+
+### Weiterführende Informationen
+
+- "[About GitHub Actions](/actions/getting-started-with-github-actions/about-github-actions)"
diff --git a/translations/de-DE/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md b/translations/de-DE/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md
index 9fbbf406b5..950db236ee 100644
--- a/translations/de-DE/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md
+++ b/translations/de-DE/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md
@@ -9,7 +9,7 @@ versions:
### Viewing dependencies monitored by {% data variables.product.prodname_dependabot %}
-After you've enabled version updates, you can confirm that your configuration is correct using the **{% data variables.product.prodname_dependabot_short %}** tab in the dependency graph for the repository. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)."
+After you've enabled version updates, you can confirm that your configuration is correct using the **{% data variables.product.prodname_dependabot %}** tab in the dependency graph for the repository. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)."
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.accessing-repository-graphs %}
@@ -21,5 +21,5 @@ If any dependencies are missing, check the log files for errors. If any package
### Viewing {% data variables.product.prodname_dependabot %} log files
-1. On the **{% data variables.product.prodname_dependabot_short %}** tab, click **Last checked *TIME* ago** to see the log file that {% data variables.product.prodname_dependabot %} generated during the last check for version updates. 
+1. On the **{% data variables.product.prodname_dependabot %}** tab, click **Last checked *TIME* ago** to see the log file that {% data variables.product.prodname_dependabot %} generated during the last check for version updates. 
2. Optionally, to rerun the version check, click **Check for updates**. 
diff --git a/translations/de-DE/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md b/translations/de-DE/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md
index 6f93905e1f..ebe089535a 100644
--- a/translations/de-DE/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md
+++ b/translations/de-DE/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md
@@ -11,7 +11,7 @@ versions:
{% data reusables.dependabot.pull-request-introduction %}
-When {% data variables.product.prodname_dependabot %} raises a pull request, you're notified by your chosen method for the repository. Each pull request contains detailed information about the proposed change, taken from the package manager. These pull requests follow the normal checks and tests defined in your repository. In addition, where enough information is available, you'll see a compatibility score. This may also help you decide whether or not to merge the change. For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."
+When {% data variables.product.prodname_dependabot %} raises a pull request, you're notified by your chosen method for the repository. Each pull request contains detailed information about the proposed change, taken from the package manager. These pull requests follow the normal checks and tests defined in your repository. In addition, where enough information is available, you'll see a compatibility score. This may also help you decide whether or not to merge the change. For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
If you have many dependencies to manage, you may want to customize the configuration for each package manager so that pull requests have specific reviewers, assignees, and labels. For more information, see "[Customizing dependency updates](/github/administering-a-repository/customizing-dependency-updates)."
diff --git a/translations/de-DE/content/github/authenticating-to-github/connecting-with-third-party-applications.md b/translations/de-DE/content/github/authenticating-to-github/connecting-with-third-party-applications.md
index 7a5f584540..457ac0c8d0 100644
--- a/translations/de-DE/content/github/authenticating-to-github/connecting-with-third-party-applications.md
+++ b/translations/de-DE/content/github/authenticating-to-github/connecting-with-third-party-applications.md
@@ -55,10 +55,10 @@ Es gibt mehrere Typen von Daten, die Anwendungen anfordern können.
| Arten von Daten | Beschreibung |
| ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| Commit-Status | Du kannst einer Drittanbieter-Anwendung Zugriff gewähren, um Deinen Commit-Status zu melden. Der Zugriff auf den Commit-Status ermöglicht es Anwendungen, zu ermitteln, ob ein Build erfolgreich für einen bestimmten Commit ist. Anwendungen erhalten keinen Zugriff auf Deinen Code, aber sie können Statusinformationen für einen bestimmten Commit lesen und schreiben. |
-| Bereitstellungen | Der Zugriff auf den Bereitstellungsstatus ermöglicht es Anwendungen, zu ermitteln, ob eine Bereitstellung erfolgreich ist für einen bestimmten Commit für öffentliche und private Repositorys. Anwendungen erhalten keinen Zugriff auf Deinen Code. |
+| Bereitstellungen | Deployment status access allows applications to determine if a deployment is successful against a specific commit for public and private repositories. Applications won't have access to your code. |
| Gists | Der [Gist](https://gist.github.com)-Zugriff ermöglicht es Anwendungen, in Deine öffentlichen wie geheimen Gists zu schreiben oder sie zu lesen. |
| Hooks | Der [Webhooks](/webhooks)-Zugriff ermöglicht es Anwendungen, Hook-Konfigurationen auf von Dir verwalteten Repositorys zu lesen oder zu schreiben. |
-| Benachrichtigungen | Der Benachrichtungszugriff ermöglicht es Anwendungen, Ihre {% data variables.product.product_name %}-Benachrichtigungen zu lesen, z. B. Kommentare zu Issues und Pull Requests. Die Anwendungen können jedoch auf keine Inhalte Deiner Repositorys zugreifen. |
+| Benachrichtigungen | Notification access allows applications to read your {% data variables.product.product_name %} notifications, such as comments on issues and pull requests. Die Anwendungen können jedoch auf keine Inhalte Deiner Repositorys zugreifen. |
| Organisationen und Teams | Mit dem Organisations- und Teamzugriff können Apps auf Organisations- und Teammitglieder zugreifen und sie verwalten. |
| Persönliche Benutzerdaten | Zu Benutzerdaten gehören die Angaben in Deinem Benutzerprofil, beispielsweise Dein Name, Deine E-Mail-Adresse und Dein Standort. |
| Repositorys | Repository-Informationen umfassen die Namen der Mitarbeiter, die von Dir erstellten Branches und die effektiven Dateien in Deinem Repository. Anwendungen können den Zugriff auf öffentliche oder private Repositorys auf benutzerweiter Ebene anfordern. |
diff --git a/translations/de-DE/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md b/translations/de-DE/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
index 7cba2c51e5..aa137dc962 100644
--- a/translations/de-DE/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
+++ b/translations/de-DE/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
@@ -20,18 +20,26 @@ Wenn Du bei der Verwendung Deines SSH-Schlüssels Deine Passphrase nicht jedes m
{% data reusables.command_line.open_the_multi_os_terminal %}
2. Füge den folgenden Text ein, und ersetzte dabei Deine {% data variables.product.product_name %}-E-Mail-Adresse.
```shell
- $ ssh-keygen -t rsa -b 4096 -C "your_email@example.com"
+ $ ssh-keygen -t ed25519 -C "your_email@example.com"
```
+ {% note %}
+
+ **Note:** If you are using a legacy system that doesn't support the Ed25519 algorithm, use:
+ ```shell
+ $ ssh-keygen -t rsa -b 4096 -C "your_email@example.com"
+ ```
+
+ {% endnote %}
Dadurch wird ein neuer SSH-Schlüssel erzeugt und die angegebene E-Mail-Adresse als Kennzeichnung verwendet.
```shell
- > Generating public/private rsa key pair.
+ > Generating public/private ed25519 key pair.
```
3. Wenn die Aufforderung „Enter a file in which to save the key“ (Datei angeben, in der der Schlüssel gespeichert werden soll) angezeigt wird, drücke die Eingabetaste. Dadurch wird der Standard-Speicherort akzeptiert.
{% mac %}
```shell
- > Enter a file in which to save the key (/Users/you/.ssh/id_rsa): [Press enter]
+ > Enter a file in which to save the key (/Users/you/.ssh/id_ed25519): [Press enter]
```
{% endmac %}
@@ -39,7 +47,7 @@ Wenn Du bei der Verwendung Deines SSH-Schlüssels Deine Passphrase nicht jedes m
{% windows %}
```shell
- > Enter a file in which to save the key (/c/Users/you/.ssh/id_rsa):[Press enter]
+ > Enter a file in which to save the key (/c/Users/you/.ssh/id_ed25519):[Press enter]
```
{% endwindows %}
@@ -47,7 +55,7 @@ Wenn Du bei der Verwendung Deines SSH-Schlüssels Deine Passphrase nicht jedes m
{% linux %}
```shell
- > Enter a file in which to save the key (/home/you/.ssh/id_rsa): [Press enter]
+ > Enter a file in which to save the key (/home/you/.ssh/id_ed25519): [Press enter]
```
{% endlinux %}
@@ -81,18 +89,18 @@ Bevor Du einen neuen SSH-Schlüssel zum SSH-Agenten für die Verwaltung Deiner S
$ touch ~/.ssh/config
```
- * Öffne deine `~/.ssh/config`-Datei. Wenn Du nicht den Standardspeicherort und den Standardnamen für Deinen `id_rsa` Schlüssel verwendest, ändere die Datei und ersetze `~/.ssh/id_rsa`.
+ * Open your `~/.ssh/config` file, then modify the file, replacing `~/.ssh/id_ed25519` if you are not using the default location and name for your `id_ed25519` key.
```
Host *
AddKeysToAgent yes
UseKeychain yes
- IdentityFile ~/.ssh/id_rsa
+ IdentityFile ~/.ssh/id_ed25519
```
3. Fügen Sie Ihren privaten SSH-Schlüssel zu ssh-agent hinzu, und speichern Sie Ihre Passphrase in der Keychain. {% data reusables.ssh.add-ssh-key-to-ssh-agent %}
```shell
- $ ssh-add -K ~/.ssh/id_rsa
+ $ ssh-add -K ~/.ssh/id_ed25519
```
{% note %}
diff --git a/translations/de-DE/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md b/translations/de-DE/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md
index e8d82649b0..2fce8debe1 100644
--- a/translations/de-DE/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md
+++ b/translations/de-DE/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md
@@ -20,6 +20,7 @@ Du kannst einen Benutzer in Deinen Kontoeinstellungen oder über das Profil des
Wenn Du einen Benutzer blockierst:
- Folgt er Dir nicht mehr
- The user stops watching and unpins your repositories
+- The user is not able to join any organizations you are an owner of
- werden die Sternmarkierungen und Issue-Zuweisungen des Benutzers von Deinen Repositorys entfernt
- The user's forks of your repositories are deleted
- You delete any forks of the user's repositories
diff --git a/translations/de-DE/content/github/building-a-strong-community/index.md b/translations/de-DE/content/github/building-a-strong-community/index.md
index e4a7fee01b..c78e31380d 100644
--- a/translations/de-DE/content/github/building-a-strong-community/index.md
+++ b/translations/de-DE/content/github/building-a-strong-community/index.md
@@ -37,6 +37,7 @@ versions:
{% link_in_list /managing-disruptive-comments %}
{% link_in_list /locking-conversations %}
{% link_in_list /limiting-interactions-in-your-repository %}
+ {% link_in_list /limiting-interactions-for-your-user-account %}
{% link_in_list /limiting-interactions-in-your-organization %}
{% link_in_list /tracking-changes-in-a-comment %}
{% link_in_list /managing-how-contributors-report-abuse-in-your-organizations-repository %}
diff --git a/translations/de-DE/content/github/building-a-strong-community/limiting-interactions-for-your-user-account.md b/translations/de-DE/content/github/building-a-strong-community/limiting-interactions-for-your-user-account.md
new file mode 100644
index 0000000000..ba54183136
--- /dev/null
+++ b/translations/de-DE/content/github/building-a-strong-community/limiting-interactions-for-your-user-account.md
@@ -0,0 +1,26 @@
+---
+title: Limiting interactions for your user account
+intro: 'You can temporarily enforce a period of limited activity for certain users in all public repositories owned by your user account.'
+versions:
+ free-pro-team: '*'
+permissions: Anyone can limit interactions for their own user account.
+---
+
+### About temporary interaction limits
+
+Limiting interactions for your user account enables temporary interaction limits for all public repositories owned by your user account. {% data reusables.community.interaction-limits-restrictions %}
+
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your public repositories.
+
+{% data reusables.community.types-of-interaction-limits %}
+
+When you enable user-wide activity limitations, you can't enable or disable interaction limits on individual repositories. For more information on limiting activity for an individual repository, see "[Limiting interactions in your repository](/articles/limiting-interactions-in-your-repository)."
+
+You can also block users. For more information, see "[Blocking a user from your personal account](/github/building-a-strong-community/blocking-a-user-from-your-personal-account)."
+
+### Limiting interactions for your user account
+
+{% data reusables.user_settings.access_settings %}
+1. In your user settings sidebar, under "Moderation settings", click **Interaction limits**. 
+{% data reusables.community.set-interaction-limit %}
+ 
\ No newline at end of file
diff --git a/translations/de-DE/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md b/translations/de-DE/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md
index 83ea312cf5..6c8611d651 100644
--- a/translations/de-DE/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md
+++ b/translations/de-DE/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md
@@ -1,29 +1,37 @@
---
title: Interaktionen in Deiner Organisation begrenzen
-intro: 'Organisationsinhaber können für bestimmte Benutzer temporär die Möglichkeiten zum Kommentieren, Öffnen von Issues und Erstellen von Pull Requests in den öffentlichen Repositorys der Organisation einschränken, um eine Periode limitierter Aktivität durchzusetzen.'
+intro: 'You can temporarily enforce a period of limited activity for certain users in all public repositories owned by your organization.'
redirect_from:
- /github/setting-up-and-managing-organizations-and-teams/limiting-interactions-in-your-organization
- /articles/limiting-interactions-in-your-organization
versions:
free-pro-team: '*'
+permissions: Organization owners can limit interactions in an organization.
---
-Nach 24 Stunden können die Benutzer die normale Aktivität in den öffentlichen Repositorys Deiner Organisation wiederaufnehmen. Wenn Du Einschränkungen für die gesamte Organisation aktivierst, kannst Du keine Beschränkung der Interaktionen für einzelne Repositorys aktivieren oder deaktivieren. Weitere Informationen zur Repository-abhängigen Aktivitätsbegrenzung findest Du unter „[Interaktionen in Deinem Repository begrenzen](/articles/limiting-interactions-in-your-repository).“
+### About temporary interaction limits
-{% tip %}
+Limiting interactions in your organization enables temporary interaction limits for all public repositories owned by the organization. {% data reusables.community.interaction-limits-restrictions %}
-**Tipp:** Organisationsinhaber können auch Benutzer für eine bestimmte Zeitdauer blockieren. Wenn die Sperre ausläuft, wird der Benutzer automatisch entsperrt. Weitere Informationen findest Du unter „[Benutzer für Deine Organisation blockieren](/articles/blocking-a-user-from-your-organization).“
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your organization's public repositories.
-{% endtip %}
+{% data reusables.community.types-of-interaction-limits %}
+
+Members of the organization are not affected by any of the limit types.
+
+Wenn Du Einschränkungen für die gesamte Organisation aktivierst, kannst Du keine Beschränkung der Interaktionen für einzelne Repositorys aktivieren oder deaktivieren. For more information on limiting activity for an individual repository, see "[Limiting interactions in your repository](/articles/limiting-interactions-in-your-repository)."
+
+Organization owners can also block users for a specific amount of time. Wenn die Sperre ausläuft, wird der Benutzer automatisch entsperrt. Weitere Informationen findest Du unter „[Benutzer für Deine Organisation blockieren](/articles/blocking-a-user-from-your-organization).“
+
+### Interaktionen in Deiner Organisation begrenzen
{% data reusables.profile.access_profile %}
{% data reusables.profile.access_org %}
{% data reusables.organizations.org_settings %}
-4. Klicke in der Seitenleiste mit den Einstellungen Deiner Organisation auf **Interaction Limits** (Interaktionsbeschränkungen). 
-5. Klicke unter "Temporary interaction limits" (Temporäre Interaktionsbeschränkungen) auf eine oder mehrere Optionen. 
- - **Limit to existing users** (Beschränkung für vorhandene Benutzer): Begrenzt die Aktivität für Benutzer der Organisation, deren Konto erst seit weniger als 24 Stunden besteht und die bisher keine Beiträge geleistet haben und keine Mitarbeiter sind.
- - **Limit to prior contributors** (Beschränkung für frühere Mitarbeiter): Begrenzt die Aktivität für Benutzer der Organisation, die noch keine Beiträge geleistet haben und keine Mitarbeiter sind.
- - **Limit to repository collaborators**: Limits activity for organization users who do not have write access or are not collaborators.
+1. In the organization settings sidebar, click **Moderation settings**. 
+1. Under "Moderation settings", click **Interaction limits**. 
+{% data reusables.community.set-interaction-limit %}
+ 
### Weiterführende Informationen
- „[Missbrauch oder Spam melden](/articles/reporting-abuse-or-spam)“
diff --git a/translations/de-DE/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md b/translations/de-DE/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md
index daa35b023e..689821868e 100644
--- a/translations/de-DE/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md
+++ b/translations/de-DE/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md
@@ -1,28 +1,32 @@
---
title: Interaktionen in Deinem Repository begrenzen
-intro: 'Personen mit Inhaber- oder Administratorberechtigungen können für bestimmte Benutzer temporär die Möglichkeiten zum Kommentieren, Öffnen von Issues und Erstellen von Pull Requests in Deinem öffentlichen Repository einschränken, um eine Periode limitierter Aktivität durchzusetzen,.'
+intro: 'You can temporarily enforce a period of limited activity for certain users on a public repository.'
redirect_from:
- /articles/limiting-interactions-with-your-repository/
- /articles/limiting-interactions-in-your-repository
versions:
free-pro-team: '*'
+permissions: People with admin permissions to a repository can temporarily limit interactions in that repository.
---
-Nach 24 Stunden können die Benutzer die normale Aktivität in Deinem Repository wiederaufnehmen.
+### About temporary interaction limits
-{% tip %}
+{% data reusables.community.interaction-limits-restrictions %}
-**Tipp:** Organisationsinhaber können Aktivitätsbeschränkungen für die gesamte Organisation aktivieren. Wenn Aktivitätsbeschränkungen für die gesamte Organisation aktiviert sind, kannst Du keine Beschränkungen für einzelne Repositorys vornehmen. Weitere Informationen findest Du unter „[Interaktionen in Deiner Organisation begrenzen](/articles/limiting-interactions-in-your-organization).“
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your repository.
-{% endtip %}
+{% data reusables.community.types-of-interaction-limits %}
+
+You can also enable activity limitations on all repositories owned by your user account or an organization. If a user-wide or organization-wide limit is enabled, you can't limit activity for individual repositories owned by the account. For more information, see "[Limiting interactions for your user account](/github/building-a-strong-community/limiting-interactions-for-your-user-account)" and "[Limiting interactions in your organization](/github/building-a-strong-community/limiting-interactions-in-your-organization)."
+
+### Interaktionen in Deinem Repository begrenzen
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
-3. Klicke in der Seitenleiste mit den Einstellungen Deines Repositorys auf **Interaction Limits** (Interaktionsbeschränkungen). 
-4. Klicke unter „Temporary interaction limits" (Temporäre Interaktionsbeschränkungen) auf eine oder mehrere Optionen: 
- - **Limit to existing users** (Beschränkung für existierende Benutzer): Begrenzt die Aktivität für Benutzer, deren Konto erst seit weniger 24 Stunden besteht und die bisher keine Beiträge geleistet haben und keine Mitarbeiter sind.
- - **Limit to prior contributors** (Beschränkung für frühere Mitarbeiter): Begrenzt die Aktivität für Benutzer, die noch keine Beiträge geleistet haben und keine Mitarbeiter sind.
- - **Limit to repository collaborators**: Limits activity for users who do not have write access or are not collaborators.
+1. In the left sidebar, click **Moderation settings**. 
+1. Under "Moderation settings", click **Interaction limits**. 
+{% data reusables.community.set-interaction-limit %}
+ 
### Weiterführende Informationen
- „[Missbrauch oder Spam melden](/articles/reporting-abuse-or-spam)“
diff --git a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md
index 9384b2812a..9a38cbb481 100644
--- a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md
+++ b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md
@@ -38,7 +38,11 @@ Du kannst alle Reviews eines Pull Requests in der Zeitleiste der Unterhaltung an
{% data reusables.pull_requests.resolving-conversations %}
-### Erforderlicher Review
+### Re-requesting a review
+
+{% data reusables.pull_requests.re-request-review %}
+
+### Erforderliche Reviews
{% data reusables.pull_requests.required-reviews-for-prs-summary %}
diff --git a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md
index c9990f721c..4ce6c8119b 100644
--- a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md
+++ b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md
@@ -25,6 +25,10 @@ Jede Person, die eine der Änderungen des Commits vorgeschlagen hat, wird Co-Aut
4. Gib im Feld für die Commit-Mitteilung eine kurze, aussagekräftige Commit-Mitteilung ein, die die Änderung beschreibt, die Du an der Datei oder den Dateien vorgenommen hast. 
5. Klicke auf **Commit changes** (Änderungen freigeben). 
+### Re-requesting a review
+
+{% data reusables.pull_requests.re-request-review %}
+
### Öffnen eines Issue für Vorschläge außerhalb des Geltungsbereichs
Wenn jemand Änderungen an Deinem Pull Request vorschlägt und die Änderungen nicht in den Pull-Request-Geltungsbereich fallen, kannst Du einen neuen Issue öffnen, um das Feedback zu verfolgen. Weitere Informationen findest Du unter „[Öffnen eines Issue aus einem Kommentar](/github/managing-your-work-on-github/opening-an-issue-from-a-comment)."
diff --git a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md
index b62cd03b15..8c217fe30b 100644
--- a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md
+++ b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md
@@ -43,6 +43,12 @@ Wenn Du die Änderungen in einem Themen-Branch nicht in den vorgelagerten Branch
{% data reusables.files.choose-commit-email %}
+ {% note %}
+
+ **Note:** The email selector is not available for rebase merges, which do not create a merge commit, or for squash merges, which credit the user who created the pull request as the author of the squashed commit.
+
+ {% endnote %}
+
6. Klicke auf **Confirm merge** (Merge bestätigen), **Confirm squash and merge** (Squash und Merge bestätigen) oder **Confirm rebase and merge** (Rebase und Merge bestätigen).
6. Optional kannst Du auch [den Branch löschen](/articles/deleting-unused-branches). So bleibt die Liste der Branches in Ihrem Repository ordentlich.
diff --git a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
index a5695985ad..12c9037bfe 100644
--- a/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
+++ b/translations/de-DE/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
@@ -13,7 +13,7 @@ Bevor Du einen Fork mit dem ihm vorgelagerten Repository synchronisieren kannst,
{% data reusables.command_line.open_the_multi_os_terminal %}
2. Wechsle Dein aktuelles Arbeitsverzeichnis in das lokale Projekt.
-3. Rufe die Branches und die jeweiligen Commits aus dem vorgelagerten Repository ab. Commits to `main` will be stored in a local branch, `upstream/main`.
+3. Rufe die Branches und die jeweiligen Commits aus dem vorgelagerten Repository ab. Commits to `BRANCHNAME` will be stored in the local branch `upstream/BRANCHNAME`.
```shell
$ git fetch upstream
> remote: Counting objects: 75, done.
@@ -23,12 +23,12 @@ Bevor Du einen Fork mit dem ihm vorgelagerten Repository synchronisieren kannst,
> From https://{% data variables.command_line.codeblock %}/ORIGINAL_OWNER/ORIGINAL_REPOSITORY
> * [new branch] main -> upstream/main
```
-4. Check out your fork's local `main` branch.
+4. Check out your fork's local default branch - in this case, we use `main`.
```shell
$ git checkout main
> Switched to branch 'main'
```
-5. Merge the changes from `upstream/main` into your local `main` branch. This brings your fork's `main` branch into sync with the upstream repository, without losing your local changes.
+5. Merge the changes from the upstream default branch - in this case, `upstream/main` - into your local default branch. This brings your fork's default branch into sync with the upstream repository, without losing your local changes.
```shell
$ git merge upstream/main
> Updating a422352..5fdff0f
diff --git a/translations/de-DE/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md b/translations/de-DE/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md
index 334febbf88..10d9376b25 100644
--- a/translations/de-DE/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md
+++ b/translations/de-DE/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md
@@ -61,7 +61,6 @@ Du kannst Konfigurationsschlüssel verwenden, die von {% data variables.product.
- `settings`
- `extensions`
- `forwardPorts`
-- `devPort`
- `postCreateCommand`
#### Docker-, Dockerfile- oder Image-Einstellungen
@@ -73,13 +72,9 @@ Du kannst Konfigurationsschlüssel verwenden, die von {% data variables.product.
- `remoteEnv`
- `containerUser`
- `remoteUser`
-- `updateRemoteUserUID`
- `mounts`
-- `workspaceMount`
-- `workspaceFolder`
- `runArgs`
- `overrideCommand`
-- `shutdownAction`
- `dockerComposeFile`
Weitere Informationen über die verfügbaren Einstellungen für `devcontainer.json` findest Du unter [devcontainer.json-Referenz](https://aka.ms/vscode-remote/devcontainer.json) in der {% data variables.product.prodname_vscode %}-Dokumentation.
diff --git a/translations/de-DE/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md b/translations/de-DE/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md
index 919ce25c10..7a5472fa47 100644
--- a/translations/de-DE/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md
+++ b/translations/de-DE/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md
@@ -32,7 +32,7 @@ Wenn keine dieser Dateien gefunden wird, werden Dateien oder Ordner in `dotfiles
Änderungen an Deinem `dotfiles`-Repository gelten nur für neue Codespaces und verändern bestehende Codespaces nicht.
-Weiter Informationen findest Du unter „[Personalisierung](https://docs.microsoft.com/en-us/visualstudio/online/reference/personalizing)" in der {% data variables.product.prodname_vscode %}-Dokumentation.
+Weiter Informationen findest Du unter „[Personalisierung](https://docs.microsoft.com/visualstudio/online/reference/personalizing)" in der {% data variables.product.prodname_vscode %}-Dokumentation.
{% note %}
diff --git a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md
index d32e59c2c2..fa8a14334b 100644
--- a/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md
+++ b/translations/de-DE/content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-a-container.md
@@ -26,7 +26,7 @@ You may have difficulty running {% data variables.product.prodname_code_scanning
### Example workflow
-This sample workflow uses {% data variables.product.prodname_actions %} to run {% data variables.product.prodname_codeql %} analysis in a containerized environment. The value of `container.image` identifies the container to use. In this example the image is named `codeql-container`, with a tag of `f0f91db`. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer)."
+This sample workflow uses {% data variables.product.prodname_actions %} to run {% data variables.product.prodname_codeql %} analysis in a containerized environment. The value of `container.image` identifies the container to use. In this example the image is named `codeql-container`, with a tag of `f0f91db`. Weitere Informationen findest Du unter „[Workflow-Syntax für {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer)“.
``` yaml
name: "{% data variables.product.prodname_codeql %}"
diff --git a/translations/de-DE/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md b/translations/de-DE/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md
index 72c7cae93a..53b828af2a 100644
--- a/translations/de-DE/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md
+++ b/translations/de-DE/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md
@@ -32,12 +32,12 @@ Einige Open-Source-Projekte stellen zusätzlich zu den an anderer Stelle gehoste
Nachfolgend findest Du einige bekannte Repositorys, die auf {% data variables.product.prodname_dotcom_the_website %} gespiegelt werden:
-- [android](https://github.com/android)
+- [Android Open Source Project](https://github.com/aosp-mirror)
- [The Apache Software Foundation](https://github.com/apache)
- [The Chromium Project](https://github.com/chromium)
-- [The Eclipse Foundation](https://github.com/eclipse)
+- [Eclipse Foundation](https://github.com/eclipse)
- [The FreeBSD Project](https://github.com/freebsd)
-- [The Glasgow Haskell Compiler](https://github.com/ghc)
+- [Glasgow Haskell Compiler](https://github.com/ghc)
- [GNOME](https://github.com/GNOME)
- [Linux kernel source tree](https://github.com/torvalds/linux)
- [Qt](https://github.com/qt)
diff --git a/translations/de-DE/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md b/translations/de-DE/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md
index f21bd14ac7..894f6f6dd2 100644
--- a/translations/de-DE/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md
+++ b/translations/de-DE/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md
@@ -13,7 +13,7 @@ versions:
Sie können eine Testversion anfordern und {% data variables.product.prodname_ghe_server %} 45 Tage lang kostenlos testen. Deine Testversion wird als virtuelle Appliance installiert, wobei Du wählen kannst, ob sie lokal oder in der Cloud bereitgestellt wird. Eine Liste der unterstützten Visualisierungsplattformen findest Du unter „[GitHub Enterprise Server-Instanz einrichten](/enterprise/admin/installation/setting-up-a-github-enterprise-server-instance).“
-{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}Security{% endif %} alerts and {% data variables.product.prodname_github_connect %} are not currently available in trials of {% data variables.product.prodname_ghe_server %}. Kontaktiere {% data variables.contact.contact_enterprise_sales %} für eine Vorstellung dieser Funktionen. For more information about these features, see "About alerts for vulnerable dependencies" and "[Connecting {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_dotcom_the_website %}](/enterprise/admin/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)."
+{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}Security{% endif %} alerts and {% data variables.product.prodname_github_connect %} are not currently available in trials of {% data variables.product.prodname_ghe_server %}. Kontaktiere {% data variables.contact.contact_enterprise_sales %} für eine Vorstellung dieser Funktionen. For more information about these features, see "About alerts for vulnerable dependencies" and "[Connecting {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_dotcom_the_website %}](/enterprise/admin/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)."
Testversionen sind auch für {% data variables.product.prodname_ghe_cloud %} verfügbar. Weitere Informationen findest Du unter „[Eine Testversion von {% data variables.product.prodname_ghe_cloud %} einrichten](/articles/setting-up-a-trial-of-github-enterprise-cloud).“
diff --git a/translations/de-DE/content/github/managing-large-files/removing-files-from-a-repositorys-history.md b/translations/de-DE/content/github/managing-large-files/removing-files-from-a-repositorys-history.md
index f2b81685c4..8838ea2460 100644
--- a/translations/de-DE/content/github/managing-large-files/removing-files-from-a-repositorys-history.md
+++ b/translations/de-DE/content/github/managing-large-files/removing-files-from-a-repositorys-history.md
@@ -16,10 +16,6 @@ versions:
{% endwarning %}
-### Entfernen einer Datei, die in einem früheren Commit hinzugefügt wurde
-
-Wenn Du eine Datei in einem früheren Commit hinzugefügt hast, musst Du sie aus Deinem Repository-Verlauf entfernen. Um Dateien aus dem Verlauf Deines Repository zu entfernen, kannst Du den BFG Repo-Cleaner oder den Befehl `git filter-branch` verwenden. Weitere Informationen findest Du unter „[Vertrauliche Daten aus einem Repository entfernen](/github/authenticating-to-github/removing-sensitive-data-from-a-repository).“
-
### Datei entfernen, die beim letzten noch nicht übertragenen Commit hinzugefügt wurde
Wenn eine Datei bei Ihrem letzten Commit hinzugefügt wurde und dieses noch nicht per Push auf {% data variables.product.product_location %} übertragen wurde, können Sie die Datei löschen und den Commit ändern:
@@ -43,3 +39,7 @@ Wenn eine Datei bei Ihrem letzten Commit hinzugefügt wurde und dieses noch nich
$ git push
# Uebertrage unseren neu geschriebenen, kleineren Commit
```
+
+### Entfernen einer Datei, die in einem früheren Commit hinzugefügt wurde
+
+Wenn Du eine Datei in einem früheren Commit hinzugefügt hast, musst Du sie aus Deinem Repository-Verlauf entfernen. Um Dateien aus dem Verlauf Deines Repository zu entfernen, kannst Du den BFG Repo-Cleaner oder den Befehl `git filter-branch` verwenden. Weitere Informationen findest Du unter „[Vertrauliche Daten aus einem Repository entfernen](/github/authenticating-to-github/removing-sensitive-data-from-a-repository).“
diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md b/translations/de-DE/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md
index 8fe1daf6ab..28e69946ff 100644
--- a/translations/de-DE/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md
+++ b/translations/de-DE/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md
@@ -17,7 +17,7 @@ When your code depends on a package that has a security vulnerability, this vuln
### Detection of vulnerable dependencies
- {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %} detects vulnerable dependencies and sends {% data variables.product.prodname_dependabot_short %} alerts{% else %}{% data variables.product.product_name %} detects vulnerable dependencies and sends security alerts{% endif %} when:
+ {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %} detects vulnerable dependencies and sends {% data variables.product.prodname_dependabot_alerts %}{% else %}{% data variables.product.product_name %} detects vulnerable dependencies and sends security alerts{% endif %} when:
{% if currentVersion == "free-pro-team@latest" %}
- A new vulnerability is added to the {% data variables.product.prodname_advisory_database %}. For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)."
@@ -50,12 +50,12 @@ You can also enable or disable {% data variables.product.prodname_dependabot_ale
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
When
-{% data variables.product.product_name %} identifies a vulnerable dependency, we generate a {% data variables.product.prodname_dependabot_short %} alert and display it on the Security tab for the repository. The alert includes a link to the affected file in the project, and information about a fixed version. {% data variables.product.product_name %} also notifies the maintainers of affected repositories about the new alert according to their notification preferences. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."
+{% data variables.product.product_name %} identifies a vulnerable dependency, we generate a {% data variables.product.prodname_dependabot %} alert and display it on the Security tab for the repository. The alert includes a link to the affected file in the project, and information about a fixed version. {% data variables.product.product_name %} also notifies the maintainers of affected repositories about the new alert according to their notification preferences. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."
{% endif %}
{% if currentVersion == "free-pro-team@latest" %}
For repositories where
-{% data variables.product.prodname_dependabot_security_updates %} are enabled, the alert may also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. Weitere Informationen findest Du unter „[ Über {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."
+{% data variables.product.prodname_dependabot_security_updates %} are enabled, the alert may also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
{% endif %}
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %}
@@ -69,13 +69,13 @@ When
{% endwarning %}
-### Access to {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts
+### Access to {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts
You can see all of the alerts that affect a particular project{% if currentVersion == "free-pro-team@latest" %} on the repository's Security tab or{% endif %} in the repository's dependency graph.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)."{% endif %}
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
By default, we notify people with admin permissions in the affected repositories about new
-{% data variables.product.prodname_dependabot_short %} alerts.{% endif %} {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. You can also make {% data variables.product.prodname_dependabot_short %} alerts visible to additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)."
+{% data variables.product.prodname_dependabot_alerts %}.{% endif %} {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. You can also make {% data variables.product.prodname_dependabot_alerts %} visible to additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-dependabot-alerts)."
{% endif %}
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %}
@@ -88,6 +88,6 @@ Standardmäßig senden wir Sicherheitsmeldungen an Personen mit Administratorrec
{% if currentVersion == "free-pro-team@latest" %}
### Weiterführende Informationen
-- "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)"
+- "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)"
- „[Angreifbare Abhängigkeiten in Deinem Repository anzeigen und aktualisieren](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)“
- „[Grundlegendes zur Verwendung und zum Schutz Deiner Daten in {% data variables.product.product_name %}](/categories/understanding-how-github-uses-and-protects-your-data)“{% endif %}
diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/about-dependabot-security-updates.md b/translations/de-DE/content/github/managing-security-vulnerabilities/about-dependabot-security-updates.md
new file mode 100644
index 0000000000..da8bdc6710
--- /dev/null
+++ b/translations/de-DE/content/github/managing-security-vulnerabilities/about-dependabot-security-updates.md
@@ -0,0 +1,35 @@
+---
+title: About Dependabot security updates
+intro: '{% data variables.product.prodname_dependabot %} can fix vulnerable dependencies for you by raising pull requests with security updates.'
+shortTitle: About Dependabot security updates
+redirect_from:
+ - /github/managing-security-vulnerabilities/about-github-dependabot-security-updates
+versions:
+ free-pro-team: '*'
+---
+
+### Informationen zu {% data variables.product.prodname_dependabot_security_updates %}
+
+{% data variables.product.prodname_dependabot_security_updates %} make it easier for you to fix vulnerable dependencies in your repository. If you enable this feature, when a {% data variables.product.prodname_dependabot %} alert is raised for a vulnerable dependency in the dependency graph of your repository, {% data variables.product.prodname_dependabot %} automatically tries to fix it. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)."
+
+{% data variables.product.prodname_dependabot %} checks whether it's possible to upgrade the vulnerable dependency to a fixed version without disrupting the dependency graph for the repository. Then {% data variables.product.prodname_dependabot %} raises a pull request to update the dependency to the minimum version that includes the patch and links the pull request to the {% data variables.product.prodname_dependabot %} alert, or reports an error on the alert. For more information, see "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)."
+
+{% note %}
+
+**Hinweis**
+
+The {% data variables.product.prodname_dependabot_security_updates %} feature is available for repositories where you have enabled the dependency graph and {% data variables.product.prodname_dependabot_alerts %}. You will see a {% data variables.product.prodname_dependabot %} alert for every vulnerable dependency identified in your full dependency graph. However, security updates are triggered only for dependencies that are specified in a manifest or lock file. {% data variables.product.prodname_dependabot %} is unable to update an indirect or transitive dependency that is not explicitly defined. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#dependencies-included)."
+
+{% endnote %}
+
+### About pull requests for security updates
+
+Each pull request contains everything you need to quickly and safely review and merge a proposed fix into your project. This includes information about the vulnerability like release notes, changelog entries, and commit details. Details of which vulnerability a pull request resolves are hidden from anyone who does not have access to {% data variables.product.prodname_dependabot_alerts %} for the repository.
+
+When you merge a pull request that contains a security update, the corresponding {% data variables.product.prodname_dependabot %} alert is marked as resolved for your repository. For more information about {% data variables.product.prodname_dependabot %} pull requests, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates)."
+
+{% data reusables.dependabot.automated-tests-note %}
+
+### Informationen zu Kompatibilitätsbewertungen
+
+{% data variables.product.prodname_dependabot_security_updates %} may include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. These are calculated from CI tests in other public repositories where the same security update has been generated. An update's compatibility score is the percentage of CI runs that passed when updating between specific versions of the dependency.
diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/configuring-dependabot-security-updates.md b/translations/de-DE/content/github/managing-security-vulnerabilities/configuring-dependabot-security-updates.md
new file mode 100644
index 0000000000..117f8b86ad
--- /dev/null
+++ b/translations/de-DE/content/github/managing-security-vulnerabilities/configuring-dependabot-security-updates.md
@@ -0,0 +1,60 @@
+---
+title: Configuring Dependabot security updates
+intro: 'You can use {% data variables.product.prodname_dependabot_security_updates %} or manual pull requests to easily update vulnerable dependencies.'
+shortTitle: Configuring Dependabot security updates
+redirect_from:
+ - /articles/configuring-automated-security-fixes
+ - /github/managing-security-vulnerabilities/configuring-automated-security-fixes
+ - /github/managing-security-vulnerabilities/configuring-automated-security-updates
+ - /github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates
+versions:
+ free-pro-team: '*'
+---
+
+### About configuring {% data variables.product.prodname_dependabot_security_updates %}
+
+You can enable {% data variables.product.prodname_dependabot_security_updates %} for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
+
+You can disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository or for all repositories owned by your user account or organization. For more information, see "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories](#managing-dependabot-security-updates-for-your-repositories)" below.
+
+{% data reusables.dependabot.dependabot-tos %}
+
+### Unterstützte Repositorys
+
+{% data variables.product.prodname_dotcom %} automatically enables {% data variables.product.prodname_dependabot_security_updates %} for every repository that meets these prerequisites.
+
+{% note %}
+
+**Note**: You can manually enable {% data variables.product.prodname_dependabot_security_updates %}, even if the repository doesn't meet some of the prerequisites below. For example, you can enable {% data variables.product.prodname_dependabot_security_updates %} on a fork, or for a package manager that isn't directly supported by following the instructions in "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories](#managing-dependabot-security-updates-for-your-repositories)."
+
+{% endnote %}
+
+| Automatic enablement prerequisite | Weitere Informationen |
+| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Das Repository ist kein Fork | „[Über Forks](/github/collaborating-with-issues-and-pull-requests/about-forks)" |
+| Das Repository ist nicht archiviert | „[Repositorys archivieren](/github/creating-cloning-and-archiving-repositories/archiving-repositories)" |
+| Das Repository ist öffentlich, oder es ist privat und Du hast Nur-Lesen-Analysen durch {% data variables.product.prodname_dotcom %}, Abhängigkeitsdiagramme und Sicherheitswarnungen in den Repository-Einstellungen aktiviert | "[Managing data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)." |
+| Das Repository enthält eine Abhängigkeits-Manifestdatei aus einem Paket-Ökosystem, das {% data variables.product.prodname_dotcom %} unterstützt | „[Unterstützte Paket-Ökosysteme](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)" |
+| {% data variables.product.prodname_dependabot_security_updates %} are not disabled for the repository | "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repository](#managing-dependabot-security-updates-for-your-repositories)" |
+| Das Repository benutzt noch keine Integration für die Abhängigkeits-Verwaltung | „[Informationen zu Integrationen](/github/customizing-your-github-workflow/about-integrations)“ |
+
+If security updates are not enabled for your repository and you don't know why, first try enabling them using the instructions given in the procedural sections below. If security updates are still not working, you can [contact support](https://support.github.com/contact).
+
+### Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories
+
+You can enable or disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository.
+
+You can also enable or disable {% data variables.product.prodname_dependabot_security_updates %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)."
+
+{% data variables.product.prodname_dependabot_security_updates %} require specific repository settings. Weitere Informationen findest Du unter „[Unterstützte Repositorys](#supported-repositories)."
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-security %}
+{% data reusables.repositories.sidebar-dependabot-alerts %}
+1. Above the list of alerts, use the drop-down menu and select or unselect **{% data variables.product.prodname_dependabot %} security updates**. 
+
+### Weiterführende Informationen
+
+- "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)"
+- "[Managing data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)"
+- „[Unterstützte Paket-Ökosysteme](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)"
diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md b/translations/de-DE/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md
index c6e5f2bf3a..c476be75c7 100644
--- a/translations/de-DE/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md
+++ b/translations/de-DE/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md
@@ -1,7 +1,7 @@
---
title: Configuring notifications for vulnerable dependencies
shortTitle: Benachrichtigungen konfigurieren
-intro: 'Optimize how you receive notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts.'
+intro: 'Optimize how you receive notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts.'
versions:
free-pro-team: '*'
enterprise-server: '>=2.21'
@@ -9,10 +9,10 @@ versions:
### About notifications for vulnerable dependencies
-{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we generate a {% data variables.product.prodname_dependabot_short %} alert and display it on the Security tab for the repository. {% data variables.product.product_name %} notifies the maintainers of affected repositories about the new alert according to their notification preferences.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot_short %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability.
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we generate a {% data variables.product.prodname_dependabot %} alert and display it on the Security tab for the repository. {% data variables.product.product_name %} notifies the maintainers of affected repositories about the new alert according to their notification preferences.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability.
{% endif %}
-{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_short %} alerts for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)."
+{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)."
{% endif %}
{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.21" %}
@@ -23,7 +23,7 @@ Your site administrator needs to enable security alerts for vulnerable dependenc
By default, if your site administrator has configured email for notifications on your enterprise, you will receive
{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} by email.{% endif %}
-{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
+{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
@@ -35,14 +35,14 @@ You can configure notification settings for yourself or your organization from t
{% data reusables.notifications.vulnerable-dependency-notification-options %}
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
- 
+ 
{% else %}

{% endif %}
{% note %}
-**Note:** You can filter your {% data variables.product.company_short %} inbox notifications to show {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. Weitere Informationen findest Du unter „[Benachrichtigungen über Deinen Posteingang verwalten](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)."
+**Note:** You can filter your {% data variables.product.company_short %} inbox notifications to show {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %} security{% endif %} alerts. Weitere Informationen findest Du unter „[Benachrichtigungen über Deinen Posteingang verwalten](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)."
{% endnote %}
diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/index.md b/translations/de-DE/content/github/managing-security-vulnerabilities/index.md
index 48a15eee55..588a51e650 100644
--- a/translations/de-DE/content/github/managing-security-vulnerabilities/index.md
+++ b/translations/de-DE/content/github/managing-security-vulnerabilities/index.md
@@ -30,9 +30,9 @@ versions:
{% link_in_list /about-alerts-for-vulnerable-dependencies %}
{% link_in_list /configuring-notifications-for-vulnerable-dependencies %}
- {% link_in_list /about-github-dependabot-security-updates %}
- {% link_in_list /configuring-github-dependabot-security-updates %}
+ {% link_in_list /about-dependabot-security-updates %}
+ {% link_in_list /configuring-dependabot-security-updates %}
{% link_in_list /viewing-and-updating-vulnerable-dependencies-in-your-repository %}
{% link_in_list /troubleshooting-the-detection-of-vulnerable-dependencies %}
- {% link_in_list /troubleshooting-github-dependabot-errors %}
+ {% link_in_list /troubleshooting-dependabot-errors %}
diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors.md b/translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors.md
new file mode 100644
index 0000000000..c33aa46aba
--- /dev/null
+++ b/translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors.md
@@ -0,0 +1,84 @@
+---
+title: Troubleshooting Dependabot errors
+intro: 'Sometimes {% data variables.product.prodname_dependabot %} is unable to raise a pull request to update your dependencies. You can review the error and unblock {% data variables.product.prodname_dependabot %}.'
+shortTitle: Troubleshooting errors
+redirect_from:
+ - /github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.dependabot.beta-note %}
+
+### About {% data variables.product.prodname_dependabot %} errors
+
+{% data reusables.dependabot.pull-request-introduction %}
+
+If anything prevents {% data variables.product.prodname_dependabot %} from raising a pull request, this is reported as an error.
+
+### Investigating errors with {% data variables.product.prodname_dependabot_security_updates %}
+
+When {% data variables.product.prodname_dependabot %} is blocked from creating a pull request to fix a {% data variables.product.prodname_dependabot %} alert, it posts the error message on the alert. The {% data variables.product.prodname_dependabot_alerts %} view shows a list of any alerts that have not been resolved yet. To access the alerts view, click **{% data variables.product.prodname_dependabot_alerts %}** on the **Security** tab for the repository. Where a pull request that will fix the vulnerable dependency has been generated, the alert includes a link to that pull request.
+
+
+
+There are three reasons why an alert may have no pull request link:
+
+1. {% data variables.product.prodname_dependabot_security_updates %} are not enabled for the repository.
+1. The alert is for an indirect or transitive dependency that is not explicitly defined in a lock file.
+1. An error blocked {% data variables.product.prodname_dependabot %} from creating a pull request.
+
+If an error blocked {% data variables.product.prodname_dependabot %} from creating a pull request, you can display details of the error by clicking the alert.
+
+
+
+### Investigating errors with {% data variables.product.prodname_dependabot_version_updates %}
+
+When {% data variables.product.prodname_dependabot %} is blocked from creating a pull request to update a dependency in an ecosystem, it posts the error icon on the manifest file. The manifest files that are managed by {% data variables.product.prodname_dependabot %} are listed on the {% data variables.product.prodname_dependabot %} tab. To access this tab, on the **Insights** tab for the repository click **Dependency graph**, and then click the **{% data variables.product.prodname_dependabot %}** tab.
+
+
+
+To see the log file for any manifest file, click the **Last checked TIME ago** link. When you display the log file for a manifest that's shown with an error symbol (for example, Maven in the screenshot above), any errors are also displayed.
+
+
+
+### Understanding {% data variables.product.prodname_dependabot %} errors
+
+Pull requests for security updates act to upgrade a vulnerable dependency to the minimum version that includes a fix for the vulnerability. In contrast, pull requests for version updates act to upgrade a dependency to the latest version allowed by the package manifest and {% data variables.product.prodname_dependabot %} configuration files. Consequently, some errors are specific to one type of update.
+
+#### {% data variables.product.prodname_dependabot %} cannot update DEPENDENCY to a non-vulnerable version
+
+**Security updates only.** {% data variables.product.prodname_dependabot %} cannot create a pull request to update the vulnerable dependency to a secure version without breaking other dependencies in the dependency graph for this repository.
+
+Every application that has dependencies has a dependency graph, that is, a directed acyclic graph of every package version that the application directly or indirectly depends on. Every time a dependency is updated, this graph must resolve otherwise the application won't build. When an ecosystem has a deep and complex dependency graph, for example, npm and RubyGems, it is often impossible to upgrade a single dependency without upgrading the whole ecosystem.
+
+The best way to avoid this problem is to stay up to date with the most recently released versions, for example, by enabling version updates. This increases the likelihood that a vulnerability in one dependency can be resolved by a simple upgrade that doesn't break the dependency graph. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)."
+
+#### {% data variables.product.prodname_dependabot %} cannot update to the required version as there is already an open pull request for the latest version
+
+**Security updates only.** {% data variables.product.prodname_dependabot %} will not create a pull request to update the vulnerable dependency to a secure version because there is already an open pull request to update this dependency. You will see this error when a vulnerability is detected in a single dependency and there's already an open pull request to update the dependency to the latest version.
+
+There are two options: you can review the open pull request and merge it as soon as you are confident that the change is safe, or close that pull request and trigger a new security update pull request. For more information, see "[Triggering a {% data variables.product.prodname_dependabot %} pull request manually](#triggering-a-dependabot-pull-request-manually)."
+
+#### {% data variables.product.prodname_dependabot %} timed out during its update
+
+{% data variables.product.prodname_dependabot %} took longer than the maximum time allowed to assess the update required and prepare a pull request. This error is usually seen only for large repositories with many manifest files, for example, npm or yarn monorepo projects with hundreds of *package.json* files. Updates to the Composer ecosystem also take longer to assess and may time out.
+
+This error is difficult to address. If a version update times out, you could specify the most important dependencies to update using the `allow` parameter or, alternatively, use the `ignore` parameter to exclude some dependencies from updates. Updating your configuration might allow {% data variables.product.prodname_dependabot %} to review the version update and generate the pull request in the time available.
+
+If a security update times out, you can reduce the chances of this happening by keeping the dependencies updated, for example, by enabling version updates. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)."
+
+#### {% data variables.product.prodname_dependabot %} cannot open any more pull requests
+
+There's a limit on the number of open pull requests {% data variables.product.prodname_dependabot %} will generate. When this limit is reached, no new pull requests are opened and this error is reported. The best way to resolve this error is to review and merge some of the open pull requests.
+
+There are separate limits for security and version update pull requests, so that open version update pull requests cannot block the creation of a security update pull request. The limit for security update pull requests is 10. By default, the limit for version updates is 5 but you can change this using the `open-pull-requests-limit` parameter in the configuration file. For more information, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates#open-pull-requests-limit)."
+
+The best way to resolve this error is to merge or close some of the existing pull requests and trigger a new pull request manually. For more information, see "[Triggering a {% data variables.product.prodname_dependabot %} pull request manually](#triggering-a-dependabot-pull-request-manually)."
+
+### Triggering a {% data variables.product.prodname_dependabot %} pull request manually
+
+If you unblock {% data variables.product.prodname_dependabot %}, you can manually trigger a fresh attempt to create a pull request.
+
+- **Security updates**—display the {% data variables.product.prodname_dependabot %} alert that shows the error you have fixed and click **Create {% data variables.product.prodname_dependabot %} security update**.
+- **Version updates**—display the log file for the manifest that shows the error that you have fixed and click **Check for updates**.
diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md b/translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md
index bedd827f80..2e08f4e626 100644
--- a/translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md
+++ b/translations/de-DE/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md
@@ -14,14 +14,14 @@ The results of dependency detection reported by {% data variables.product.produc
* {% data variables.product.prodname_advisory_database %} is one of the data sources that {% data variables.product.prodname_dotcom %} uses to identify vulnerable dependencies. It's a free, curated database of vulnerability information for common package ecosystems on {% data variables.product.prodname_dotcom %}. It includes both data reported directly to {% data variables.product.prodname_dotcom %} from {% data variables.product.prodname_security_advisories %}, as well as official feeds and community sources. This data is reviewed and curated by {% data variables.product.prodname_dotcom %} to ensure that false or unactionable information is not shared with the development community. For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)" and "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)."
* The dependency graph parses all known package manifest files in a user’s repository. For example, for npm it will parse the _package-lock.json_ file. It constructs a graph of all of the repository’s dependencies and public dependents. This happens when you enable the dependency graph and when anyone pushes to the default branch, and it includes commits that makes changes to a supported manifest format. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)."
-* {% data variables.product.prodname_dependabot_short %} scans any push, to the default branch, that contains a manifest file. When a new vulnerability record is added, it scans all existing repositories and generates an alert for each vulnerable repository. {% data variables.product.prodname_dependabot_short %} alerts are aggregated at the repository level, rather than creating one alert per vulnerability. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." |
-* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot_short %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)."
+* {% data variables.product.prodname_dependabot %} scans any push, to the default branch, that contains a manifest file. When a new vulnerability record is added, it scans all existing repositories and generates an alert for each vulnerable repository. {% data variables.product.prodname_dependabot_alerts %} are aggregated at the repository level, rather than creating one alert per vulnerability. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." |
+* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)."
- {% data variables.product.prodname_dependabot_short %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database.
+ {% data variables.product.prodname_dependabot %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database.
### Why don't I get vulnerability alerts for some ecosystems?
-{% data variables.product.prodname_dotcom %} limits its support for vulnerability alerts to a set of ecosystems where we can provide high-quality, actionable data. Curated vulnerabilities in the {% data variables.product.prodname_advisory_database %}, the dependency graph, {% data variables.product.prodname_dependabot_short %} alerts, and {% data variables.product.prodname_dependabot_short %} security updates are provided for several ecosystems, including Java’s Maven, JavaScript’s npm and Yarn, .NET’s NuGet, Python’s pip, Ruby's RubyGems, and PHP’s Composer. We'll continue to add support for more ecosystems over time. For an overview of the package ecosystems that we support, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)."
+{% data variables.product.prodname_dotcom %} limits its support for vulnerability alerts to a set of ecosystems where we can provide high-quality, actionable data. Curated vulnerabilities in the {% data variables.product.prodname_advisory_database %}, the dependency graph, {% data variables.product.prodname_dependabot_alerts %}, and {% data variables.product.prodname_dependabot %} security updates are provided for several ecosystems, including Java’s Maven, JavaScript’s npm and Yarn, .NET’s NuGet, Python’s pip, Ruby's RubyGems, and PHP’s Composer. We'll continue to add support for more ecosystems over time. For an overview of the package ecosystems that we support, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)."
It's worth noting that [{% data variables.product.prodname_dotcom %} Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories) may exist for other ecosystems. The information in a security advisory is provided by the maintainers of a particular repository. This data is not curated in the same way as information for the supported ecosystems.
@@ -31,7 +31,7 @@ It's worth noting that [{% data variables.product.prodname_dotcom %} Security Ad
The dependency graph includes information on dependencies that are explicitly declared in your environment. That is, dependencies that are specified in a manifest or a lockfile. The dependency graph generally also includes transitive dependencies, even when they aren't specified in a lockfile, by looking at the dependencies of the dependencies in a manifest file.
-{% data variables.product.prodname_dependabot_short %} alerts advise you about dependencies you should update, including transitive dependencies, where the version can be determined from a manifest or a lockfile. {% data variables.product.prodname_dependabot_short %} security updates only suggests a change where it can directly "fix" the dependency, that is, when these are:
+{% data variables.product.prodname_dependabot_alerts %} advise you about dependencies you should update, including transitive dependencies, where the version can be determined from a manifest or a lockfile. {% data variables.product.prodname_dependabot %} security updates only suggests a change where it can directly "fix" the dependency, that is, when these are:
* Direct dependencies explicitly declared in a manifest or lockfile
* Transitive dependencies declared in a lockfile
@@ -51,21 +51,21 @@ Yes, the dependency graph has two categories of limits:
1. **Processing limits**
- These affect the dependency graph displayed within {% data variables.product.prodname_dotcom %} and also prevent {% data variables.product.prodname_dependabot_short %} alerts being created.
+ These affect the dependency graph displayed within {% data variables.product.prodname_dotcom %} and also prevent {% data variables.product.prodname_dependabot_alerts %} being created.
- Manifests over 0.5 MB in size are only processed for enterprise accounts. For other accounts, manifests over 0.5 MB are ignored and will not create {% data variables.product.prodname_dependabot_short %} alerts.
+ Manifests over 0.5 MB in size are only processed for enterprise accounts. For other accounts, manifests over 0.5 MB are ignored and will not create {% data variables.product.prodname_dependabot_alerts %}.
- By default, {% data variables.product.prodname_dotcom %} will not process more than 20 manifests per repository. {% data variables.product.prodname_dependabot_short %} alerts are not be created for manifests beyond this limit. If you need to increase the limit, contact {% data variables.contact.contact_support %}.
+ By default, {% data variables.product.prodname_dotcom %} will not process more than 20 manifests per repository. {% data variables.product.prodname_dependabot_alerts %} are not be created for manifests beyond this limit. If you need to increase the limit, contact {% data variables.contact.contact_support %}.
2. **Visualization limits**
- These affect what's displayed in the dependency graph within {% data variables.product.prodname_dotcom %}. However, they don't affect the {% data variables.product.prodname_dependabot_short %} alerts that are created.
+ These affect what's displayed in the dependency graph within {% data variables.product.prodname_dotcom %}. However, they don't affect the {% data variables.product.prodname_dependabot_alerts %} that are created.
- The Dependencies view of the dependency graph for a repository only displays 100 manifests. Typically this is adequate as it is significantly higher than the processing limit described above. In situations where the processing limit is over 100, {% data variables.product.prodname_dependabot_short %} alerts are still created for any manifests that are not shown within {% data variables.product.prodname_dotcom %}.
+ The Dependencies view of the dependency graph for a repository only displays 100 manifests. Typically this is adequate as it is significantly higher than the processing limit described above. In situations where the processing limit is over 100, {% data variables.product.prodname_dependabot_alerts %} are still created for any manifests that are not shown within {% data variables.product.prodname_dotcom %}.
**Check**: Is the missing dependency in a manifest file that's over 0.5 MB, or in a repository with a large number of manifests?
-### Does {% data variables.product.prodname_dependabot_short %} generate alerts for vulnerabilities that have been known for many years?
+### Does {% data variables.product.prodname_dependabot %} generate alerts for vulnerabilities that have been known for many years?
The {% data variables.product.prodname_advisory_database %} was launched in November 2019, and initially back-filled to include vulnerability information for the supported ecosystems, starting from 2017. When adding CVEs to the database, we prioritize curating newer CVEs, and CVEs affecting newer versions of software.
@@ -77,19 +77,19 @@ Some information on older vulnerabilities is available, especially where these C
Some third-party tools use uncurated CVE data that isn't checked or filtered by a human. This means that CVEs with tagging or severity errors, or other quality issues, will cause more frequent, more noisy, and less useful alerts.
-Since {% data variables.product.prodname_dependabot_short %} uses curated data in the {% data variables.product.prodname_advisory_database %}, the volume of alerts may be lower, but the alerts you do receive will be accurate and relevant.
+Since {% data variables.product.prodname_dependabot %} uses curated data in the {% data variables.product.prodname_advisory_database %}, the volume of alerts may be lower, but the alerts you do receive will be accurate and relevant.
### Does each dependency vulnerability generate a separate alert?
When a dependency has multiple vulnerabilities, only one aggregated alert is generated for that dependency, instead of one alert per vulnerability.
-The {% data variables.product.prodname_dependabot_short %} alerts count in {% data variables.product.prodname_dotcom %} shows a total for the number of alerts, that is, the number of dependencies with vulnerabilities, not the number of vulnerabilities.
+The {% data variables.product.prodname_dependabot_alerts %} count in {% data variables.product.prodname_dotcom %} shows a total for the number of alerts, that is, the number of dependencies with vulnerabilities, not the number of vulnerabilities.
-
+
When you click to display the alert details, you can see how many vulnerabilities are included in the alert.
-
+
**Check**: If there is a discrepancy in the totals you are seeing, check that you are not comparing alert numbers with vulnerability numbers.
@@ -98,4 +98,4 @@ When you click to display the alert details, you can see how many vulnerabilitie
- "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)"
- „[Angreifbare Abhängigkeiten in Ihrem Repository anzeigen und aktualisieren](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)“
- "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)"
-- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)"
+- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)"
diff --git a/translations/de-DE/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/translations/de-DE/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
index 89ec8a6e3b..5677e04981 100644
--- a/translations/de-DE/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
+++ b/translations/de-DE/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
@@ -11,11 +11,11 @@ versions:
Your repository's {% data variables.product.prodname_dependabot %} alerts tab lists all open and closed {% data variables.product.prodname_dependabot_alerts %} and corresponding {% data variables.product.prodname_dependabot_security_updates %}. Mithilfe des Dropdownmenü kannst Du die Liste der Warnungen sortieren, und Du kannst auf bestimmte Warnungen klicken, um weitere Details anzuzeigen. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)." |
-You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. Weitere Informationen findest Du unter „[ Über {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."
+You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
### About updates for vulnerable dependencies in your repository
-{% data variables.product.product_name %} generates {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency {% data variables.product.prodname_dependabot_short %} creates a pull request to fix it. The pull request will upgrade the dependency to the minimum possible secure version needed to avoid the vulnerability.
+{% data variables.product.product_name %} generates {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency {% data variables.product.prodname_dependabot %} creates a pull request to fix it. The pull request will upgrade the dependency to the minimum possible secure version needed to avoid the vulnerability.
### Viewing and updating vulnerable dependencies
@@ -24,14 +24,14 @@ You can enable automatic security updates for any repository that uses {% data v
{% data reusables.repositories.sidebar-dependabot-alerts %}
1. Klicke auf die Warnung, die angezeigt werden soll. 
1. Überprüfe die Details der Schwachstelle und wenn verfügbar des Pull Requests, der das automatisierte Sicherheitsupdate enthält.
-1. Optionally, if there isn't already a {% data variables.product.prodname_dependabot_security_updates %} update for the alert, to create a pull request to resolve the vulnerability, click **Create {% data variables.product.prodname_dependabot_short %} security update**. 
-1. Wenn Sie zum Aktualisieren Ihrer Abhängigkeit und zum Beheben Ihrer Schwachstelle bereit sind, mergen Sie den Pull Request. Each pull request raised by {% data variables.product.prodname_dependabot_short %} includes information on commands you can use to control {% data variables.product.prodname_dependabot_short %}. For more information, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates#managing-github-dependabot-pull-requests-with-comment-commands)."
+1. Optionally, if there isn't already a {% data variables.product.prodname_dependabot_security_updates %} update for the alert, to create a pull request to resolve the vulnerability, click **Create {% data variables.product.prodname_dependabot %} security update**. 
+1. Wenn Sie zum Aktualisieren Ihrer Abhängigkeit und zum Beheben Ihrer Schwachstelle bereit sind, mergen Sie den Pull Request. Each pull request raised by {% data variables.product.prodname_dependabot %} includes information on commands you can use to control {% data variables.product.prodname_dependabot %}. For more information, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates#managing-dependabot-pull-requests-with-comment-commands)."
1. Optionally, if the alert is being fixed, if it's incorrect, or located in unused code, use the "Dismiss" drop-down, and click a reason for dismissing the alert. 
### Weiterführende Informationen
- "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)"
-- "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)"
+- "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)"
- "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)"
- "[Troubleshooting the detection of vulnerable dependencies](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)"
-- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)"
+- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)"
diff --git a/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md b/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md
index 45250e8c18..1bfba80f06 100644
--- a/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md
+++ b/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md
@@ -122,7 +122,7 @@ E-Mail-Benachrichtigungen von {% data variables.product.product_name %} enthalte
3. Auf der Seite für Benachrichtigungseinstellungen wählst Du, wie Du Benachrichtigungen erhalten willst, wenn:
- Es Aktualisierungen in Repositories oder Teamdiskussionen gibt, die Du beobachtest, oder in einer Unterhaltung, an der Du teilnimmst. Weitere Informationen findest Du unter „[Über die Teilnahme an und das Beobachten von Benachrichtigungen](#about-participating-and-watching-notifications)."
- Du Zugriff erhältst auf ein neues Repository oder wenn Du einem neuen Team beigetreten bist. For more information, see "[Automatic watching](#automatic-watching)."{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
- - There are new {% if page.version == 'dotcom' %} {% data variables.product.prodname_dependabot_alerts %} {% else %} security alerts {% endif %} in your repository. Weitere Informationen findest Du unter „[{% data variables.product.prodname_dependabot_alerts %} Benachrichtigungsoptionen](#github-dependabot-alerts-notification-options)." {% endif %}{% if currentVersion == "enterprise-server@2.21" %}
+ - There are new {% if page.version == 'dotcom' %} {% data variables.product.prodname_dependabot_alerts %} {% else %} security alerts {% endif %} in your repository. Weitere Informationen findest Du unter „[{% data variables.product.prodname_dependabot_alerts %} Benachrichtigungsoptionen](#dependabot-alerts-notification-options)." {% endif %}{% if currentVersion == "enterprise-server@2.21" %}
- Es neue Sicherheitswarnungen in Deinem Repository gibt. For more information, see "[Security alert notification options](#security-alert-notification-options)." {% endif %} {% if currentVersion == "free-pro-team@latest" %}
- Es Aktualisierungen zu Workflow-Ausführungen auf Repositorys gibt, die mit {% data variables.product.prodname_actions %} aufgesetzt wurden. For more information, see "[{% data variables.product.prodname_actions %} notification options](#github-actions-notification-options)."{% endif %}
diff --git a/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md b/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
index 8b66300f94..a9cd8fdeb8 100644
--- a/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
+++ b/translations/de-DE/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
@@ -82,6 +82,7 @@ Benutzerdefinierte Filter unterstützen im Moment nicht:
- Die Unterscheidung zwischen `is:issue`-, `is:pr`-, und `is:pull-request`-Abfragefiltern. Diese Abfragen werden sowohl Issues wie Pull Request zurückgeben.
- Das Erstellen von mehr als 15 benutzerdefinierten Filtern.
- Das Ändern der Standardfilter oder deren Reihenfolge.
+ - Search [exclusion](/github/searching-for-information-on-github/understanding-the-search-syntax#exclude-certain-results) using `NOT` or `-QUALIFIER`.
### Unterstützte Abfragen für benutzerdefinierte Filter
@@ -113,7 +114,7 @@ Um Benachrichtigungen nach dem Grund zu filtern, weshalb Du eine Aktualisierung
#### Unterstützte `is:`-Abfragen
-Um Benachrichtigungen nach bestimmten Aktivitäten auf {% data variables.product.product_name %} zu filtern, kannst du die Abfrage `is` verwenden. For example, to only see repository invitation updates, use `is:repository-invitation`{% if currentVersion != "github-ae@latest" %}, and to only see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts, use `is:repository-vulnerability-alert`.{% endif %}
+Um Benachrichtigungen nach bestimmten Aktivitäten auf {% data variables.product.product_name %} zu filtern, kannst du die Abfrage `is` verwenden. For example, to only see repository invitation updates, use `is:repository-invitation`{% if currentVersion != "github-ae@latest" %}, and to only see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %} security{% endif %} alerts, use `is:repository-vulnerability-alert`.{% endif %}
- `is:check-suite`
- `is:commit`
diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md
index 753509f431..e6e36bd1ba 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md
@@ -59,7 +59,7 @@ You can disable all workflows for an organization or set a policy that configure
{% data reusables.profile.access_org %}
{% data reusables.organizations.org_settings %}
{% data reusables.organizations.settings-sidebar-actions %}
-1. Under **Policies**, select **Allow specific actions** and add your required actions to the list. 
+1. Under **Policies**, select **Allow select actions** and add your required actions to the list. 
1. Klicke auf **Save** (Speichern).
{% endif %}
diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md
index 328b108406..b7d3884f1e 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md
@@ -18,7 +18,7 @@ Wenn Codeinhaber automatisch zum Review aufgefordert werden, wird das Team trotz
### Routing-Algorithmen
-Code-Review-Zuweisungen wählen und weisen Prüfer automatisch aufgrund einem von zwei möglichen Algorithmen zu.
+Code review assignments automatically choose and assign reviewers based on one of two possible algorithms.
Der Round-Robin-Algorithmus wählt die Prüfer basierend auf den Empfängern der letzten Review-Anforderungen aus, und fokussiert auf der abwechselnden Auswahl der Mitarbeiter des Teams, unabhängig von der Anzahl ausstehenden Reviews, die die Teammitglieder momentan haben.
diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md
index 5519cf971c..90559508e4 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md
@@ -64,7 +64,7 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late
| {% data variables.product.prodname_marketplace %}-Apps erwerben, installieren, kündigen und ihre Abrechnung verwalten | **X** | | |
| Apps auf {% data variables.product.prodname_marketplace %} aufführen | **X** | | |{% if currentVersion != "github-ae@latest" %}
| Receive [{% data variables.product.prodname_dependabot_alerts %} about vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) for all of an organization's repositories | **X** | | |
-| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)") | **X** | | |{% endif %}
+| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)") | **X** | | |{% endif %}
| [Die Forking-Richtlinie verwalten](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization) | **X** | | |
| [Aktivitäten in öffentlichen Repositorys in einer Organisation einschränken](/articles/limiting-interactions-in-your-organization) | **X** | | |
| Lesen von (pull), Schreiben zu (push) und Kopieren von (clone) *allen Repositorys* der Organisation | **X** | | |
diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
index aa1dd9d200..61497be9a9 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
@@ -47,7 +47,7 @@ To search for specific events, use the `action` qualifier in your query. Actions
| `repo` | Contains all activities related to the repositories owned by your organization.{% if currentVersion == "free-pro-team@latest" %}
| `repository_content_analysis` | Contains all activities related to [enabling or disabling data use for a private repository](/articles/about-github-s-use-of-your-data).
| `repository_dependency_graph` | Contains all activities related to [enabling or disabling the dependency graph for a private repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository).{% endif %}{% if currentVersion != "github-ae@latest" %}
-| `repository_vulnerability_alert` | Contains all activities related to [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% endif %}{% if currentVersion == "free-pro-team@latest" %}
+| `repository_vulnerability_alert` | Contains all activities related to [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% endif %}{% if currentVersion == "free-pro-team@latest" %}
| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %}
| `team` | Contains all activities related to teams in your organization.{% endif %}
| `team_discussions` | Contains activities related to managing team discussions for an organization.
@@ -354,10 +354,10 @@ For more information, see "[Restricting publication of {% data variables.product
| Action | Description
|------------------|-------------------
-| `create` | Triggered when {% data variables.product.product_name %} creates a [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alert for a vulnerable dependency](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a particular repository.
+| `create` | Triggered when {% data variables.product.product_name %} creates a [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alert for a vulnerable dependency](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a particular repository.
| `resolve` | Triggered when someone with write access to a repository [pushes changes to update and resolve a vulnerability](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a project dependency.
-| `dismiss` | Triggered when an organization owner or person with admin access to the repository dismisses a {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alert about a vulnerable dependency.{% if currentVersion == "free-pro-team@latest" %}
-| `authorized_users_teams` | Triggered when an organization owner or a member with admin permissions to the repository [updates the list of people or teams authorized to receive {% data variables.product.prodname_dependabot_short %} alerts](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts) for vulnerable dependencies in the repository.{% endif %}
+| `dismiss` | Triggered when an organization owner or person with admin access to the repository dismisses a {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alert about a vulnerable dependency.{% if currentVersion == "free-pro-team@latest" %}
+| `authorized_users_teams` | Triggered when an organization owner or a member with admin permissions to the repository [updates the list of people or teams authorized to receive {% data variables.product.prodname_dependabot_alerts %}](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-dependabot-alerts) for vulnerable dependencies in the repository.{% endif %}
{% endif %}
{% if currentVersion == "free-pro-team@latest" %}
diff --git a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md
index bbd17ad04b..d7020244b8 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md
@@ -36,7 +36,7 @@ Mithilfe von Abhängigkeits-Einblicken kannst Du Schwachstellen, Lizenzen und an
3. Klicke unter dem Namen Deiner Organisation auf {% octicon "graph" aria-label="The bar graph icon" %} **Insights** (Einblicke). 
4. Klicke zum Anzeigen von Abhängigkeiten für diese Organisation auf **Dependencies** (Abhängigkeiten). 
5. Klicke zum Anzeigen von Abhängigkeits-Einblicken für alle Deine {% data variables.product.prodname_ghe_cloud %}-Organisationen auf **My organizations** (Meine Organisationen). 
-6. Du kannst auf die Ergebnisse in den Diagrammen **Open security advisories** (Offene Sicherheitshinweise) und **Licenses** (Lizenzen) klicken, um nach einem Schwachstellenstatus, nach einer Lizenz oder nach einer Kombination aus beiden zu filtern. 
+6. Du kannst auf die Ergebnisse in den Diagrammen **Open security advisories** (Offene Sicherheitshinweise) und **Licenses** (Lizenzen) klicken, um nach einem Schwachstellenstatus, nach einer Lizenz oder nach einer Kombination aus beiden zu filtern. 
7. Neben der jeweiligen Schwachstelle können Sie auf {% octicon "package" aria-label="The package icon" %} **dependents** (Abhängige) klicken, um nachzuvollziehen, welche Abhängigen in Ihrer Organisation jede Bibliothek verwenden. 
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md
index 5b64a46148..79bd547536 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/about-github-business-accounts/
- /articles/about-enterprise-accounts
+ - /github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts
versions:
free-pro-team: '*'
enterprise-server: '*'
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md
index 14e905b62d..bda94b993e 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md
@@ -4,6 +4,7 @@ intro: Du kannst neue Organisationen erstellen, um sie in Deinem Enterprise-Kont
product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/adding-organizations-to-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/adding-organizations-to-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md
index 827fa351e4..c58eab4175 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md
@@ -4,6 +4,7 @@ intro: 'You can use Security Assertion Markup Language (SAML) single sign-on (SS
product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /github/setting-up-and-managing-your-enterprise/configuring-single-sign-on-and-scim-for-your-enterprise-account-using-okta
+ - /github/setting-up-and-managing-your-enterprise-account/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta
versions:
free-pro-team: '*'
---
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md
index 7a75d8c7a3..2bd1d3b766 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md
@@ -2,6 +2,8 @@
title: Configuring the retention period for GitHub Actions artifacts and logs in your enterprise account
intro: 'Enterprise owners can configure the retention period for {% data variables.product.prodname_actions %} artifacts and logs in an enterprise account.'
product: '{% data reusables.gated-features.enterprise-accounts %}'
+redirect_from:
+ - /github/setting-up-and-managing-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account
miniTocMaxHeadingLevel: 4
versions:
free-pro-team: '*'
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md
index 65de44d29d..250fa81fad 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/configuring-webhooks-for-organization-events-in-your-business-account/
- /articles/configuring-webhooks-for-organization-events-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/configuring-webhooks-for-organization-events-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md
index 1d530db33e..6e4fcd347c 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/enforcing-a-policy-on-dependency-insights/
- /articles/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md
index f559ff6e7a..0b087e6ac8 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md
@@ -2,6 +2,8 @@
title: Enforcing GitHub Actions policies in your enterprise account
intro: 'Enterprise owners can disable, enable, and limit {% data variables.product.prodname_actions %} for an enterprise account.'
product: '{% data reusables.gated-features.enterprise-accounts %}'
+redirect_from:
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-github-actions-policies-in-your-enterprise-account
miniTocMaxHeadingLevel: 4
versions:
free-pro-team: '*'
@@ -32,7 +34,7 @@ You can disable all workflows for an enterprise or set a policy that configures
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.policies-tab %}
{% data reusables.enterprise-accounts.actions-tab %}
-1. Under **Policies**, select **Allow specific actions** and add your required actions to the list. 
+1. Under **Policies**, select **Allow select actions** and add your required actions to the list. 
### Enabling workflows for private repository forks
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md
index 76df179550..1495f6c40f 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md
@@ -6,6 +6,7 @@ redirect_from:
- /articles/enforcing-project-board-settings-for-organizations-in-your-business-account/
- /articles/enforcing-project-board-policies-for-organizations-in-your-enterprise-account/
- /articles/enforcing-project-board-policies-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-project-board-policies-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md
index 6204dd7517..b692128c7b 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md
@@ -6,6 +6,7 @@ redirect_from:
- /articles/enforcing-repository-management-settings-for-organizations-in-your-business-account/
- /articles/enforcing-repository-management-policies-for-organizations-in-your-enterprise-account/
- /articles/enforcing-repository-management-policies-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-repository-management-policies-in-your-enterprise-account
versions:
free-pro-team: '*'
---
@@ -48,8 +49,7 @@ In allen Organisationen Deines Enterprise-Kontos kannst Du Mitgliedern das Einla
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.policies-tab %}
3. Lies auf der Registerkarte **Repository policies** (Repository-Richtlinien) unter „Repository invitations“ (Repository-Einladungen) die Informationen zum Ändern der Einstellung. {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
-4. Wählen Sie im Dropdownmenü unter „Repository invitations“ (Repository-Einladungen) eine Richtlinie aus.
- 
+4. Under "Repository invitations", use the drop-down menu and choose a policy. 
### Eine Richtlinie zum Ändern der Repository-Sichtbarkeit erzwingen
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md
index c18b25305f..8d2a072103 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md
@@ -8,6 +8,7 @@ redirect_from:
- /articles/enforcing-security-settings-for-organizations-in-your-enterprise-account/
- /articles/enforcing-security-settings-in-your-enterprise-account
- /github/articles/managing-allowed-ip-addresses-for-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-security-settings-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md
index 2276b1eefb..8e131c6429 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md
@@ -6,6 +6,7 @@ redirect_from:
- /articles/enforcing-team-settings-for-organizations-in-your-business-account/
- /articles/enforcing-team-policies-for-organizations-in-your-enterprise-account/
- /articles/enforcing-team-policies-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-team-policies-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md
index 7df208e247..c463b04262 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md
@@ -5,6 +5,7 @@ redirect_from:
- /github/setting-up-and-managing-your-enterprise/managing-licenses-for-the-github-enterprise-and-visual-studio-bundle
- /github/articles/about-the-github-and-visual-studio-bundle
- /articles/about-the-github-and-visual-studio-bundle
+ - /github/setting-up-and-managing-your-enterprise-account/managing-licenses-for-visual-studio-subscription-with-github-enterprise
versions:
free-pro-team: '*'
---
@@ -21,7 +22,7 @@ Weitere Informationen zu {% data variables.product.prodname_enterprise %} finden
1. After you buy {% data variables.product.prodname_vss_ghe %}, contact {% data variables.contact.contact_enterprise_sales %} and mention "{% data variables.product.prodname_vss_ghe %}." You'll work with the Sales team to create an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. If you already have an enterprise account on {% data variables.product.prodname_dotcom_the_website %}, or if you're not sure, please tell our Sales team.
-2. Assign licenses for {% data variables.product.prodname_vss_ghe %} to subscribers in {% data variables.product.prodname_vss_admin_portal_with_url %}. For more information about assigning licenses, see [Manage {% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/en-us/visualstudio/subscriptions/assign-github) in the Microsoft Docs.
+2. Assign licenses for {% data variables.product.prodname_vss_ghe %} to subscribers in {% data variables.product.prodname_vss_admin_portal_with_url %}. For more information about assigning licenses, see [Manage {% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/visualstudio/subscriptions/assign-github) in the Microsoft Docs.
3. On {% data variables.product.prodname_dotcom_the_website %}, create at least one organization owned by your enterprise account. For more information, see "[Adding organizations to your enterprise account](/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account)."
@@ -39,4 +40,4 @@ You can also see pending {% data variables.product.prodname_enterprise %} invita
### Weiterführende Informationen
-- [Introducing Visual Studio subscriptions with GitHub Enterprise](https://docs.microsoft.com/en-us/visualstudio/subscriptions/access-github) in the Microsoft Docs
+- [Introducing Visual Studio subscriptions with GitHub Enterprise](https://docs.microsoft.com/visualstudio/subscriptions/access-github) in the Microsoft Docs
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md
index 80afe795f4..6a7861952c 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md
@@ -4,6 +4,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
mapTopic: true
redirect_from:
- /articles/managing-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md
index a2b03b4257..c0732494a2 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md
@@ -3,6 +3,8 @@ title: Managing unowned organizations in your enterprise account
intro: You can become an owner of an organization in your enterprise account that currently has no owners.
product: '{% data reusables.gated-features.enterprise-accounts %}'
permissions: Enterprise owners can manage unowned organizations in an enterprise account.
+redirect_from:
+ - /github/setting-up-and-managing-your-enterprise-account/managing-unowned-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md
index 97c906ecd0..fa870c537f 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md
@@ -4,6 +4,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
mapTopic: true
redirect_from:
- /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/managing-users-in-your-enterprise-account
- /articles/managing-users-in-your-enterprise-account
- /articles/managing-users-in-your-enterprise
versions:
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md
index af0dc1a4b2..86553c2dc2 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md
@@ -4,6 +4,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
mapTopic: true
redirect_from:
- /articles/setting-policies-for-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
index 5ecebed235..8c3d98d41f 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
@@ -5,6 +5,7 @@ permissions: Enterprise-Inhaber können den SAML-Zugriff eines Mitglieds auf ein
product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/viewing-and-managing-a-users-saml-access-to-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md
index a8431c540a..20175d1c1a 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/viewing-the-audit-logs-for-organizations-in-your-business-account/
- /articles/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md b/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md
index 9bb290b8af..bfea95795b 100644
--- a/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md
+++ b/translations/de-DE/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md
@@ -29,13 +29,15 @@ Im Abschnitt „Recent activity" (Neueste Aktivitäten) Deines Newsfeed kannst D

+The list of top repositories is automatically generated, and can include any repository you have interacted with, whether it's owned directly by your account or not. Interactions include making commits and opening or commenting on issues and pull requests. The list of top repositories cannot be edited, but repositories will drop off the list 4 months after you last interacted with them.
+
Wenn Du oben auf einer beliebigen Seite auf {% data variables.product.product_name %} in die Suchleiste klickst, findest Du außerdem eine Liste Deiner zuletzt aufgerufenen Repositorys, Teams und Projektboards.
### Über Aktivitäten in der Community auf dem Laufenden bleiben
Im Abschnitt „All activity" (Alle Aktivitäten) in Deinem Newsfeed kannst Du Aktualisierungen von Repositorys sehen, die Du abonniert hast und von Personen, denen Du folgst. Der Abschnitt „All activity" (Alle Aktivitäten) zeigt Aktualisierungen von Repositorys, die Du beobachtest oder mit Stern versehen hast und von Benutzern, denen Du folgst.
-In Deinem Newsfeed werden Aktualisierungen angezeigt, wenn ein Benutzer, dem Du folgst:
+In Ihrem News-Feed werden Aktualisierungen angezeigt, wenn ein Benutzer, dem Sie folgen,
- Ein Repository mit einem Stern versieht.
- Einem anderen Benutzer folgt.
- ein öffentliches Repository erstellt.
@@ -43,7 +45,7 @@ In Deinem Newsfeed werden Aktualisierungen angezeigt, wenn ein Benutzer, dem Du
- Commits an ein von Dir beobachtetes Repository freigibt.
- Ein öffentliches Repository forkt.
-Weitere Informationen zu Sternen für Repositorys und zum Folgen von Personen findest Du unter „[Repositorys mit Sternen markieren ](/articles/saving-repositories-with-stars/)“ und „[Jemandem folgen](/articles/following-people).“
+Weitere Informationen zu Sternen für Repositorys und zum Folgen von Personen finden Sie unter „[Repositorys mit Sternen speichern ](/articles/saving-repositories-with-stars/)“ und „[Jemandem folgen](/articles/following-people)“.
### Empfohlene Repositorys erkunden
diff --git a/translations/de-DE/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md b/translations/de-DE/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
index 6b1c3afe84..52a69a7135 100644
--- a/translations/de-DE/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
+++ b/translations/de-DE/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
@@ -5,9 +5,7 @@ product: '{% data reusables.gated-features.github-insights %}'
redirect_from:
- /github/installing-and-configuring-github-insights/github-insights-and-data-protection-for-your-organization
versions:
- free-pro-team: '*'
enterprise-server: '*'
- github-ae: '*'
---
For more information about the terms that govern {% data variables.product.prodname_insights %}, see your {% data variables.product.prodname_ghe_one %} subscription agreement.
diff --git a/translations/de-DE/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md b/translations/de-DE/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
index 0232df31c6..181a60ee39 100644
--- a/translations/de-DE/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
+++ b/translations/de-DE/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
@@ -141,7 +141,8 @@ Bitte beachten Sie, dass die verfügbaren Informationen von Fall zu Fall variier
- Kommunikation oder Dokumentation (wie Probleme oder Wikis) in privaten Repositorys
- Alle Sicherheitsschlüssel, die für die Authentifizierung oder Verschlüsselung verwendet werden
-- **Unter dringenden Umständen** - Wenn wir unter bestimmten dringenden Umständen (wenn wir glauben, dass die Offenlegung notwendig ist, um einen Notfall mit Todesfolge oder schwerer Körperverletzung einer Person zu verhindern) um Informationen gebeten werden, können wir begrenzte Informationen offenlegen, die wir für notwendig erachten, damit die Strafverfolgungsbehörden den Notfall behandeln können. Für alle darüber hinausgehenden Informationen benötigen wir eine Vorladung, einen Durchsuchungsbefehl oder einen Gerichtsbeschluss, wie oben beschrieben. Beispielsweise werden wir Inhalte von privaten Repositorys nicht ohne einen Durchsuchungsbefehl offenlegen. Bevor wir Informationen weitergeben, bestätigen wir, dass die Anfrage von einer Strafverfolgungsbehörde stammt, eine Behörde eine offizielle Mitteilung über den Notfall übermittelte und wie die angeforderten Informationen bei der Bewältigung des Notfalls hilfreich sein werden.
+-
+**Unter dringenden Umständen** - Wenn wir unter bestimmten dringenden Umständen (wenn wir glauben, dass die Offenlegung notwendig ist, um einen Notfall mit Todesfolge oder schwerer Körperverletzung einer Person zu verhindern) um Informationen gebeten werden, können wir begrenzte Informationen offenlegen, die wir für notwendig erachten, damit die Strafverfolgungsbehörden den Notfall behandeln können. Für alle darüber hinausgehenden Informationen benötigen wir eine Vorladung, einen Durchsuchungsbefehl oder einen Gerichtsbeschluss, wie oben beschrieben. Beispielsweise werden wir Inhalte von privaten Repositorys nicht ohne einen Durchsuchungsbefehl offenlegen. Bevor wir Informationen weitergeben, bestätigen wir, dass die Anfrage von einer Strafverfolgungsbehörde stammt, eine Behörde eine offizielle Mitteilung über den Notfall übermittelte und wie die angeforderten Informationen bei der Bewältigung des Notfalls hilfreich sein werden.
### Kostenerstattung
diff --git a/translations/de-DE/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md b/translations/de-DE/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md
index d6834ecd1a..f4eb09e59f 100644
--- a/translations/de-DE/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md
+++ b/translations/de-DE/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md
@@ -10,7 +10,7 @@ versions:
### About data use for your private repository
-When you enable data use for your private repository, you'll be able to access the dependency graph, where you can track your repository's dependencies and receive {% data variables.product.prodname_dependabot_short %} alerts when {% data variables.product.product_name %} detects vulnerable dependencies. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies#github-dependabot-alerts-for-vulnerable-dependencies)." |
+When you enable data use for your private repository, you'll be able to access the dependency graph, where you can track your repository's dependencies and receive {% data variables.product.prodname_dependabot_alerts %} when {% data variables.product.product_name %} detects vulnerable dependencies. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies#dependabot-alerts-for-vulnerable-dependencies)." |
### Enabling or disabling data use features
diff --git a/translations/de-DE/content/github/using-git/about-git-subtree-merges.md b/translations/de-DE/content/github/using-git/about-git-subtree-merges.md
index 5f64b23c47..9bdeb8cd4f 100644
--- a/translations/de-DE/content/github/using-git/about-git-subtree-merges.md
+++ b/translations/de-DE/content/github/using-git/about-git-subtree-merges.md
@@ -105,5 +105,5 @@ $ git pull -s subtree spoon-knife main
### Weiterführende Informationen
-- [Kapitel „Eine Unterstruktur zusammenführen“ im _Pro Git_-Buch](https://git-scm.com/book/en/Git-Tools-Subtree-Merging)
+- [The "Advanced Merging" chapter from the _Pro Git_ book](https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging)
- „[Die Strategie des Zusammenführens von Unterstrukturen verwenden](https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html)“
diff --git a/translations/de-DE/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md b/translations/de-DE/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md
index e674add356..ee6e10f5bc 100644
--- a/translations/de-DE/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md
+++ b/translations/de-DE/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md
@@ -47,7 +47,7 @@ You can use the dependency graph to:
{% if currentVersion == "free-pro-team@latest" %}To generate a dependency graph, {% data variables.product.product_name %} needs read-only access to the dependency manifest and lock files for a repository. The dependency graph is automatically generated for all public repositories and you can choose to enable it for private repositories. For information about enabling or disabling it for private repositories, see "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)."{% endif %}
-{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
+{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_alerts %}. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."
diff --git a/translations/de-DE/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md b/translations/de-DE/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md
index 7ab0d25e9f..4ad3ce598e 100644
--- a/translations/de-DE/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md
+++ b/translations/de-DE/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md
@@ -37,7 +37,7 @@ If vulnerabilities have been detected in the repository, these are shown at the
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}
Any direct and indirect dependencies that are specified in the repository's manifest or lock files are listed, grouped by ecosystem. If vulnerabilities have been detected in the repository, these are shown at the top of the view for users with access to
-{% data variables.product.prodname_dependabot_short %} alerts.
+{% data variables.product.prodname_dependabot_alerts %}.
{% note %}
diff --git a/translations/de-DE/content/github/working-with-github-pages/about-github-pages.md b/translations/de-DE/content/github/working-with-github-pages/about-github-pages.md
index 75de4fdaed..3fb6f1beba 100644
--- a/translations/de-DE/content/github/working-with-github-pages/about-github-pages.md
+++ b/translations/de-DE/content/github/working-with-github-pages/about-github-pages.md
@@ -36,9 +36,9 @@ Organization owners can disable the publication of
Es gibt drei Arten von {% data variables.product.prodname_pages %}-Websites: Projekt-, Benutzer- und Organisations-Websites. Projekt-Websites sind mit einem bestimmten Projekt verbunden, das auf {% data variables.product.product_name %} gehostet wird, z. B. einer JavaScript-Bibliothek oder einer Rezeptsammlung. Benutzer- und Organisations-Websites sind mit einem bestimmten {% data variables.product.product_name %}-Konto verbunden.
-To publish a user site, you must create a repository owned by your user account that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. To publish an organization site, you must create a repository owned by an organization that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, user and organization sites are available at `http(s)://.github.io` or `http(s)://.github.io`.{% elsif currentVersion == "github-ae@latest" %}User and organization sites are available at `http(s)://pages./` or `http(s)://pages./`.{% endif %}
+To publish a user site, you must create a repository owned by your user account that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. To publish an organization site, you must create a repository owned by an organization that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, user and organization sites are available at `http(s)://.github.io` or `http(s)://.github.io`.{% elsif currentVersion == "github-ae@latest" %}User and organization sites are available at `http(s)://pages./` or `http(s)://pages./`.{% endif %}
-Die Quelldateien für eine Projekt-Website werden im selben Repository gespeichert wie das zugehörige Projekt. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, project sites are available at `http(s)://.github.io/` or `http(s)://.github.io/`.{% elsif currentVersion == "github-ae@latest" %}Project sites are available at `http(s)://pages.///` or `http(s)://pages.///`.{% endif %}
+Die Quelldateien für eine Projekt-Website werden im selben Repository gespeichert wie das zugehörige Projekt. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, project sites are available at `http(s)://.github.io/` or `http(s)://.github.io/`.{% elsif currentVersion == "github-ae@latest" %}Project sites are available at `http(s)://pages.///` or `http(s)://pages.///`.{% endif %}
{% if currentVersion == "free-pro-team@latest" %}
Weitere Informationen dazu, wie sich die URL Ihrer Website bei benutzerdefinierten Domains ändert, finden Sie unter „[Informationen zu benutzerdefinierten Domains und {% data variables.product.prodname_pages %}](/articles/about-custom-domains-and-github-pages)“.
@@ -63,7 +63,7 @@ Weitere Informationen findest Du unter „[Subdomänen-Isolation aktivieren](/en
{% if currentVersion == "free-pro-team@latest" %}
{% note %}
-**Hinweis:** Repositorys, die das alte Namensschema `.github.com` verwenden, werden noch veröffentlicht, aber Besucher werden von `http(s)://.github.com` auf `http(s)://.github.io` weitergeleitet. Wenn sowohl ein `.github.com`- als auch ein `.github.io`-Repository vorhanden sind, wird nur das `.github.io`-Repository veröffentlicht.
+**Note:** Repositories using the legacy `.github.com` naming scheme will still be published, but visitors will be redirected from `http(s)://.github.com` to `http(s)://.github.io`. If both a `.github.com` and `.github.io` repository exist, only the `.github.io` repository will be published.
{% endnote %}
{% endif %}
diff --git a/translations/de-DE/content/github/working-with-github-pages/creating-a-github-pages-site.md b/translations/de-DE/content/github/working-with-github-pages/creating-a-github-pages-site.md
index 47a3319a05..f731cdda2f 100644
--- a/translations/de-DE/content/github/working-with-github-pages/creating-a-github-pages-site.md
+++ b/translations/de-DE/content/github/working-with-github-pages/creating-a-github-pages-site.md
@@ -2,6 +2,9 @@
title: Creating a GitHub Pages site
intro: 'Sie können eine {% data variables.product.prodname_pages %}-Website in einem neuen oder vorhandenen Repository erstellen.'
redirect_from:
+ - /articles/creating-pages-manually/
+ - /articles/creating-project-pages-manually/
+ - /articles/creating-project-pages-from-the-command-line/
- /articles/creating-project-pages-using-the-command-line/
- /articles/creating-a-github-pages-site
product: '{% data reusables.gated-features.pages %}'
diff --git a/translations/de-DE/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md b/translations/de-DE/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md
index e6d4ceb237..881058bb62 100644
--- a/translations/de-DE/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md
+++ b/translations/de-DE/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md
@@ -41,7 +41,7 @@ Zum Einrichten einer `www`- oder benutzerdefinierten Subdomäne wie `www.example
{% data reusables.repositories.sidebar-settings %}
{% data reusables.pages.save-custom-domain %}
5. Navigiere zu Deinem DNS-Provider, und erstelle einen `CNAME` Datensatz, welcher Deine Subdomäne auf die Standarddomäne Deiner Website verweist. Soll beispielsweise die Subdomäne `www.example.com` für Deine Benutzer-Website verwendet werden, erstelle einen `CNAME`-Datensatz, mit dem `www.example.com` auf `.github.io` verweist. If you want to use the subdomain `www.anotherexample.com` for your organization site, create a `CNAME` record that points `www.anotherexample.com` to `.github.io`. The `CNAME` file should always point to `.github.io` or `.github.io`, excluding the repository name.
-{% data reusables.pages.contact-dns-provider %}{% data reusables.pages.default-domain-information %}
+{% data reusables.pages.contact-dns-provider %} {% data reusables.pages.default-domain-information %}
{% data reusables.command_line.open_the_multi_os_terminal %}
6. Prüfe die korrekte Konfiguration des DNS-Datensatzes mit dem Befehl `dig`, und ersetze _WWW.EXAMPLE.COM_ dabei durch Deine Subdomäne.
```shell
diff --git a/translations/de-DE/content/github/working-with-github-pages/troubleshooting-jekyll-build-errors-for-github-pages-sites.md b/translations/de-DE/content/github/working-with-github-pages/troubleshooting-jekyll-build-errors-for-github-pages-sites.md
index 4e7b3ed624..77791115bb 100644
--- a/translations/de-DE/content/github/working-with-github-pages/troubleshooting-jekyll-build-errors-for-github-pages-sites.md
+++ b/translations/de-DE/content/github/working-with-github-pages/troubleshooting-jekyll-build-errors-for-github-pages-sites.md
@@ -183,6 +183,6 @@ Zur Fehlerbehebung prüfe, ob alle Ausgabe-Tags in der Datei, die in der Fehlerm
Dieser Fehler bedeutet, dass Dein Code ein nicht erkanntes Liquid-Tag enthält.
-Zur Fehlerbehebung prüfe, ob alle Liquid-Tags in der Datei, die in der Fehlermeldung genannt ist, den Jekyll-Standardvariablen entsprechen und ob die Tag-Namen korrekt geschrieben sind. Eine Liste der Standardvariablen findest Du unter „[Variables](https://jekyllrb.com/docs/variables/)“ (Variablen) in der Jekyll-Dokumentation.
+Zur Fehlerbehebung prüfe, ob alle Liquid-Tags in der Datei, die in der Fehlermeldung genannt ist, den Jekyll-Standardvariablen entsprechen und ob die Tag-Namen korrekt geschrieben sind. For a list of default variables, see "[Variables](https://jekyllrb.com/docs/variables/)" in the Jekyll documentation.
Nicht unterstützte Plug-ins sind häufig die Quelle für unbekannte Tags. Wenn Sie ein nicht unterstütztes Plug-in auf der Website verwenden, also die Website lokal erstellen und die statischen Dateien per Push-Verfahren an {% data variables.product.product_name %} übertragen, darf das Plug-in keine Tags umfassen, die nicht in den Jekyll-Standardvariablen aufgeführt sind. Eine Liste der unterstützten Plug-ins findest Du unter „[Informationen zu {% data variables.product.prodname_pages %} und Jekyll](/articles/about-github-pages-and-jekyll#plugins).“
diff --git a/translations/de-DE/content/graphql/guides/managing-enterprise-accounts.md b/translations/de-DE/content/graphql/guides/managing-enterprise-accounts.md
index 395f5dd68f..8398740df1 100644
--- a/translations/de-DE/content/graphql/guides/managing-enterprise-accounts.md
+++ b/translations/de-DE/content/graphql/guides/managing-enterprise-accounts.md
@@ -203,6 +203,6 @@ For more information about getting started with GraphQL, see "[Introduction to G
Here's an overview of the new queries, mutations, and schema defined types available for use with the Enterprise Accounts API.
-For more details about the new queries, mutations, and schema defined types available for use with the Enterprise Accounts API, see the sdiebar with detailed GraphQL definitions from any [GraphQL reference page](/v4/).
+For more details about the new queries, mutations, and schema defined types available for use with the Enterprise Accounts API, see the sidebar with detailed GraphQL definitions from any [GraphQL reference page](/v4/).
You can access the reference docs from within the GraphQL explorer on GitHub. For more information, see "[Using the explorer](/v4/guides/using-the-explorer#accessing-the-sidebar-docs)." For other information, such as authentication and rate limit details, check out the [guides](/v4/guides).
diff --git a/translations/de-DE/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md b/translations/de-DE/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md
index f2876c09bd..d0a6b12541 100644
--- a/translations/de-DE/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md
+++ b/translations/de-DE/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md
@@ -90,7 +90,7 @@ You can create and manage custom teams in {% data variables.product.prodname_ins
{% data reusables.github-insights.settings-tab %}
{% data reusables.github-insights.teams-tab %}
{% data reusables.github-insights.edit-team %}
-3. Under "Contributors", use the drop-down menu and select a contributor. 
+3. Under "Contributors", use the drop-down menu and select a contributor. 
4. Klicke auf **Done** (Fertig).
#### Removing a contributor from a custom team
diff --git a/translations/de-DE/content/packages/publishing-and-managing-packages/about-github-packages.md b/translations/de-DE/content/packages/publishing-and-managing-packages/about-github-packages.md
index 861ead7880..b37386ead3 100644
--- a/translations/de-DE/content/packages/publishing-and-managing-packages/about-github-packages.md
+++ b/translations/de-DE/content/packages/publishing-and-managing-packages/about-github-packages.md
@@ -83,7 +83,7 @@ For more information about the container support offered by
#### Support for package registries
{% if currentVersion == "free-pro-team@latest" %}
-Package registries use `PACKAGE-TYPE.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` as the package host URL, replacing `PACKAGE-TYPE` with the Package namespace. For example, your Gemfile will be hosted at `rubygem.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME`.
+Package registries use `PACKAGE-TYPE.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` as the package host URL, replacing `PACKAGE-TYPE` with the Package namespace. For example, your Gemfile will be hosted at `rubygems.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME`.
{% else %}
@@ -98,8 +98,8 @@ If {% data variables.product.product_location %} has subdomain isolation disable
| ---------- | ------------------------------------------------------ | -------------------------------------- | ------------ | ----------------------------------------------------- |
| JavaScript | Node package manager | `package.json` | `npm` | `npm.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
| Ruby | RubyGems package manager | `Gemfile` | `gem` | `rubygems.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
-| Java | Apache Maven project management and comprehension tool | `pom.xml` | `mvn` | `maven.HOSTNAME/OWNER/REPOSITORY/IMAGE-NAME` |
-| Java | Gradle-Tool für die Build-Automatisierung für Java | `build.gradle` oder `build.gradle.kts` | `gradle` | `maven.HOSTNAME/OWNER/REPOSITORY/IMAGE-NAME` |
+| Java | Apache Maven project management and comprehension tool | `pom.xml` | `mvn` | `maven.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
+| Java | Gradle-Tool für die Build-Automatisierung für Java | `build.gradle` oder `build.gradle.kts` | `gradle` | `maven.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
| .NET | NuGet-Paketmanagement für .NET | `nupkg` | `dotnet` CLI | `nuget.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
{% else %}
@@ -161,15 +161,15 @@ For more information, see "[Creating a personal access token](/github/authentica
To install or publish a package, you must use a token with the appropriate scope, and your user account must have appropriate permissions for that repository.
Ein Beispiel:
-- To download and install packages from a repository, your token must have the `read:packages` scope, and your user account must have read permissions for the repository. If the repository is private, your token must also have the `repo` scope.
+- To download and install packages from a repository, your token must have the `read:packages` scope, and your user account must have read permissions for the repository.
- To delete a specified version of a private package on {% data variables.product.prodname_dotcom %}, your token must have the `delete:packages` and `repo` scope. Public packages cannot be deleted. Weitere Informationen findest Du unter „[Ein Paket löschen](/packages/publishing-and-managing-packages/deleting-a-package)."
-| Scope | Beschreibung | Repository permissions |
-| ----------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ---------------------- |
-| `read:packages` | Download and install packages from {% data variables.product.prodname_registry %} | Lesen |
-| `write:packages` | Upload and publish packages to {% data variables.product.prodname_registry %} | schreiben |
-| `delete:packages` | Delete specified versions of private packages from {% data variables.product.prodname_registry %} | verwalten |
-| `repo` | Install, upload, and delete certain packages in private repositories (along with `read:packages`, `write:packages`, or `delete:packages`) | read, write, or admin |
+| Scope | Beschreibung | Repository permissions |
+| ----------------- | ------------------------------------------------------------------------------------------------- | ---------------------- |
+| `read:packages` | Download and install packages from {% data variables.product.prodname_registry %} | Lesen |
+| `write:packages` | Upload and publish packages to {% data variables.product.prodname_registry %} | schreiben |
+| `delete:packages` | Delete specified versions of private packages from {% data variables.product.prodname_registry %} | verwalten |
+| `repo` | Upload and delete packages (along with `write:packages`, or `delete:packages`) | write, or admin |
When you create a {% data variables.product.prodname_actions %} workflow, you can use the `GITHUB_TOKEN` to publish and install packages in {% data variables.product.prodname_registry %} without needing to store and manage a personal access token.
diff --git a/translations/de-DE/content/packages/publishing-and-managing-packages/publishing-a-package.md b/translations/de-DE/content/packages/publishing-and-managing-packages/publishing-a-package.md
index e47374863e..53b90403f1 100644
--- a/translations/de-DE/content/packages/publishing-and-managing-packages/publishing-a-package.md
+++ b/translations/de-DE/content/packages/publishing-and-managing-packages/publishing-a-package.md
@@ -22,7 +22,7 @@ You can help people understand and use your package by providing a description a
{% if currentVersion == "free-pro-team@latest" %}
If a new version of a package fixes a security vulnerability, you should publish a security advisory in your repository.
-{% data variables.product.prodname_dotcom %} reviews each published security advisory and may use it to send {% data variables.product.prodname_dependabot_short %} alerts to affected repositories. For more information, see "[About GitHub Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)."
+{% data variables.product.prodname_dotcom %} reviews each published security advisory and may use it to send {% data variables.product.prodname_dependabot_alerts %} to affected repositories. For more information, see "[About GitHub Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)."
{% endif %}
### Ein Paket veröffentlichen
diff --git a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md
index 461673a686..c50d2b9271 100644
--- a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md
+++ b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md
@@ -27,7 +27,7 @@ You can authenticate to {% data variables.product.prodname_registry %} with Apac
In the `servers` tag, add a child `server` tag with an `id`, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, and *TOKEN* with your personal access token.
-In the `repositories` tag, configure a repository by mapping the `id` of the repository to the `id` you added in the `server` tag containing your credentials. Replace {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}*REPOSITORY* with the name of the repository you'd like to publish a package to or install a package from, and *OWNER* with the name of the user or organization account that owns the repository. {% data reusables.package_registry.lowercase-name-field %}
+In the `repositories` tag, configure a repository by mapping the `id` of the repository to the `id` you added in the `server` tag containing your credentials. Replace {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}*REPOSITORY* with the name of the repository you'd like to publish a package to or install a package from, and *OWNER* with the name of the user or organization account that owns the repository. Because uppercase letters aren't supported, you must use lowercase letters for the repository owner even if the {% data variables.product.prodname_dotcom %} user or organization name contains uppercase letters.
If you want to interact with multiple repositories, you can add each repository to separate `repository` children in the `repositories` tag, mapping the `id` of each to the credentials in the `servers` tag.
diff --git a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md
index 488ea88acb..cafb2ffa1e 100644
--- a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md
+++ b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md
@@ -65,13 +65,17 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen
{% data reusables.package_registry.package-registry-with-github-tokens %}
-### Ein Paket veröffentlichen
+### Publishing an image
{% data reusables.package_registry.docker_registry_deprecation_status %}
-{% data variables.product.prodname_registry %} unterstützt mehrere Top-Level-Docker-Images pro Repository. A repository can have any number of image tags. You may experience degraded service publishing or installing Docker images larger than 10GB, layers are capped at 5GB each. For more information, see "[Docker tag](https://docs.docker.com/engine/reference/commandline/tag/)" in the Docker documentation.
+{% note %}
-{% data reusables.package_registry.lowercase-name-field %}
+**Note:** Image names must only use lowercase letters.
+
+{% endnote %}
+
+{% data variables.product.prodname_registry %} unterstützt mehrere Top-Level-Docker-Images pro Repository. A repository can have any number of image tags. You may experience degraded service publishing or installing Docker images larger than 10GB, layers are capped at 5GB each. For more information, see "[Docker tag](https://docs.docker.com/engine/reference/commandline/tag/)" in the Docker documentation.
{% data reusables.package_registry.viewing-packages %}
@@ -181,11 +185,11 @@ $ docker push docker.HOSTNAME/octocat/octo-app/monalisa:1.0
```
{% endif %}
-### Ein Paket installieren
+### Downloading an image
{% data reusables.package_registry.docker_registry_deprecation_status %}
-You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %}
+You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install.
{% if currentVersion == "free-pro-team@latest" %}
```shell
diff --git a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md
index b2e0c5cf27..42c60fee43 100644
--- a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md
+++ b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md
@@ -78,7 +78,7 @@ If your instance has subdomain isolation disabled:
### Ein Paket veröffentlichen
-You can publish a package to {% data variables.product.prodname_registry %} by authenticating with a *nuget.config* file. When publishing, you need to use the same value for `OWNER` in your *csproj* file that you use in your *nuget.config* authentication file. Specify or increment the version number in your *.csproj* file, then use the `dotnet pack` command to create a *.nuspec* file for that version. Weitere Informationen zum Erstellen eines Pakets finden Sie unter „[Ein Paket erstellen und veröffentlichen](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package-using-the-dotnet-cli)“ in der Microsoft-Dokumentation.
+You can publish a package to {% data variables.product.prodname_registry %} by authenticating with a *nuget.config* file. When publishing, you need to use the same value for `OWNER` in your *csproj* file that you use in your *nuget.config* authentication file. Specify or increment the version number in your *.csproj* file, then use the `dotnet pack` command to create a *.nuspec* file for that version. For more information on creating your package, see "[Create and publish a package](https://docs.microsoft.com/nuget/quickstart/create-and-publish-a-package-using-the-dotnet-cli)" in the Microsoft documentation.
{% data reusables.package_registry.viewing-packages %}
@@ -160,7 +160,7 @@ For example, the *OctodogApp* and *OctocatApp* projects will publish to the same
### Ein Paket installieren
-Using packages from {% data variables.product.prodname_dotcom %} in your project is similar to using packages from *nuget.org*. Add your package dependencies to your *.csproj* file, specifying the package name and version. For more information on using a *.csproj* file in your project, see "[Working with NuGet packages](https://docs.microsoft.com/en-us/nuget/consume-packages/overview-and-workflow)" in the Microsoft documentation.
+Using packages from {% data variables.product.prodname_dotcom %} in your project is similar to using packages from *nuget.org*. Add your package dependencies to your *.csproj* file, specifying the package name and version. For more information on using a *.csproj* file in your project, see "[Working with NuGet packages](https://docs.microsoft.com/nuget/consume-packages/overview-and-workflow)" in the Microsoft documentation.
{% data reusables.package_registry.authenticate-step %}
diff --git a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md
index f9c89adc44..00a5cb51a1 100644
--- a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md
+++ b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md
@@ -30,7 +30,7 @@ Replace *REGISTRY-URL* with the URL for your instance's Maven registry. If your
{% data variables.product.prodname_ghe_server %} instance.
{% endif %}
-Replace *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, *REPOSITORY* with the name of the repository containing the package you want to publish, and *OWNER* with the name of the user or organization account on {% data variables.product.prodname_dotcom %} that owns the repository. {% data reusables.package_registry.lowercase-name-field %}
+Replace *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, *REPOSITORY* with the name of the repository containing the package you want to publish, and *OWNER* with the name of the user or organization account on {% data variables.product.prodname_dotcom %} that owns the repository. Because uppercase letters aren't supported, you must use lowercase letters for the repository owner even if the {% data variables.product.prodname_dotcom %} user or organization name contains uppercase letters.
{% note %}
diff --git a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md
index 866741929a..271fc18da2 100644
--- a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md
+++ b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md
@@ -75,22 +75,28 @@ registry=https://npm.pkg.github.com/OWNER
### Ein Paket veröffentlichen
+{% note %}
+
+**Note:** Package names and scopes must only use lowercase letters.
+
+{% endnote %}
+
By default, {% data variables.product.prodname_registry %} publishes a package in the {% data variables.product.prodname_dotcom %} repository you specify in the name field of the *package.json* file. Ein Paket namens `@my-org/test` würde beispielsweise im Repository `my-org/test` auf {% data variables.product.prodname_dotcom %} veröffentlicht. You can add a summary for the package listing page by including a *README.md* file in your package directory. For more information, see "[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)" and "[How to create Node.js Modules](https://docs.npmjs.com/getting-started/creating-node-modules)" in the npm documentation.
You can publish multiple packages to the same {% data variables.product.prodname_dotcom %} repository by including a `URL` field in the *package.json* file. For more information, see "[Publishing multiple packages to the same repository](#publishing-multiple-packages-to-the-same-repository)."
-Die Scope-Zuordnung für Ihr Projekt können Sie entweder über die lokale *.npmrc*-Datei im Projekt oder die Option `publishConfig` in der Datei *package.json* festlegen. {% data variables.product.prodname_registry %} only supports scoped npm packages. Pakete mit Scopes weisen Namen im Format `@owner/name` auf. Pakete mit Scopes beginnen immer mit dem Symbol `@`. Eventuell müssen Sie den Namen in der Datei *package.json* aktualisieren, um den Namen mit Scope zu verwenden. Beispiel: `"name": "@codertocat/hello-world-npm"`.
+Die Scope-Zuordnung für Ihr Projekt können Sie entweder über die lokale *.npmrc*-Datei im Projekt oder die Option `publishConfig` in der Datei *package.json* festlegen. {% data variables.product.prodname_registry %} only supports scoped npm packages. Pakete mit Scopes weisen Namen im Format `@owner/name` auf. Pakete mit Scopes beginnen immer mit dem Symbol `@`. You may need to update the name in your *package.json* to use the scoped name. Beispiel: `"name": "@codertocat/hello-world-npm"`.
{% data reusables.package_registry.viewing-packages %}
#### Publishing a package using a local *.npmrc* file
-You can use an *.npmrc* file to configure the scope mapping for your project. In the *.npmrc* file, use the {% data variables.product.prodname_registry %} URL and account owner so {% data variables.product.prodname_registry %} knows where to route package requests. Using an *.npmrc* file prevents other developers from accidentally publishing the package to npmjs.org instead of {% data variables.product.prodname_registry %}. {% data reusables.package_registry.lowercase-name-field %}
+You can use an *.npmrc* file to configure the scope mapping for your project. In the *.npmrc* file, use the {% data variables.product.prodname_registry %} URL and account owner so {% data variables.product.prodname_registry %} knows where to route package requests. Using an *.npmrc* file prevents other developers from accidentally publishing the package to npmjs.org instead of {% data variables.product.prodname_registry %}.
{% data reusables.package_registry.authenticate-step %}
{% data reusables.package_registry.create-npmrc-owner-step %}
{% data reusables.package_registry.add-npmrc-to-repo-step %}
-4. Überprüfen Sie den Namen Ihres Pakets in der Datei *package.json* Ihres Projekts. Das Feld `name` (Name) muss den Scope und den Namen des Pakets enthalten. For example, if your package is called "test", and you are publishing to the "My-org"
+1. Überprüfen Sie den Namen Ihres Pakets in der Datei *package.json* Ihres Projekts. Das Feld `name` (Name) muss den Scope und den Namen des Pakets enthalten. For example, if your package is called "test", and you are publishing to the "My-org"
{% data variables.product.prodname_dotcom %} organization, the `name` field in your *package.json* should be `@my-org/test`.
{% data reusables.package_registry.verify_repository_field %}
{% data reusables.package_registry.publish_package %}
@@ -137,7 +143,7 @@ To ensure the repository's URL is correct, replace REPOSITORY with the name of t
### Ein Paket installieren
-You can install packages from {% data variables.product.prodname_registry %} by adding the packages as dependencies in the *package.json* file for your project. Weitere Informationen zum Verwenden einer *package.json*-Datei in Ihrem Projekt finden Sie unter „[Mit package.json arbeiten](https://docs.npmjs.com/getting-started/using-a-package.json)“ in der npm-Dokumentation.
+You can install packages from {% data variables.product.prodname_registry %} by adding the packages as dependencies in the *package.json* file for your project. For more information on using a *package.json* in your project, see "[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)" in the npm documentation.
By default, you can add packages from one organization. For more information, see "[Installing packages from other organizations](#installing-packages-from-other-organizations)."
@@ -169,7 +175,7 @@ You also need to add the *.npmrc* file to your project so all requests to instal
#### Pakete von anderen Organisationen installieren
-Standardmäßig können Sie nur {% data variables.product.prodname_registry %}-Pakete von einer Organisation verwenden. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %}
+Standardmäßig können Sie nur {% data variables.product.prodname_registry %}-Pakete von einer Organisation verwenden. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project.
{% if enterpriseServerVersions contains currentVersion %}
If your instance has subdomain isolation enabled:
@@ -177,8 +183,8 @@ If your instance has subdomain isolation enabled:
```shell
registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME{% endif %}/OWNER
-@OWNER:registry={% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}
-@OWNER:registry={% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}
+@OWNER:registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}
+@OWNER:registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}
```
{% if enterpriseServerVersions contains currentVersion %}
@@ -186,8 +192,8 @@ If your instance has subdomain isolation disabled:
```shell
registry=https://HOSTNAME/_registry/npm/OWNER
-@OWNER:registry=HOSTNAME/_registry/npm/
-@OWNER:registry=HOSTNAME/_registry/npm/
+@OWNER:registry=https://HOSTNAME/_registry/npm/
+@OWNER:registry=https://HOSTNAME/_registry/npm/
```
{% endif %}
diff --git a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md
index 807e7e75ab..eb45556853 100644
--- a/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md
+++ b/translations/de-DE/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md
@@ -75,8 +75,6 @@ If you don't have a *~/.gemrc* file, create a new *~/.gemrc* file using this exa
To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance.{% endif %}
-{% data reusables.package_registry.lowercase-name-field %}
-
```shell
$ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER USERNAME:TOKEN
```
diff --git a/translations/de-DE/content/rest/overview/api-previews.md b/translations/de-DE/content/rest/overview/api-previews.md
index 96f3faacd9..591775d14d 100644
--- a/translations/de-DE/content/rest/overview/api-previews.md
+++ b/translations/de-DE/content/rest/overview/api-previews.md
@@ -70,14 +70,6 @@ Manage [projects](/v3/projects/).
**Custom media type:** `cloak-preview` **Announced:** [2017-01-05](https://developer.github.com/changes/2017-01-05-commit-search-api/)
-{% if currentVersion == "free-pro-team@latest" %}
-### Community profile metrics
-
-Retrieve [community profile metrics](/v3/repos/community/) (also known as community health) for any public repository.
-
-**Custom media type:** `black-panther-preview` **Announced:** [2017-02-09](https://developer.github.com/changes/2017-02-09-community-health/)
-{% endif %}
-
{% if currentVersion == "free-pro-team@latest" %}
### User blocking
@@ -206,16 +198,6 @@ You can now provide more information in GitHub for URLs that link to registered
**Custom media types:** `corsair-preview` **Announced:** [2018-12-10](https://developer.github.com/changes/2018-12-10-content-attachments-api/)
-{% if currentVersion == "free-pro-team@latest" %}
-
-### Interaction restrictions for repositories and organizations
-
-Allows you to temporarily restrict interactions, such as commenting, opening issues, and creating pull requests, for {% data variables.product.product_name %} repositories or organizations. When enabled, only the specified group of {% data variables.product.product_name %} users will be able to participate in these interactions. See the [Repository interactions](/v3/interactions/repos/) and [Organization interactions](/v3/interactions/orgs/) APIs for more details.
-
-**Custom media type:** `sombra-preview` **Announced:** [2018-12-18](https://developer.github.com/changes/2018-12-18-interactions-preview/)
-
-{% endif %}
-
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %}
### Entwürfe für Pull Requests
diff --git a/translations/de-DE/content/rest/overview/libraries.md b/translations/de-DE/content/rest/overview/libraries.md
index e673a1e4df..169441d839 100644
--- a/translations/de-DE/content/rest/overview/libraries.md
+++ b/translations/de-DE/content/rest/overview/libraries.md
@@ -11,13 +11,12 @@ versions:
- Octokit comes in
- many flavors
+ Octokit comes in many flavors
Use the official Octokit library, or choose between any of the available third party libraries.
-
@@ -25,138 +24,64 @@ versions:
### Clojure
-* [Tentacles][tentacles]
+Library name | Repository |---|---| **Tentacles**| [Raynes/tentacles](https://github.com/Raynes/tentacles)
### Dart
-* [github.dart][github.dart]
+Library name | Repository |---|---| **github.dart** | [DirectMyFile/github.dart](https://github.com/DirectMyFile/github.dart)
### Emacs Lisp
-* [gh.el][gh.el]
+Library name | Repository |---|---| **gh.el** | [sigma/gh.el](https://github.com/sigma/gh.el)
### Erlang
-* [octo.erl][octo-erl]
+Library name | Repository |---|---| **octo-erl** | [sdepold/octo.erl](https://github.com/sdepold/octo.erl)
### Go
-* [go-github][]
+Library name | Repository |---|---| **go-github**| [google/go-github](https://github.com/google/go-github)
### Haskell
-* [github][haskell-github]
+Library name | Repository |---|---| **haskell-github** | [fpco/Github](https://github.com/fpco/GitHub)
### Java
-* The [GitHub Java API (org.eclipse.egit.github.core)](https://github.com/eclipse/egit-github/tree/master/org.eclipse.egit.github.core) library is part of the [GitHub Mylyn Connector](https://github.com/eclipse/egit-github) and aims to support the entire GitHub v3 API. Builds are available in [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22org.eclipse.egit.github.core%22).
-* [GitHub API for Java (org.kohsuke.github)](http://github-api.kohsuke.org/) defines an object oriented representation of the GitHub API.
-* [JCabi GitHub API](http://github.jcabi.com) is based on Java7 JSON API (JSR-353), simplifies tests with a runtime GitHub stub, and covers the entire API.
+Library name | Repository | More information |---|---|---| **GitHub Java API**| [org.eclipse.egit.github.core](https://github.com/eclipse/egit-github/tree/master/org.eclipse.egit.github.core) | Is part of the [GitHub Mylyn Connector](https://github.com/eclipse/egit-github) and aims to support the entire GitHub v3 API. Builds are available in [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22org.eclipse.egit.github.core%22). **GitHub API for Java**| [org.kohsuke.github (From github-api)](http://github-api.kohsuke.org/)|defines an object oriented representation of the GitHub API. **JCabi GitHub API**|[github.jcabi.com (Personal Website)](http://github.jcabi.com)|is based on Java7 JSON API (JSR-353), simplifies tests with a runtime GitHub stub, and covers the entire API.
### JavaScript
-* [NodeJS GitHub library][octonode]
-* [gh3 client-side API v3 wrapper][gh3]
-* [GitHub.js wrapper around the GitHub API][github]
-* [Promise-Based CoffeeScript library for the browser or NodeJS][github-client]
+Library name | Repository | |---|---| **NodeJS GitHub library**| [pksunkara/octonode](https://github.com/pksunkara/octonode) **gh3 client-side API v3 wrapper**| [k33g/gh3](https://github.com/k33g/gh3) **Github.js wrapper around the GitHub API**|[michael/github](https://github.com/michael/github) **Promise-Based CoffeeScript library for the Browser or NodeJS**|[philschatz/github-client](https://github.com/philschatz/github-client)
### Julia
-* [GitHub.jl][github.jl]
+Library name | Repository | |---|---| **Github.jl**|[WestleyArgentum/Github.jl](https://github.com/WestleyArgentum/GitHub.jl)
### OCaml
-* [ocaml-github][ocaml-github]
+Library name | Repository | |---|---| **ocaml-github**|[mirage/ocaml-github](https://github.com/mirage/ocaml-github)
### Perl
-* [Pithub][pithub-github] ([CPAN][pithub-cpan])
-* [Net::GitHub][net-github-github] ([CPAN][net-github-cpan])
+Library name | Repository | metacpan Website for the Library |---|---|---| **Pithub**|[plu/Pithub](https://github.com/plu/Pithub)|[Pithub CPAN](http://metacpan.org/module/Pithub) **Net::Github**|[fayland/perl-net-github](https://github.com/fayland/perl-net-github)|[Net:Github CPAN](https://metacpan.org/pod/Net::GitHub)
### PHP
-* [GitHub PHP Client][github-php-client]
-* [PHP GitHub API][php-github-api]
-* [GitHub API][github-api]
-* [GitHub Joomla! Package][joomla]
-* [Github Nette Extension][kdyby-github]
-* [GitHub API Easy Access][milo-github-api]
-* [GitHub bridge for Laravel][github-laravel]
-* [PHP5.6|PHP7 Client & WebHook wrapper][flexyproject-githubapi]
+Library name | Repository |---|---| **GitHub PHP Client**|[tan-tan-kanarek/github-php-client](https://github.com/tan-tan-kanarek/github-php-client) **PHP GitHub API**|[KnpLabs/php-github-api](https://github.com/KnpLabs/php-github-api) **GitHub API**|[yiiext/github-api](https://github.com/yiiext/github-api) **GitHub Joomla! Package**|[joomla-framework/github-api](https://github.com/joomla-framework/github-api) **GitHub Nette Extension**|[kdyby/github](https://github.com/kdyby/github) **GitHub API Easy Access**|[milo/github-api](https://github.com/milo/github-api) **GitHub bridge for Laravel**|[GrahamCampbell/Laravel-Github](https://github.com/GrahamCampbell/Laravel-GitHub) **PHP7 Client & WebHook wrapper**|[FlexyProject/GithubAPI](https://github.com/FlexyProject/GitHubAPI)
### Python
-* [PyGithub][jacquev6_pygithub]
-* [libsaas][libsaas]
-* [github3.py][github3py]
-* [sanction][sanction]
-* [agithub][agithub]
-* [octohub][octohub]
-* [Github-Flask][github-flask]
-* [torngithub][torngithub]
+Library name | Repository |---|---| **PyGithub**|[PyGithub/PyGithub](https://github.com/PyGithub/PyGithub) **libsaas**|[duckboard/libsaas](https://github.com/ducksboard/libsaas) **github3.py**|[sigmavirus24/github3.py](https://github.com/sigmavirus24/github3.py) **sanction**|[demianbrecht/sanction](https://github.com/demianbrecht/sanction) **agithub**|[jpaugh/agithub](https://github.com/jpaugh/agithub) **octohub**|[turnkeylinux/octohub](https://github.com/turnkeylinux/octohub) **github-flask**|[github-flask (Oficial Website)](http://github-flask.readthedocs.org) **torngithub**|[jkeylu/torngithub](https://github.com/jkeylu/torngithub)
### Ruby
-* [GitHub API Gem][ghapi]
-* [Ghee][ghee]
+Library name | Repository |---|---| **GitHub API Gem**|[peter-murach/github](https://github.com/peter-murach/github) **Ghee**|[rauhryan/ghee](https://github.com/rauhryan/ghee)
### Scala
-* [Hubcat][hubcat]
-* [Github4s][github4s]
+Library name | Repository |---|---| **Hubcat**|[softprops/hubcat](https://github.com/softprops/hubcat) **Github4s**|[47deg/github4s](https://github.com/47deg/github4s)
### Shell
-* [ok.sh][ok.sh]
-
-[tentacles]: https://github.com/Raynes/tentacles
-
-[github.dart]: https://github.com/DirectMyFile/github.dart
-
-[gh.el]: https://github.com/sigma/gh.el
-
-[octo-erl]: https://github.com/sdepold/octo.erl
-
-[go-github]: https://github.com/google/go-github
-
-[haskell-github]: https://github.com/fpco/GitHub
-
-[octonode]: https://github.com/pksunkara/octonode
-[gh3]: https://github.com/k33g/gh3
-[github]: https://github.com/michael/github
-[github-client]: https://github.com/philschatz/github-client
-
-[github.jl]: https://github.com/WestleyArgentum/GitHub.jl
-
-[ocaml-github]: https://github.com/mirage/ocaml-github
-
-[net-github-github]: https://github.com/fayland/perl-net-github
-[net-github-cpan]: https://metacpan.org/pod/Net::GitHub
-[pithub-github]: https://github.com/plu/Pithub
-[pithub-cpan]: http://metacpan.org/module/Pithub
-
-[github-php-client]: https://github.com/tan-tan-kanarek/github-php-client
-[php-github-api]: https://github.com/KnpLabs/php-github-api
-[github-api]: https://github.com/yiiext/github-api
-[joomla]: https://github.com/joomla-framework/github-api
-[kdyby-github]: https://github.com/kdyby/github
-[milo-github-api]: https://github.com/milo/github-api
-[github-laravel]: https://github.com/GrahamCampbell/Laravel-GitHub
-[flexyproject-githubapi]: https://github.com/FlexyProject/GitHubAPI
-
-[jacquev6_pygithub]: https://github.com/PyGithub/PyGithub
-[libsaas]: https://github.com/ducksboard/libsaas
-[github3py]: https://github.com/sigmavirus24/github3.py
-[sanction]: https://github.com/demianbrecht/sanction
-[agithub]: https://github.com/jpaugh/agithub "Agnostic GitHub"
-[octohub]: https://github.com/turnkeylinux/octohub
-[github-flask]: http://github-flask.readthedocs.org
-[torngithub]: https://github.com/jkeylu/torngithub
-
-[ghapi]: https://github.com/peter-murach/github
-[ghee]: https://github.com/rauhryan/ghee
-
-[hubcat]: https://github.com/softprops/hubcat
-[github4s]: https://github.com/47deg/github4s
-
-[ok.sh]: https://github.com/whiteinge/ok.sh
+Library name | Repository |---|---| **ok.sh**|[whiteinge/ok.sh](https://github.com/whiteinge/ok.sh)
diff --git a/translations/de-DE/content/rest/reference/actions.md b/translations/de-DE/content/rest/reference/actions.md
index 0a728de922..c2a0dbc37f 100644
--- a/translations/de-DE/content/rest/reference/actions.md
+++ b/translations/de-DE/content/rest/reference/actions.md
@@ -24,6 +24,7 @@ The Artifacts API allows you to download, delete, and retrieve information about
{% if operation.subcategory == 'artifacts' %}{% include rest_operation %}{% endif %}
{% endfor %}
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}
## Permissions
The Permissions API allows you to set permissions for what organizations and repositories are allowed to run {% data variables.product.prodname_actions %}, and what actions are allowed to run. For more information, see "[Usage limits, billing, and administration](/actions/reference/usage-limits-billing-and-administration#disabling-or-limiting-github-actions-for-your-repository-or-organization)."
@@ -33,6 +34,7 @@ You can also set permissions for an enterprise. For more information, see the "[
{% for operation in currentRestOperations %}
{% if operation.subcategory == 'permissions' %}{% include rest_operation %}{% endif %}
{% endfor %}
+{% endif %}
## Secrets
diff --git a/translations/de-DE/content/rest/reference/permissions-required-for-github-apps.md b/translations/de-DE/content/rest/reference/permissions-required-for-github-apps.md
index 04148e0567..6400690980 100644
--- a/translations/de-DE/content/rest/reference/permissions-required-for-github-apps.md
+++ b/translations/de-DE/content/rest/reference/permissions-required-for-github-apps.md
@@ -186,7 +186,7 @@ _Branches_
- [`POST /repos/:owner/:repo/branches/:branch/protection/required_signatures`](/v3/repos/branches/#create-commit-signature-protection) (:write)
- [`DELETE /repos/:owner/:repo/branches/:branch/protection/required_signatures`](/v3/repos/branches/#delete-commit-signature-protection) (:write)
- [`GET /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/v3/repos/branches/#get-status-checks-protection) (:read)
-- [`PATCH /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/v3/repos/branches/#update-status-check-potection) (:write)
+- [`PATCH /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/v3/repos/branches/#update-status-check-protection) (:write)
- [`DELETE /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/v3/repos/branches/#remove-status-check-protection) (:write)
- [`GET /repos/:owner/:repo/branches/:branch/protection/required_status_checks/contexts`](/v3/repos/branches/#get-all-status-check-contexts) (:read)
- [`POST /repos/:owner/:repo/branches/:branch/protection/required_status_checks/contexts`](/v3/repos/branches/#add-status-check-contexts) (:write)
diff --git a/translations/de-DE/data/glossaries/external.yml b/translations/de-DE/data/glossaries/external.yml
index 5768ddb6ad..05299e1c40 100644
--- a/translations/de-DE/data/glossaries/external.yml
+++ b/translations/de-DE/data/glossaries/external.yml
@@ -61,7 +61,7 @@
-
term: Branch
description: >-
- Ein Branch ist eine parallele Version eines Repositorys. Er ist im Repository enthalten, wirkt sich jedoch weder auf den primären noch auf den Master-Branch aus. Dadurch können Sie frei arbeiten, ohne die „Live“-Version zu unterbrechen. Nachdem Sie die gewünschten Änderungen vorgenommen haben, können Sie Ihren Branch zurück in den Master-Branch mergen, um Ihre Änderungen zu veröffentlichen.
+ A branch is a parallel version of a repository. It is contained within the repository, but does not affect the primary or main branch allowing you to work freely without disrupting the "live" version. When you've made the changes you want to make, you can merge your branch back into the main branch to publish your changes.
-
term: Branch-Einschränkung
description: >-
@@ -140,7 +140,8 @@
Ein kurzer, beschreibender Text zu einem Commit, in dem die Änderung kommuniziert wird, die der Commit nach sich zieht.
-
term: Branch vergleichen
- description: Der Branch, den Du benutzt, um einen Pull Request zu erstellen. Dieser Branch wird mit dem Basis-Branch verglichen, den Du für den Pull Request wählst, und die Änderungen werden identifiziert. Wenn der Pull Request zusammengeführt wird, wird der Basis-Branch mit den Änderungen aus dem Vergleichs-Branch aktualisiert. Auch bekannt als der „Head-Branch" des Pull Requests.
+ description: >-
+ Der Branch, den Du benutzt, um einen Pull Request zu erstellen. Dieser Branch wird mit dem Basis-Branch verglichen, den Du für den Pull Request wählst, und die Änderungen werden identifiziert. Wenn der Pull Request zusammengeführt wird, wird der Basis-Branch mit den Änderungen aus dem Vergleichs-Branch aktualisiert. Auch bekannt als der „Head-Branch" des Pull Requests.
-
term: fortlaufende Integration
description: >-
@@ -386,10 +387,14 @@
-
term: Markup
description: Ein System, um ein Dokument mit Anmerkungen zu versehen und zu formatieren.
+-
+ term: main
+ description: >-
+ The default development branch. Whenever you create a Git repository, a branch named "main" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required.
-
term: Master
description: >-
- Der standardmäßige Entwicklungs-Branch. Wenn Sie ein Git-Repository erstellen, wird ein Branch namens „Master“ erstellt und wird zum aktiven Branch. In den meisten Fällen enthält dieser die lokale Entwicklung, obwohl dies rein konventionell und nicht erforderlich ist.
+ The default branch in many Git repositories. By default, when you create a new Git repository on the command line a branch called `master` is created. Many tools now use an alternative name for the default branch. For example, when you create a new repository on GitHub the default branch is called `main`.
-
term: Mitgliederdiagramm
description: Ein Repository-Diagramm, in dem alle Forks eines Repositorys gezeigt werden.
@@ -677,7 +682,7 @@
-
term: Statuschecks
description: >-
- Statusprüfungen sind externe Prozesse, z. B. kontinuierliche Integrations-Builds, die für jeden Commit ausgeführt werden, den Du in einem Repository erstellen. Weitere Informationen findest Du unter „[Über Statusprüfungen](/articles/about-status-checks)."
+ Statusprüfungen sind externe Prozesse, z. B. kontinuierliche Integrations-Builds, die für jeden Commit ausgeführt werden, den Du in einem Repository erstellst. Weitere Informationen findest Du unter „[Über Statusprüfungen](/articles/about-status-checks)."
-
term: Stern
description: >-
diff --git a/translations/de-DE/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml b/translations/de-DE/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
index 92b91f6add..7ad2acba59 100644
--- a/translations/de-DE/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
+++ b/translations/de-DE/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
@@ -70,20 +70,6 @@ upcoming_changes:
date: '2020-10-01T00:00:00+00:00'
criticality: breaking
owner: mikesea
- -
- location: RepositoryCollaboratorEdge.permission
- description: Type for `permission` will change from `RepositoryPermission!` to `String`.
- reason: This field may return additional values
- date: '2020-10-01T00:00:00+00:00'
- criticality: breaking
- owner: oneill38
- -
- location: RepositoryInvitation.permission
- description: Type for `permission` will change from `RepositoryPermission!` to `String`.
- reason: This field may return additional values
- date: '2020-10-01T00:00:00+00:00'
- criticality: breaking
- owner: oneill38
-
location: RepositoryInvitationOrderField.INVITEE_LOGIN
description: "`INVITEE_LOGIN` will be removed."
@@ -98,13 +84,6 @@ upcoming_changes:
date: '2020-10-01T00:00:00+00:00'
criticality: breaking
owner: nholden
- -
- location: TeamRepositoryEdge.permission
- description: Type for `permission` will change from `RepositoryPermission!` to `String`.
- reason: This field may return additional values
- date: '2020-10-01T00:00:00+00:00'
- criticality: breaking
- owner: oneill38
-
location: EnterpriseMemberEdge.isUnlicensed
description: "`isUnlicensed` will be removed."
diff --git a/translations/de-DE/data/graphql/graphql_upcoming_changes.public.yml b/translations/de-DE/data/graphql/graphql_upcoming_changes.public.yml
index 767445fd44..c8040777f1 100644
--- a/translations/de-DE/data/graphql/graphql_upcoming_changes.public.yml
+++ b/translations/de-DE/data/graphql/graphql_upcoming_changes.public.yml
@@ -77,20 +77,6 @@ upcoming_changes:
date: '2020-10-01T00:00:00+00:00'
criticality: breaking
owner: mikesea
- -
- location: RepositoryCollaboratorEdge.permission
- description: Type for `permission` will change from `RepositoryPermission!` to `String`.
- reason: This field may return additional values
- date: '2020-10-01T00:00:00+00:00'
- criticality: breaking
- owner: oneill38
- -
- location: RepositoryInvitation.permission
- description: Type for `permission` will change from `RepositoryPermission!` to `String`.
- reason: This field may return additional values
- date: '2020-10-01T00:00:00+00:00'
- criticality: breaking
- owner: oneill38
-
location: RepositoryInvitationOrderField.INVITEE_LOGIN
description: "`INVITEE_LOGIN` will be removed."
@@ -105,13 +91,6 @@ upcoming_changes:
date: '2020-10-01T00:00:00+00:00'
criticality: breaking
owner: nholden
- -
- location: TeamRepositoryEdge.permission
- description: Type for `permission` will change from `RepositoryPermission!` to `String`.
- reason: This field may return additional values
- date: '2020-10-01T00:00:00+00:00'
- criticality: breaking
- owner: oneill38
-
location: EnterpriseMemberEdge.isUnlicensed
description: "`isUnlicensed` will be removed."
diff --git a/translations/de-DE/data/reusables/actions/actions-use-policy-settings.md b/translations/de-DE/data/reusables/actions/actions-use-policy-settings.md
index b25cd5eb26..02de83e2ef 100644
--- a/translations/de-DE/data/reusables/actions/actions-use-policy-settings.md
+++ b/translations/de-DE/data/reusables/actions/actions-use-policy-settings.md
@@ -1,3 +1,3 @@
-If you choose the option to **Allow specific actions**, there are additional options that you can configure. For more information, see "[Allowing specific actions to run](#allowing-specific-actions-to-run)."
+If you choose **Allow select actions**, local actions are allowed, and there are additional options for allowing other specific actions. For more information, see "[Allowing specific actions to run](#allowing-specific-actions-to-run)."
When you allow local actions only, the policy blocks all access to actions authored by {% data variables.product.prodname_dotcom %}. For example, the [`actions/checkout`](https://github.com/actions/checkout) would not be accessible.
\ No newline at end of file
diff --git a/translations/de-DE/data/reusables/actions/allow-specific-actions-intro.md b/translations/de-DE/data/reusables/actions/allow-specific-actions-intro.md
index 248668d773..d94816467d 100644
--- a/translations/de-DE/data/reusables/actions/allow-specific-actions-intro.md
+++ b/translations/de-DE/data/reusables/actions/allow-specific-actions-intro.md
@@ -1,4 +1,4 @@
-When you select the **Allow select actions**, there are additional options that you need to choose to configure the allowed actions:
+When you choose **Allow select actions**, local actions are allowed, and there are additional options for allowing other specific actions:
- **Allow actions created by {% data variables.product.prodname_dotcom %}:** You can allow all actions created by {% data variables.product.prodname_dotcom %} to be used by workflows. Actions created by {% data variables.product.prodname_dotcom %} are located in the `actions` and `github` organization. For more information, see the [`actions`](https://github.com/actions) and [`github`](https://github.com/github) organizations.
- **Allow Marketplace actions by verified creators:** You can allow all {% data variables.product.prodname_marketplace %} actions created by verified creators to be used by workflows. When GitHub has verified the creator of the action as a partner organization, the {% octicon "verified" aria-label="The verified badge" %} badge is displayed next to the action in {% data variables.product.prodname_marketplace %}.
diff --git a/translations/de-DE/data/reusables/community/interaction-limits-duration.md b/translations/de-DE/data/reusables/community/interaction-limits-duration.md
new file mode 100644
index 0000000000..fb858accd8
--- /dev/null
+++ b/translations/de-DE/data/reusables/community/interaction-limits-duration.md
@@ -0,0 +1 @@
+When you enable an interaction limit, you can choose a duration for the limit: 24 hours, 3 days, 1 week, 1 month, or 6 months.
\ No newline at end of file
diff --git a/translations/de-DE/data/reusables/community/interaction-limits-restrictions.md b/translations/de-DE/data/reusables/community/interaction-limits-restrictions.md
new file mode 100644
index 0000000000..1be2648d16
--- /dev/null
+++ b/translations/de-DE/data/reusables/community/interaction-limits-restrictions.md
@@ -0,0 +1 @@
+Enabling an interaction limit for a repository restricts certain users from commenting, opening issues, creating pull requests, reacting with emojis, editing existing comments, and editing titles of issues and pull requests.
\ No newline at end of file
diff --git a/translations/de-DE/data/reusables/community/set-interaction-limit.md b/translations/de-DE/data/reusables/community/set-interaction-limit.md
new file mode 100644
index 0000000000..468a068f70
--- /dev/null
+++ b/translations/de-DE/data/reusables/community/set-interaction-limit.md
@@ -0,0 +1 @@
+5. Under "Temporary interaction limits", to the right of the type of interaction limit you want to set, use the **Enable** drop-down menu, then click the duration you want for your interaction limit.
\ No newline at end of file
diff --git a/translations/de-DE/data/reusables/community/types-of-interaction-limits.md b/translations/de-DE/data/reusables/community/types-of-interaction-limits.md
new file mode 100644
index 0000000000..55a985de3f
--- /dev/null
+++ b/translations/de-DE/data/reusables/community/types-of-interaction-limits.md
@@ -0,0 +1,4 @@
+There are three types of interaction limits.
+ - **Limit to existing users** (Beschränkung für existierende Benutzer): Begrenzt die Aktivität für Benutzer, deren Konto erst seit weniger 24 Stunden besteht und die bisher keine Beiträge geleistet haben und keine Mitarbeiter sind.
+ - **Limit to prior contributors**: Limits activity for users who have not previously contributed to the default branch of the repository and are not collaborators.
+ - **Limit to repository collaborators**: Limits activity for users who do not have write access to the repository.
\ No newline at end of file
diff --git a/translations/de-DE/data/reusables/dependabot/click-dependabot-tab.md b/translations/de-DE/data/reusables/dependabot/click-dependabot-tab.md
index 2708240be3..90cff3fc19 100644
--- a/translations/de-DE/data/reusables/dependabot/click-dependabot-tab.md
+++ b/translations/de-DE/data/reusables/dependabot/click-dependabot-tab.md
@@ -1 +1 @@
-4. Under "Dependency graph", click **{% data variables.product.prodname_dependabot_short %}**. 
+4. Under "Dependency graph", click **{% data variables.product.prodname_dependabot %}**. 
diff --git a/translations/de-DE/data/reusables/dependabot/default-labels.md b/translations/de-DE/data/reusables/dependabot/default-labels.md
index 00fa428e67..9294fb86c1 100644
--- a/translations/de-DE/data/reusables/dependabot/default-labels.md
+++ b/translations/de-DE/data/reusables/dependabot/default-labels.md
@@ -1 +1 @@
-By default, {% data variables.product.prodname_dependabot %} raises all pull requests with the `dependencies` label. If more than one package manager is defined, {% data variables.product.prodname_dependabot_short %} includes an additional label on each pull request. This indicates which language or ecosystem the pull request will update, for example: `java` for Gradle updates and `submodules` for git submodule updates. {% data variables.product.prodname_dependabot %} creates these default labels automatically, as necessary in your repository.
+By default, {% data variables.product.prodname_dependabot %} raises all pull requests with the `dependencies` label. If more than one package manager is defined, {% data variables.product.prodname_dependabot %} includes an additional label on each pull request. This indicates which language or ecosystem the pull request will update, for example: `java` for Gradle updates and `submodules` for git submodule updates. {% data variables.product.prodname_dependabot %} creates these default labels automatically, as necessary in your repository.
diff --git a/translations/de-DE/data/reusables/dependabot/initial-updates.md b/translations/de-DE/data/reusables/dependabot/initial-updates.md
index 869d31ff84..fe4154576b 100644
--- a/translations/de-DE/data/reusables/dependabot/initial-updates.md
+++ b/translations/de-DE/data/reusables/dependabot/initial-updates.md
@@ -1,3 +1,3 @@
When you first enable version updates, you may have many dependencies that are outdated and some may be many versions behind the latest version. {% data variables.product.prodname_dependabot %} checks for outdated dependencies as soon as it's enabled. You may see new pull requests for version updates within minutes of adding the configuration file, depending on the number of manifest files for which you configure updates.
-To keep pull requests manageable and easy to review, {% data variables.product.prodname_dependabot_short %} raises a maximum of five pull requests to start bringing dependencies up to the latest version. If you merge some of these first pull requests before the next scheduled update, then further pull requests are opened up to a maximum of five (you can change this limit).
+To keep pull requests manageable and easy to review, {% data variables.product.prodname_dependabot %} raises a maximum of five pull requests to start bringing dependencies up to the latest version. If you merge some of these first pull requests before the next scheduled update, then further pull requests are opened up to a maximum of five (you can change this limit).
diff --git a/translations/de-DE/data/reusables/dependabot/private-dependencies.md b/translations/de-DE/data/reusables/dependabot/private-dependencies.md
index dfcbae9c73..717f1dbb97 100644
--- a/translations/de-DE/data/reusables/dependabot/private-dependencies.md
+++ b/translations/de-DE/data/reusables/dependabot/private-dependencies.md
@@ -1 +1 @@
-Currently, {% data variables.product.prodname_dependabot_version_updates %} doesn't support manifest or lock files that contain any private git dependencies or private git registries. This is because, when running version updates, {% data variables.product.prodname_dependabot_short %} must be able to resolve all dependencies from their source to verify that version updates have been successful.
+Currently, {% data variables.product.prodname_dependabot_version_updates %} doesn't support manifest or lock files that contain any private git dependencies or private git registries. This is because, when running version updates, {% data variables.product.prodname_dependabot %} must be able to resolve all dependencies from their source to verify that version updates have been successful.
diff --git a/translations/de-DE/data/reusables/dependabot/pull-request-introduction.md b/translations/de-DE/data/reusables/dependabot/pull-request-introduction.md
index 7494d21059..86b8dd0cf3 100644
--- a/translations/de-DE/data/reusables/dependabot/pull-request-introduction.md
+++ b/translations/de-DE/data/reusables/dependabot/pull-request-introduction.md
@@ -1 +1 @@
-{% data variables.product.prodname_dependabot %} raises pull requests to update dependencies. Depending on how your repository is configured, {% data variables.product.prodname_dependabot_short %} may raise pull requests for version updates and/or for security updates. You manage these pull requests in the same way as any other pull request, but there are also some extra commands available. For information about enabling {% data variables.product.prodname_dependabot %} dependency updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" and "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)."
\ No newline at end of file
+{% data variables.product.prodname_dependabot %} raises pull requests to update dependencies. Depending on how your repository is configured, {% data variables.product.prodname_dependabot %} may raise pull requests for version updates and/or for security updates. You manage these pull requests in the same way as any other pull request, but there are also some extra commands available. For information about enabling {% data variables.product.prodname_dependabot %} dependency updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)" and "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)."
\ No newline at end of file
diff --git a/translations/de-DE/data/reusables/dependabot/supported-package-managers.md b/translations/de-DE/data/reusables/dependabot/supported-package-managers.md
index 2f01ce66bb..85dbb4b2b4 100644
--- a/translations/de-DE/data/reusables/dependabot/supported-package-managers.md
+++ b/translations/de-DE/data/reusables/dependabot/supported-package-managers.md
@@ -18,12 +18,12 @@
{% note %}
-**Note**: {% data variables.product.prodname_dependabot_short %} also supports the following package managers:
+**Note**: {% data variables.product.prodname_dependabot %} also supports the following package managers:
-`yarn` (v1 only) (specify `npm`)
-`pipenv`, `pip-compile`, and `poetry` (specify `pip`)
-For example, if you use `poetry` to manage your Python dependencies and want {% data variables.product.prodname_dependabot_short %} to monitor your dependency manifest file for new versions, use `package-ecosystem: "pip"` in your *dependabot.yml* file.
+For example, if you use `poetry` to manage your Python dependencies and want {% data variables.product.prodname_dependabot %} to monitor your dependency manifest file for new versions, use `package-ecosystem: "pip"` in your *dependabot.yml* file.
{% endnote %}
diff --git a/translations/de-DE/data/reusables/dependabot/version-updates-for-actions.md b/translations/de-DE/data/reusables/dependabot/version-updates-for-actions.md
index 3b63e3586d..f00b76cfe2 100644
--- a/translations/de-DE/data/reusables/dependabot/version-updates-for-actions.md
+++ b/translations/de-DE/data/reusables/dependabot/version-updates-for-actions.md
@@ -1 +1 @@
-You can also enable {% data variables.product.prodname_dependabot_version_updates %} for the actions that you add to your workflow. For more information, see "[Keeping your actions up to date with {% data variables.product.prodname_dependabot %}](/github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot)."
+You can also enable {% data variables.product.prodname_dependabot_version_updates %} for the actions that you add to your workflow. For more information, see "[Keeping your actions up to date with {% data variables.product.prodname_dependabot %}](/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot)."
diff --git a/translations/de-DE/data/reusables/github-actions/enabled-local-github-actions.md b/translations/de-DE/data/reusables/github-actions/enabled-local-github-actions.md
index f88275e7c2..0043c8e960 100644
--- a/translations/de-DE/data/reusables/github-actions/enabled-local-github-actions.md
+++ b/translations/de-DE/data/reusables/github-actions/enabled-local-github-actions.md
@@ -1 +1 @@
-Wenn Du nur lokale Aktionen aktivierst, können Workflows nur Aktionen ausführen, die sich in Deinem Repository oder Deiner Organisation befinden.
+When you enable local actions only, workflows can only run actions located in your repository, organization, or enterprise.
diff --git a/translations/de-DE/data/reusables/github-insights/contributors-tab.md b/translations/de-DE/data/reusables/github-insights/contributors-tab.md
index 2a2bca4522..0a5a99ac22 100644
--- a/translations/de-DE/data/reusables/github-insights/contributors-tab.md
+++ b/translations/de-DE/data/reusables/github-insights/contributors-tab.md
@@ -1 +1 @@
-1. Klicke unter **{% octicon "gear" aria-label="The gear icon" %} Settings** (Einstellungen) auf **Contributors** (Mitwirkende). 
+1. Under **{% octicon "gear" aria-label="The gear icon" %} Settings**, click **Contributors**. 
diff --git a/translations/de-DE/data/reusables/marketplace/downgrade-marketplace-only.md b/translations/de-DE/data/reusables/marketplace/downgrade-marketplace-only.md
index 62b1f0a98b..b296211e99 100644
--- a/translations/de-DE/data/reusables/marketplace/downgrade-marketplace-only.md
+++ b/translations/de-DE/data/reusables/marketplace/downgrade-marketplace-only.md
@@ -1 +1 @@
-Das Kündigen einer App oder das Herunterstufen auf kostenlos wirkt sich nicht auf Deine [anderen bezahlten Abonnements](/articles/about-billing-on-github) auf {% data variables.product.prodname_dotcom %} aus. Wenn Sie alle kostenpflichtigen Abonnements auf {% data variables.product.prodname_dotcom %} beenden möchten, müssen Sie jedes kostenpflichtige Abonnement separat herabstufen.
+Canceling an app or downgrading an app to free does not affect your [other paid subscriptions](/articles/about-billing-on-github) on {% data variables.product.prodname_dotcom %}. Wenn Sie alle kostenpflichtigen Abonnements auf {% data variables.product.prodname_dotcom %} beenden möchten, müssen Sie jedes kostenpflichtige Abonnement separat herabstufen.
diff --git a/translations/de-DE/data/reusables/project-management/resync-automation.md b/translations/de-DE/data/reusables/project-management/resync-automation.md
index 23115aa9b1..3220f7f0f1 100644
--- a/translations/de-DE/data/reusables/project-management/resync-automation.md
+++ b/translations/de-DE/data/reusables/project-management/resync-automation.md
@@ -1 +1 @@
-Wenn Du ein Projektboard schließt, wird jede Workflow-Automatisierung angehalten, die für das Projektboard konfiguriert ist. Wenn Du ein Projekt erneut öffnest, hast Du die Möglichkeit, die Automatisierung zu synchronisieren, wodurch die Position der Tickets auf dem Projektboard entsprechend den für das Projektboard konfigurierten Automatisierungseinstellungen aktualisiert wird. Weitere Informationen findest Du unter["Wiederöffnen eines geschlossenen Projektboard](/articles/reopening-a-closed-project-board)" oder["Schließen eines Projektboard".](/articles/closing-a-project-board)
+Wenn Du ein Projektboard schließt, wird jede Workflow-Automatisierung angehalten, die für das Projektboard konfiguriert ist. Wenn Sie ein Projekt erneut öffnen, haben Sie die Möglichkeit, die Automatisierung zu synchronisieren, wodurch die Position der Tickets auf dem Projektboard entsprechend den für das Projektboard konfigurierten Automatisierungseinstellungen aktualisiert wird. Weitere Informationen findest Du unter["Wiederöffnen eines geschlossenen Projektboard](/articles/reopening-a-closed-project-board)" oder["Schließen eines Projektboard".](/articles/closing-a-project-board)
diff --git a/translations/de-DE/data/reusables/pull_requests/re-request-review.md b/translations/de-DE/data/reusables/pull_requests/re-request-review.md
new file mode 100644
index 0000000000..b04a7a46ce
--- /dev/null
+++ b/translations/de-DE/data/reusables/pull_requests/re-request-review.md
@@ -0,0 +1 @@
+You can re-request a review, for example, after you've made substantial changes to your pull request. To request a fresh review from a reviewer, in the sidebar of the **Conversation** tab, click the {% octicon "sync" aria-label="The sync icon" %} icon.
diff --git a/translations/de-DE/data/reusables/repositories/enable-security-alerts.md b/translations/de-DE/data/reusables/repositories/enable-security-alerts.md
index 0a180f73ee..5381a8c1d1 100644
--- a/translations/de-DE/data/reusables/repositories/enable-security-alerts.md
+++ b/translations/de-DE/data/reusables/repositories/enable-security-alerts.md
@@ -1,4 +1,4 @@
{% if enterpriseServerVersions contains currentVersion %}
Your site administrator must enable
-{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies for {% data variables.product.product_location %} before you can use this feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."
+{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies for {% data variables.product.product_location %} before you can use this feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."
{% endif %}
diff --git a/translations/de-DE/data/reusables/repositories/sidebar-dependabot-alerts.md b/translations/de-DE/data/reusables/repositories/sidebar-dependabot-alerts.md
index b7eadd335c..58d37a45ad 100644
--- a/translations/de-DE/data/reusables/repositories/sidebar-dependabot-alerts.md
+++ b/translations/de-DE/data/reusables/repositories/sidebar-dependabot-alerts.md
@@ -1 +1 @@
-1. In the security sidebar, click **{% data variables.product.prodname_dependabot_short %} alerts**. 
+1. In the security sidebar, click **{% data variables.product.prodname_dependabot_alerts %}**. 
diff --git a/translations/de-DE/data/reusables/support/ghae-priorities.md b/translations/de-DE/data/reusables/support/ghae-priorities.md
index e5d4074ef0..126c802c76 100644
--- a/translations/de-DE/data/reusables/support/ghae-priorities.md
+++ b/translations/de-DE/data/reusables/support/ghae-priorities.md
@@ -1,6 +1,6 @@
-| Priorität | Beschreibung | Beispiele |
-|:---------------------------------------------------------------------:| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| {% data variables.product.support_ticket_priority_urgent %} - Sev A | {% data variables.product.product_name %} is inaccessible or failing entirely, and the failure directly impacts the operation of your business.
_After you file a support ticket, reach out to {% data variables.contact.github_support %} via phone._ | - Fehler oder Ausfälle, die sich auf die Kernfunktionen von Git- oder Web-Anwendungen aller Benutzer auswirken
- Severe network or performance degradation for majority of users
- Voller oder sich schnell füllender Speicher
- Known security incidents or a breach of access
|
-| {% data variables.product.support_ticket_priority_high %} - Sev B | {% data variables.product.product_name %} is failing in a production environment, with limited impact to your business processes, or only affecting certain customers. | - Leistungsverschlechterung, die die Produktivität vieler Benutzer reduziert
- Reduced redundancy concerns from failures or service degradation
- Production-impacting bugs or errors
- {% data variables.product.product_name %} configuraton security concerns
|
-| {% data variables.product.support_ticket_priority_normal %} - Sev C | {% data variables.product.product_name %} is experiencing limited or moderate issues and errors with {% data variables.product.product_name %}, or you have general concerns or questions about the operation of {% data variables.product.product_name %}. | - Probleme in einer Test- oder Staging-Umgebung
- Advice on using {% data variables.product.prodname_dotcom %} APIs and features, or questions about integrating business workflows
- Issues with user tools and data collection methods
- Upgrades
- Bug reports, general security questions, or other feature related questions
|
-| {% data variables.product.support_ticket_priority_low %} - Sev D | {% data variables.product.product_name %} is functioning as expected, however, you have a question or suggestion about {% data variables.product.product_name %} that is not time-sensitive, or does not otherwise block the productivity of your team. | - Feature requests and product feedback
- General questions on overall configuration or use of {% data variables.product.product_name %}
- Notifying {% data variables.contact.github_support %} of any planned changes
|
+| Priorität | Beschreibung | Beispiele |
+|:---------------------------------------------------------------------:| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| {% data variables.product.support_ticket_priority_urgent %} - Sev A | {% data variables.product.product_name %} is inaccessible or failing entirely, and the failure directly impacts the operation of your business.
_After you file a support ticket, reach out to {% data variables.contact.github_support %} via phone._ | - Fehler oder Ausfälle, die sich auf die Kernfunktionen von Git- oder Web-Anwendungen aller Benutzer auswirken
- Severe network or performance degradation for majority of users
- Voller oder sich schnell füllender Speicher
- Known security incidents or a breach of access
|
+| {% data variables.product.support_ticket_priority_high %} - Sev B | {% data variables.product.product_name %} is failing in a production environment, with limited impact to your business processes, or only affecting certain customers. | - Leistungsverschlechterung, die die Produktivität vieler Benutzer reduziert
- Reduced redundancy concerns from failures or service degradation
- Production-impacting bugs or errors
- {% data variables.product.product_name %} configuraton security concerns
|
+| {% data variables.product.support_ticket_priority_normal %} - Sev C | {% data variables.product.product_name %} is experiencing limited or moderate issues and errors with {% data variables.product.product_name %}, or you have general concerns or questions about the operation of {% data variables.product.product_name %}. | - Advice on using {% data variables.product.prodname_dotcom %} APIs and features, or questions about integrating business workflows
- Issues with user tools and data collection methods
- Upgrades
- Bug reports, general security questions, or other feature related questions
|
+| {% data variables.product.support_ticket_priority_low %} - Sev D | {% data variables.product.product_name %} is functioning as expected, however, you have a question or suggestion about {% data variables.product.product_name %} that is not time-sensitive, or does not otherwise block the productivity of your team. | - Feature requests and product feedback
- General questions on overall configuration or use of {% data variables.product.product_name %}
- Notifying {% data variables.contact.github_support %} of any planned changes
|
diff --git a/translations/de-DE/data/reusables/webhooks/installation_properties.md b/translations/de-DE/data/reusables/webhooks/installation_properties.md
index dc50328321..b6950eabae 100644
--- a/translations/de-DE/data/reusables/webhooks/installation_properties.md
+++ b/translations/de-DE/data/reusables/webhooks/installation_properties.md
@@ -1,4 +1,4 @@
| Schlüssel | Typ | Beschreibung |
| ------------- | -------- | --------------------------------------------------------------------------- |
| `action` | `string` | die Aktion, die durchgeführt wurde. Can be one of:- `created` - Someone installs a {% data variables.product.prodname_github_app %}.
- `deleted` - Someone uninstalls a {% data variables.product.prodname_github_app %}
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" or currentVersion == "github-ae@latest" %}- `suspend` - Someone suspends a {% data variables.product.prodname_github_app %} installation.
- `unsuspend` - Someone unsuspends a {% data variables.product.prodname_github_app %} installation.
{% endif %}- `new_permissions_accepted` - Someone accepts new permissions for a {% data variables.product.prodname_github_app %} installation. When a {% data variables.product.prodname_github_app %} owner requests new permissions, the person who installed the {% data variables.product.prodname_github_app %} must accept the new permissions request.
|
-| `repositorys` | `array` | An array of repository objects that the insatllation can access. |
+| `repositorys` | `array` | An array of repository objects that the installation can access. |
diff --git a/translations/de-DE/data/reusables/webhooks/member_webhook_properties.md b/translations/de-DE/data/reusables/webhooks/member_webhook_properties.md
index 3fe25daf58..c05ce260d1 100644
--- a/translations/de-DE/data/reusables/webhooks/member_webhook_properties.md
+++ b/translations/de-DE/data/reusables/webhooks/member_webhook_properties.md
@@ -1,3 +1,3 @@
| Schlüssel | Typ | Beschreibung |
| --------- | -------- | --------------------------------------------------------------------------- |
-| `action` | `string` | die Aktion, die durchgeführt wurde. Can be one of:- `added` - A user accepts an invitation to a repository.
- `removed` - A user is removed as a collaborator in a repository.
- `edited` - A user's collaborator permissios have changed.
|
+| `action` | `string` | die Aktion, die durchgeführt wurde. Can be one of:- `added` - A user accepts an invitation to a repository.
- `removed` - A user is removed as a collaborator in a repository.
- `edited` - A user's collaborator permissions have changed.
|
diff --git a/translations/de-DE/data/reusables/webhooks/ping_short_desc.md b/translations/de-DE/data/reusables/webhooks/ping_short_desc.md
index 139c6735e2..4ef916b7b9 100644
--- a/translations/de-DE/data/reusables/webhooks/ping_short_desc.md
+++ b/translations/de-DE/data/reusables/webhooks/ping_short_desc.md
@@ -1 +1 @@
-When you create a new webhook, we'll send you a simple `ping` event to let you know you've set up the webhook correctly. This event isnt stored so it isn't retrievable via the [Events API](/rest/reference/activity#ping-a-repository-webhook) endpoint.
+When you create a new webhook, we'll send you a simple `ping` event to let you know you've set up the webhook correctly. This event isn't stored so it isn't retrievable via the [Events API](/rest/reference/activity#ping-a-repository-webhook) endpoint.
diff --git a/translations/de-DE/data/reusables/webhooks/repo_desc.md b/translations/de-DE/data/reusables/webhooks/repo_desc.md
index 27cc4f74c0..df26fb3e7a 100644
--- a/translations/de-DE/data/reusables/webhooks/repo_desc.md
+++ b/translations/de-DE/data/reusables/webhooks/repo_desc.md
@@ -1 +1 @@
-`repository` | `object` | The [`repository`](/v3/repos/#get-a-repository) where the event occured.
+`repository` | `object` | The [`repository`](/v3/repos/#get-a-repository) where the event occurred.
diff --git a/translations/de-DE/data/reusables/webhooks/repository_vulnerability_alert_short_desc.md b/translations/de-DE/data/reusables/webhooks/repository_vulnerability_alert_short_desc.md
index 635c979d78..00324e3dc1 100644
--- a/translations/de-DE/data/reusables/webhooks/repository_vulnerability_alert_short_desc.md
+++ b/translations/de-DE/data/reusables/webhooks/repository_vulnerability_alert_short_desc.md
@@ -1 +1 @@
-Activity related to security vulnerability alerts in a repository. {% data reusables.webhooks.action_type_desc %} For more information, see the "[About security alerts for vulerable dependencies](/github/managing-security-vulnerabilities/about-security-alerts-for-vulnerable-dependencies)".
+Activity related to security vulnerability alerts in a repository. {% data reusables.webhooks.action_type_desc %} For more information, see the "[About security alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-security-alerts-for-vulnerable-dependencies)".
diff --git a/translations/de-DE/data/ui.yml b/translations/de-DE/data/ui.yml
index bb235a65f9..b962e3042f 100644
--- a/translations/de-DE/data/ui.yml
+++ b/translations/de-DE/data/ui.yml
@@ -15,8 +15,9 @@ homepage:
version_picker: Version
toc:
getting_started: Erste Schritte
- popular_articles: Beliebte Artikel
+ popular_articles: Popular
guides: Leitfäden
+ whats_new: What's new
pages:
article_version: "Artikelversion:"
miniToc: Inhalt dieses Artikels
@@ -118,3 +119,6 @@ footer:
careers: Karriere
press: Presse
shop: Shop
+product_landing:
+ quick_start: Schnellstart
+ reference_guides: Reference guides
diff --git a/translations/de-DE/data/variables/product.yml b/translations/de-DE/data/variables/product.yml
index 7c0a6672b7..cb7f6f3384 100644
--- a/translations/de-DE/data/variables/product.yml
+++ b/translations/de-DE/data/variables/product.yml
@@ -118,11 +118,10 @@ prodname_vscode: 'Visual Studio Code'
prodname_vss_ghe: 'Visual Studio subscription with GitHub Enterprise'
prodname_vss_admin_portal_with_url: 'the [administrator portal for Visual Studio subscriptions](https://visualstudio.microsoft.com/subscriptions-administration/)'
#GitHub Dependabot
-prodname_dependabot: 'GitHub Dependabot'
-prodname_dependabot_short: 'Dependabot'
-prodname_dependabot_alerts: 'GitHub Dependabot alerts'
-prodname_dependabot_security_updates: 'GitHub Dependabot security updates'
-prodname_dependabot_version_updates: 'GitHub Dependabot version updates'
+prodname_dependabot: 'Dependabot'
+prodname_dependabot_alerts: 'Dependabot alerts'
+prodname_dependabot_security_updates: 'Dependabot security updates'
+prodname_dependabot_version_updates: 'Dependabot version updates'
#GitHub Archive Program
prodname_archive: 'GitHub Archive-Programm'
prodname_arctic_vault: 'Arctic Code Vault'
diff --git a/translations/ja-JP/content/actions/guides/building-and-testing-powershell.md b/translations/ja-JP/content/actions/guides/building-and-testing-powershell.md
new file mode 100644
index 0000000000..250c06b3aa
--- /dev/null
+++ b/translations/ja-JP/content/actions/guides/building-and-testing-powershell.md
@@ -0,0 +1,236 @@
+---
+title: Building and testing PowerShell
+intro: You can create a continuous integration (CI) workflow to build and test your PowerShell project.
+product: '{% data reusables.gated-features.actions %}'
+versions:
+ free-pro-team: '*'
+ enterprise-server: '>=2.22'
+---
+
+{% data variables.product.prodname_actions %} の支払いを管理する
+{% data variables.product.prodname_dotcom %}は、macOSランナーのホストに[MacStadium](https://www.macstadium.com/)を使用しています。
+
+### はじめに
+
+This guide shows you how to use PowerShell for CI. It describes how to use Pester, install dependencies, test your module, and publish to the PowerShell Gallery.
+
+{% data variables.product.prodname_dotcom %}-hosted runners have a tools cache with pre-installed software, which includes PowerShell and Pester. For a full list of up-to-date software and the pre-installed versions of PowerShell and Pester, see "[Specifications for {% data variables.product.prodname_dotcom %}-hosted runners](/actions/reference/specifications-for-github-hosted-runners/#supported-software)".
+
+### 必要な環境
+
+YAMLと{% data variables.product.prodname_actions %}の構文に馴染んでいる必要があります。 詳しい情報については、「[{% data variables.product.prodname_actions %} を学ぶ](/actions/learn-github-actions)」を参照してください。
+
+We recommend that you have a basic understanding of PowerShell and Pester. 詳しい情報については、以下を参照してください。
+- [Getting started with PowerShell](https://docs.microsoft.com/powershell/scripting/learn/ps101/01-getting-started)
+- [Pester](https://pester.dev)
+
+{% data reusables.actions.enterprise-setup-prereq %}
+
+### Adding a workflow for Pester
+
+To automate your testing with PowerShell and Pester, you can add a workflow that runs every time a change is pushed to your repository. In the following example, `Test-Path` is used to check that a file called `resultsfile.log` is present.
+
+This example workflow file must be added to your repository's `.github/workflows/` directory:
+
+{% raw %}
+```yaml
+name: Test PowerShell on Ubuntu
+on: push
+
+jobs:
+ pester-test:
+ name: Pester test
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check out repository code
+ uses: actions/checkout@v2
+ - name: Perform a Pester test from the command-line
+ shell: pwsh
+ run: Test-Path resultsfile.log | Should -Be $true
+ - name: Perform a Pester test from the Tests.ps1 file
+ shell: pwsh
+ run: |
+ Invoke-Pester Unit.Tests.ps1 -Passthru
+```
+{% endraw %}
+
+* `shell: pwsh` - Configures the job to use PowerShell when running the `run` commands.
+* `run: Test-Path resultsfile.log` - Check whether a file called `resultsfile.log` is present in the repository's root directory.
+* `Should -Be $true` - Uses Pester to define an expected result. If the result is unexpected, then {% data variables.product.prodname_actions %} flags this as a failed test. 例:
+
+ 
+
+* `Invoke-Pester Unit.Tests.ps1 -Passthru` - Uses Pester to execute tests defined in a file called `Unit.Tests.ps1`. For example, to perform the same test described above, the `Unit.Tests.ps1` will contain the following:
+ ```
+ Describe "Check results file is present" {
+ It "Check results file is present" {
+ Test-Path resultsfile.log | Should -Be $true
+ }
+ }
+ ```
+
+### PowerShell module locations
+
+The table below describes the locations for various PowerShell modules in each {% data variables.product.prodname_dotcom %}-hosted runner.
+
+| | Ubuntu | macOS | Windows |
+| ----------------------------- | ------------------------------------------------ | ------------------------------------------------- | ------------------------------------------------------------ |
+| **PowerShell system modules** | `/opt/microsoft/powershell/7/Modules/*` | `/usr/local/microsoft/powershell/7/Modules/*` | `C:\program files\powershell\7\Modules\*` |
+| **PowerShell add-on modules** | `/usr/local/share/powershell/Modules/*` | `/usr/local/share/powershell/Modules/*` | `C:\Modules\*` |
+| **User-installed modules** | `/home/runner/.local/share/powershell/Modules/*` | `/Users/runner/.local/share/powershell/Modules/*` | `C:\Users\runneradmin\Documents\PowerShell\Modules\*` |
+
+### 依存関係のインストール
+
+{% data variables.product.prodname_dotcom %}-hosted runners have PowerShell 7 and Pester installed. You can use `Install-Module` to install additional dependencies from the PowerShell Gallery before building and testing your code.
+
+{% note %}
+
+**Note:** The pre-installed packages (such as Pester) used by {% data variables.product.prodname_dotcom %}-hosted runners are regularly updated, and can introduce significant changes. As a result, it is recommended that you always specify the required package versions by using `Install-Module` with `-MaximumVersion`.
+
+{% endnote %}
+
+ワークフローの速度を上げるために、依存関係をキャッシュすることもできます。 詳しい情報については「[ワークフローを高速化するための依存関係のキャッシング](/actions/automating-your-workflow-with-github-actions/caching-dependencies-to-speed-up-workflows)」を参照してください。
+
+For example, the following job installs the `SqlServer` and `PSScriptAnalyzer` modules:
+
+{% raw %}
+```yaml
+jobs:
+ install-dependencies:
+ name: Install dependencies
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Install from PSGallery
+ shell: pwsh
+ run: |
+ Set-PSRepository PSGallery -InstallationPolicy Trusted
+ Install-Module SqlServer, PSScriptAnalyzer
+```
+{% endraw %}
+
+{% note %}
+
+**Note:** By default, no repositories are trusted by PowerShell. When installing modules from the PowerShell Gallery, you must explicitly set the installation policy for `PSGallery` to `Trusted`.
+
+{% endnote %}
+
+#### 依存関係のキャッシング
+
+You can cache PowerShell dependencies using a unique key, which allows you to restore the dependencies for future workflows with the [`cache`](https://github.com/marketplace/actions/cache) action. 詳しい情報については「[ワークフローを高速化するための依存関係のキャッシング](/actions/automating-your-workflow-with-github-actions/caching-dependencies-to-speed-up-workflows)」を参照してください。
+
+PowerShell caches its dependencies in different locations, depending on the runner's operating system. For example, the `path` location used in the following Ubuntu example will be different for a Windows operating system.
+
+{% raw %}
+```yaml
+steps:
+ - uses: actions/checkout@v2
+ - name: Setup PowerShell module cache
+ id: cacher
+ uses: actions/cache@v2
+ with:
+ path: "~/.local/share/powershell/Modules"
+ key: ${{ runner.os }}-SqlServer-PSScriptAnalyzer
+ - name: Install required PowerShell modules
+ if: steps.cacher.outputs.cache-hit != 'true'
+ shell: pwsh
+ run: |
+ Set-PSRepository PSGallery -InstallationPolicy Trusted
+ Install-Module SqlServer, PSScriptAnalyzer -ErrorAction Stop
+```
+{% endraw %}
+
+### コードのテスト
+
+ローカルで使うのと同じコマンドを、コードのビルドとテストに使えます。
+
+#### Using PSScriptAnalyzer to lint code
+
+The following example installs `PSScriptAnalyzer` and uses it to lint all `ps1` files in the repository. For more information, see [PSScriptAnalyzer on GitHub](https://github.com/PowerShell/PSScriptAnalyzer).
+
+{% raw %}
+```yaml
+ lint-with-PSScriptAnalyzer:
+ name: Install and run PSScriptAnalyzer
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Install PSScriptAnalyzer module
+ shell: pwsh
+ run: |
+ Set-PSRepository PSGallery -InstallationPolicy Trusted
+ Install-Module PSScriptAnalyzer -ErrorAction Stop
+ - name: Lint with PSScriptAnalyzer
+ shell: pwsh
+ run: |
+ Invoke-ScriptAnalyzer -Path *.ps1 -Recurse -Outvariable issues
+ $errors = $issues.Where({$_.Severity -eq 'Error'})
+ $warnings = $issues.Where({$_.Severity -eq 'Warning'})
+ if ($errors) {
+ Write-Error "There were $($errors.Count) errors and $($warnings.Count) warnings total." -ErrorAction Stop
+ } else {
+ Write-Output "There were $($errors.Count) errors and $($warnings.Count) warnings total."
+ }
+```
+{% endraw %}
+
+### 成果物としてのワークフローのデータのパッケージ化
+
+ワークフローの完了後に、成果物をアップロードして見ることができます。 たとえば、ログファイル、コアダンプ、テスト結果、スクリーンショットを保存する必要があるかもしれません。 詳しい情報については「[成果物を利用してワークフローのデータを永続化する](/github/automating-your-workflow-with-github-actions/persisting-workflow-data-using-artifacts)」を参照してください。
+
+The following example demonstrates how you can use the `upload-artifact` action to archive the test results received from `Invoke-Pester`. 詳しい情報については[`upload-artifact`アクション](https://github.com/actions/upload-artifact)を参照してください。
+
+{% raw %}
+```yaml
+name: Upload artifact from Ubuntu
+
+on: [push]
+
+jobs:
+ upload-pester-results:
+ name: Run Pester and upload results
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Test with Pester
+ shell: pwsh
+ run: Invoke-Pester Unit.Tests.ps1 -Passthru | Export-CliXml -Path Unit.Tests.xml
+ - name: Upload test results
+ uses: actions/upload-artifact@v2
+ with:
+ name: ubuntu-Unit-Tests
+ path: Unit.Tests.xml
+ if: ${{ always() }}
+```
+{% endraw %}
+
+The `always()` function configures the job to continue processing even if there are test failures. For more information, see "[always](/actions/reference/context-and-expression-syntax-for-github-actions#always)."
+
+### Publishing to PowerShell Gallery
+
+You can configure your workflow to publish your PowerShell module to the PowerShell Gallery when your CI tests pass. You can use repository secrets to store any tokens or credentials needed to publish your package. 詳しい情報については、「[暗号化されたシークレットの作成と利用](/github/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)」を参照してください。
+
+The following example creates a package and uses `Publish-Module` to publish it to the PowerShell Gallery:
+
+{% raw %}
+```yaml
+name: Publish PowerShell Module
+
+on:
+ release:
+ types: [created]
+
+jobs:
+ publish-to-gallery:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Build and publish
+ env:
+ NUGET_KEY: ${{ secrets.NUGET_KEY }}
+ shell: pwsh
+ run: |
+ ./build.ps1 -Path /tmp/samplemodule
+ Publish-Module -Path /tmp/samplemodule -NuGetApiKey $env:NUGET_KEY -Verbose
+```
+{% endraw %}
diff --git a/translations/ja-JP/content/actions/guides/index.md b/translations/ja-JP/content/actions/guides/index.md
index bc96d737c4..552ae4f2df 100644
--- a/translations/ja-JP/content/actions/guides/index.md
+++ b/translations/ja-JP/content/actions/guides/index.md
@@ -29,6 +29,7 @@ versions:
{% link_in_list /about-continuous-integration %}
{% link_in_list /setting-up-continuous-integration-using-workflow-templates %}
{% link_in_list /building-and-testing-nodejs %}
+{% link_in_list /building-and-testing-powershell %}
{% link_in_list /building-and-testing-python %}
{% link_in_list /building-and-testing-java-with-maven %}
{% link_in_list /building-and-testing-java-with-gradle %}
diff --git a/translations/ja-JP/content/actions/guides/storing-workflow-data-as-artifacts.md b/translations/ja-JP/content/actions/guides/storing-workflow-data-as-artifacts.md
index a8b4862141..a244634506 100644
--- a/translations/ja-JP/content/actions/guides/storing-workflow-data-as-artifacts.md
+++ b/translations/ja-JP/content/actions/guides/storing-workflow-data-as-artifacts.md
@@ -170,12 +170,12 @@ versions:
ジョブ1は、以下のステップを実行します。
- 数式の計算を実行し、その結果を`math-homework.txt`というテキストファイルに保存します。
-- `upload-artifact`アクションを使って、`math-homework.txt`ファイルを`homework`という名前でアップロードします。 このアクションで、ファイルが`homework`という名前のディレクトリに配置されます。
+- Uses the `upload-artifact` action to upload the `math-homework.txt` file with the artifact name `homework`.
ジョブ2は、前のジョブの結果を利用して、次の処理を実行します。
- 前のジョブでアップロードされた`homework`成果物をダウンロードします。 デフォルトでは、`download-artifact`アクションは、ステップが実行されているワークスペースディレクトリに成果物をダウンロードします。 入力パラメータの`path`を使って、別のダウンロードディレクトリを指定することもできます。
-- `homework/math-homework.txt`ファイル中の値を読み取り、数式の計算を実行し、結果を`math-homework.txt`に保存します。
-- `math-homework.txt`ファイルをアップロードします。 このアップロードは、前のアップロードを上書きします。どちらも同じ名前を使っているからです。
+- Reads the value in the `math-homework.txt` file, performs a math calculation, and saves the result to `math-homework.txt` again, overwriting its contents.
+- `math-homework.txt`ファイルをアップロードします。 This upload overwrites the previously uploaded artifact because they share the same name.
ジョブ3は、前のジョブでアップロードされた結果を表示して、次の処理を実行します。
- `homework`成果物をダウンロードします。
diff --git a/translations/ja-JP/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/translations/ja-JP/content/actions/hosting-your-own-runners/about-self-hosted-runners.md
index cda4575af8..14c67673f8 100644
--- a/translations/ja-JP/content/actions/hosting-your-own-runners/about-self-hosted-runners.md
+++ b/translations/ja-JP/content/actions/hosting-your-own-runners/about-self-hosted-runners.md
@@ -111,6 +111,7 @@ The self-hosted runner polls {% data variables.product.prodname_dotcom %} to ret
github.com
api.github.com
*.actions.githubusercontent.com
+codeload.github.com
```
{% data variables.product.prodname_dotcom %} OrganizationあるいはEnterpriseアカウントでIPアドレス許可リストを使うなら、セルフホストランナーのIPアドレスを許可リストに追加しなければなりません。 詳しい情報については「[Organizationの許可IPアドレスの管理](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)」あるいは「[Enterpriseアカウントでのセキュリティ設定の適用](/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account#using-github-actions-with-an-ip-allow-list)」を参照してください。
diff --git a/translations/ja-JP/content/actions/index.md b/translations/ja-JP/content/actions/index.md
index 678e8f15b2..ef78632b61 100644
--- a/translations/ja-JP/content/actions/index.md
+++ b/translations/ja-JP/content/actions/index.md
@@ -4,17 +4,34 @@ shortTitle: GitHub Actions
intro: '{% data variables.product.prodname_actions %}で、ソフトウェア開発ワークフローをリポジトリの中で自動化、カスタマイズ実行しましょう。 CI/CDを含む好きなジョブを実行してくれるアクションを、見つけたり、作成したり、共有したり、完全にカスタマイズされたワークフロー中でアクションを組み合わせたりできます。'
introLinks:
quickstart: /actions/quickstart
- learn: /actions/learn-github-actions
+ reference: /actions/reference
featuredLinks:
+ guides:
+ - /actions/guides/setting-up-continuous-integration-using-workflow-templates
+ - /actions/guides/about-packaging-with-github-actions
gettingStarted:
- /actions/managing-workflow-runs
- /actions/hosting-your-own-runners
- guide:
- - /actions/guides/setting-up-continuous-integration-using-workflow-templates
- - /actions/guides/about-packaging-with-github-actions
popular:
- /actions/reference/workflow-syntax-for-github-actions
- /actions/reference/events-that-trigger-workflows
+changelog:
+ -
+ title: Self-Hosted Runner Group Access Changes
+ date: '2020-10-16'
+ href: https://github.blog/changelog/2020-10-16-github-actions-self-hosted-runner-group-access-changes/
+ -
+ title: Ability to change retention days for artifacts and logs
+ date: '2020-10-08'
+ href: https://github.blog/changelog/2020-10-08-github-actions-ability-to-change-retention-days-for-artifacts-and-logs
+ -
+ title: Deprecating set-env and add-path commands
+ date: '2020-10-01'
+ href: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands
+ -
+ title: Fine-tune access to external actions
+ date: '2020-10-01'
+ href: https://github.blog/changelog/2020-10-01-github-actions-fine-tune-access-to-external-actions
redirect_from:
- /articles/automating-your-workflow-with-github-actions/
- /articles/customizing-your-project-with-github-actions/
@@ -36,44 +53,8 @@ versions:
-
-
-
-
- {% data ui.toc.guides %}
-
-
- {% for link in featuredLinks.guide %}
- - {% include featured-link %}
- {% endfor %}
-
-
-
-
-
- {% data ui.toc.popular_articles %}
-
-
- {% for link in featuredLinks.popular %}
- - {% include featured-link %}
- {% endfor %}
-
-
-
-
-
- ワークフローの管理
-
-
- {% for link in featuredLinks.gettingStarted %}
- - {% include featured-link %}
- {% endfor %}
-
-
-
-
-
+
その他のガイド
diff --git a/translations/ja-JP/content/actions/learn-github-actions/finding-and-customizing-actions.md b/translations/ja-JP/content/actions/learn-github-actions/finding-and-customizing-actions.md
index 6f977ea354..4a19585ae3 100644
--- a/translations/ja-JP/content/actions/learn-github-actions/finding-and-customizing-actions.md
+++ b/translations/ja-JP/content/actions/learn-github-actions/finding-and-customizing-actions.md
@@ -87,7 +87,7 @@ steps:
### アクションで入力と出力を使用する
-多くの場合、アクションは入力を受け入れたり要求したりして、使用できる出力を生成します。 たとえば、アクションでは、ファイルへのパス、ラベルの名前、またはアクション処理の一部として使用するその他のデータを指定する必要がある場合があります。
+多くの場合、アクションは入力を受け入れたり要求したりして、使用できる出力を生成します。 For example, an action might require you to specify a path to a file, the name of a label, or other data it will use as part of the action processing.
アクションの入力と出力を確認するには、リポジトリのルートディレクトリにある `action.yml` または `action.yaml` を確認してください。
diff --git a/translations/ja-JP/content/actions/learn-github-actions/index.md b/translations/ja-JP/content/actions/learn-github-actions/index.md
index 66e9fa3c78..aa6c9031bb 100644
--- a/translations/ja-JP/content/actions/learn-github-actions/index.md
+++ b/translations/ja-JP/content/actions/learn-github-actions/index.md
@@ -36,7 +36,8 @@ versions:
{% link_with_intro /managing-complex-workflows %}
{% link_with_intro /sharing-workflows-with-your-organization %}
{% link_with_intro /security-hardening-for-github-actions %}
+{% link_with_intro /migrating-from-azure-pipelines-to-github-actions %}
{% link_with_intro /migrating-from-circleci-to-github-actions %}
{% link_with_intro /migrating-from-gitlab-cicd-to-github-actions %}
-{% link_with_intro /migrating-from-azure-pipelines-to-github-actions %}
{% link_with_intro /migrating-from-jenkins-to-github-actions %}
+{% link_with_intro /migrating-from-travis-ci-to-github-actions %}
\ No newline at end of file
diff --git a/translations/ja-JP/content/actions/learn-github-actions/introduction-to-github-actions.md b/translations/ja-JP/content/actions/learn-github-actions/introduction-to-github-actions.md
index 2dc0bcf3d0..0141305238 100644
--- a/translations/ja-JP/content/actions/learn-github-actions/introduction-to-github-actions.md
+++ b/translations/ja-JP/content/actions/learn-github-actions/introduction-to-github-actions.md
@@ -34,7 +34,7 @@ versions:
#### イベント
-イベントは、ワークフローをトリガーする特定のアクティビティです。 たとえば、誰かがコミットをリポジトリにプッシュした場合、あるいはIssueもしくはプルリクエストが作成された場合、{% data variables.product.prodname_dotcom %}からアクティビティを発生させることができます。 リポジトリディスパッチ webhook を使用して、外部イベントが発生したときにワークフローをトリガーすることもできます。 ワークフローのトリガーに使用できるイベントの完全なリストについては、[ワークフローをトリガーするイベント](/actions/reference/events-that-trigger-workflows)を参照してください。
+イベントは、ワークフローをトリガーする特定のアクティビティです。 たとえば、誰かがコミットをリポジトリにプッシュした場合、あるいはIssueもしくはプルリクエストが作成された場合、{% data variables.product.prodname_dotcom %}からアクティビティを発生させることができます。 You can also use the [repository dispatch webhook](/rest/reference/repos#create-a-repository-dispatch-event) to trigger a workflow when an external event occurs. ワークフローのトリガーに使用できるイベントの完全なリストについては、[ワークフローをトリガーするイベント](/actions/reference/events-that-trigger-workflows)を参照してください。
#### Jobs
diff --git a/translations/ja-JP/content/actions/learn-github-actions/managing-complex-workflows.md b/translations/ja-JP/content/actions/learn-github-actions/managing-complex-workflows.md
index 7fa1d968a6..b66924e2c8 100644
--- a/translations/ja-JP/content/actions/learn-github-actions/managing-complex-workflows.md
+++ b/translations/ja-JP/content/actions/learn-github-actions/managing-complex-workflows.md
@@ -24,12 +24,13 @@ versions:
```yaml
jobs:
example-job:
+ runs-on: ubuntu-latest
steps:
- name: Retrieve secret
env:
super_secret: ${{ secrets.SUPERSECRET }}
run: |
- example-command "$SUPER_SECRET"
+ example-command "$super_secret"
```
{% endraw %}
@@ -49,6 +50,7 @@ jobs:
- run: ./setup_server.sh
build:
needs: setup
+ runs-on: ubuntu-latest
steps:
- run: ./build_server.sh
test:
@@ -141,7 +143,7 @@ jobs:
```yaml
jobs:
example-job:
- runs-on: [self-hosted, linux, x64, gpu]
+ runs-on: [self-hosted, linux, x64, gpu]
```
詳しい情報については、「[セルフホストランナーでのラベルの利用](/actions/hosting-your-own-runners/using-labels-with-self-hosted-runners)」を参照してください。
diff --git a/translations/ja-JP/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md b/translations/ja-JP/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md
index 4225be96c4..4342e715e6 100644
--- a/translations/ja-JP/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md
+++ b/translations/ja-JP/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md
@@ -41,7 +41,7 @@ Azure Pipelinesのジョブとステップは、{% data variables.product.prodna
### スクリプトのステップの移行
-スクリプトやシェルのコマンドを、ワークフロー中のステップとして実行できます。 Azure Pipelinesでは、スクリプトのステップは`script`キー、あるいは`bash`、`powershell`、`pwsh`といったキーで指定できます。 スクリプトはまた、[Bashタスク](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/utility/bash?view=azure-devops)あるいは[PowerShellタスク](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/utility/powershell?view=azure-devops)への入力としても指定できます。
+スクリプトやシェルのコマンドを、ワークフロー中のステップとして実行できます。 Azure Pipelinesでは、スクリプトのステップは`script`キー、あるいは`bash`、`powershell`、`pwsh`といったキーで指定できます。 スクリプトはまた、[Bashタスク](https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/bash?view=azure-devops)あるいは[PowerShellタスク](https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/powershell?view=azure-devops)への入力としても指定できます。
{% data variables.product.prodname_actions %}では、すべてのスクリプトは`run`キーを使って指定されます。 特定のシェルを選択するには、スクリプトを提供する際に`shell`キーを指定します。 詳細については、「[{% data variables.product.prodname_actions %}のワークフロー構文](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun)」を参照してください。
diff --git a/translations/ja-JP/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md b/translations/ja-JP/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
index ffcc860a69..f01c4fa7b8 100644
--- a/translations/ja-JP/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
+++ b/translations/ja-JP/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
@@ -180,7 +180,7 @@ GitLab CI/CD
deploy_prod:
stage: deploy
script:
- - echo "Deply to production server"
+ - echo "Deploy to production server"
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
```
@@ -194,7 +194,7 @@ jobs:
if: contains( github.ref, 'master')
runs-on: ubuntu-latest
steps:
- - run: echo "Deply to production server"
+ - run: echo "Deploy to production server"
```
{% endraw %}
diff --git a/translations/ja-JP/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md b/translations/ja-JP/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md
index 0bf5054274..df3f32cfee 100644
--- a/translations/ja-JP/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md
+++ b/translations/ja-JP/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md
@@ -232,12 +232,19 @@ Jenkinsのパイプライン
```yaml
pipeline {
- agent none
- stages {
- stage('Run Tests') {
- parallel {
- stage('Test On MacOS') {
- agent { label "macos" }
+agent none
+stages {
+ stage('Run Tests') {
+ matrix {
+ axes {
+ axis {
+ name: 'PLATFORM'
+ values: 'macos', 'linux'
+ }
+ }
+ agent { label "${PLATFORM}" }
+ stages {
+ stage('test') {
tools { nodejs "node-12" }
steps {
dir("scripts/myapp") {
@@ -246,19 +253,10 @@ pipeline {
}
}
}
- stage('Test On Linux') {
- agent { label "linux" }
- tools { nodejs "node-12" }
- steps {
- dir("script/myapp") {
- sh(script: "npm install -g bats")
- sh(script: "bats tests")
- }
- }
- }
}
}
}
+}
}
```
diff --git a/translations/ja-JP/content/actions/learn-github-actions/migrating-from-travis-ci-to-github-actions.md b/translations/ja-JP/content/actions/learn-github-actions/migrating-from-travis-ci-to-github-actions.md
new file mode 100644
index 0000000000..241ff16b29
--- /dev/null
+++ b/translations/ja-JP/content/actions/learn-github-actions/migrating-from-travis-ci-to-github-actions.md
@@ -0,0 +1,408 @@
+---
+title: Migrating from Travis CI to GitHub Actions
+intro: '{% data variables.product.prodname_actions %} and Travis CI share multiple similarities, which helps make it relatively straightforward to migrate to {% data variables.product.prodname_actions %}.'
+redirect_from:
+ - /actions/migrating-to-github-actions/migrating-from-travis-ci-to-github-actions
+versions:
+ free-pro-team: '*'
+ enterprise-server: '>=2.22'
+---
+
+### はじめに
+
+This guide helps you migrate from Travis CI to {% data variables.product.prodname_actions %}. It compares their concepts and syntax, describes the similarities, and demonstrates their different approaches to common tasks.
+
+### Before you start
+
+Before starting your migration to {% data variables.product.prodname_actions %}, it would be useful to become familiar with how it works:
+
+- For a quick example that demonstrates a {% data variables.product.prodname_actions %} job, see "[Quickstart for {% data variables.product.prodname_actions %}](/actions/quickstart)."
+- To learn the essential {% data variables.product.prodname_actions %} concepts, see "[Introduction to GitHub Actions](/actions/learn-github-actions/introduction-to-github-actions)."
+
+### Comparing job execution
+
+To give you control over when CI tasks are executed, a {% data variables.product.prodname_actions %} _workflow_ uses _jobs_ that run in parallel by default. Each job contains _steps_ that are executed in a sequence that you define. If you need to run setup and cleanup actions for a job, you can define steps in each job to perform these.
+
+### Key similarities
+
+{% data variables.product.prodname_actions %} and Travis CI share certain similarities, and understanding these ahead of time can help smooth the migration process.
+
+#### Using YAML syntax
+
+Travis CI and {% data variables.product.prodname_actions %} both use YAML to create jobs and workflows, and these files are stored in the code's repository. For more information on how {% data variables.product.prodname_actions %} uses YAML, see ["Creating a workflow file](/actions/learn-github-actions/introduction-to-github-actions#create-an-example-workflow)."
+
+#### Custom environment variables
+
+Travis CI lets you set environment variables and share them between stages. Similarly, {% data variables.product.prodname_actions %} lets you define environment variables for a step, job, or workflow. For more information, see ["Environment variables](/actions/reference/environment-variables)."
+
+#### デフォルトの環境変数
+
+Travis CI and {% data variables.product.prodname_actions %} both include default environment variables that you can use in your YAML files. For {% data variables.product.prodname_actions %}, you can see these listed in "[Default environment variables](/actions/reference/environment-variables#default-environment-variables)."
+
+#### 並列なジョブの処理
+
+Travis CI can use `stages` to run jobs in parallel. Similarly, {% data variables.product.prodname_actions %} runs `jobs` in parallel. For more information, see "[Creating dependent jobs](/actions/learn-github-actions/managing-complex-workflows#creating-dependent-jobs)."
+
+#### Status badges
+
+Travis CI and {% data variables.product.prodname_actions %} both support status badges, which let you indicate whether a build is passing or failing. For more information, see ["Adding a workflow status badge to your repository](/actions/managing-workflow-runs/adding-a-workflow-status-badge)."
+
+#### ビルドマトリックスを使用する
+
+Travis CI and {% data variables.product.prodname_actions %} both support a build matrix, allowing you to perform testing using combinations of operating systems and software packages. For more information, see "[Using a build matrix](/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix)."
+
+Below is an example comparing the syntax for each system:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+matrix:
+ include:
+ - rvm: 2.5
+ - rvm: 2.6.3
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+jobs:
+ build:
+ strategy:
+ matrix:
+ ruby: [2.5, 2.6.3]
+```
+{% endraw %}
+
+
+
+
+#### Targeting specific branches
+
+Travis CI and {% data variables.product.prodname_actions %} both allow you to target your CI to a specific branch. 詳しい情報については、「[GitHub Actionsのワークフロー構文](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestbranchestags)」を参照してください。
+
+以下が、それぞれのシステムの構文の例です。
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+branches:
+ only:
+ - main
+ - 'mona/octocat'
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+on:
+ push:
+ branches:
+ - main
+ - 'mona/octocat'
+```
+{% endraw %}
+
+
+
+
+#### Checking out submodules
+
+Travis CI and {% data variables.product.prodname_actions %} both allow you to control whether submodules are included in the repository clone.
+
+以下が、それぞれのシステムの構文の例です。
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+git:
+ submodules: false
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+ - uses: actions/checkout@v2
+ with:
+ submodules: false
+```
+{% endraw %}
+
+
+
+
+### Key features in {% data variables.product.prodname_actions %}
+
+When migrating from Travis CI, consider the following key features in {% data variables.product.prodname_actions %}:
+
+#### シークレットを保存する
+
+{% data variables.product.prodname_actions %} allows you to store secrets and reference them in your jobs. {% data variables.product.prodname_actions %} also includes policies that allow you to limit access to secrets at the repository and organization level. For more information, see "[Encrypted secrets](/actions/reference/encrypted-secrets)."
+
+#### Sharing files between jobs and workflows
+
+{% data variables.product.prodname_actions %} includes integrated support for artifact storage, allowing you to share files between jobs in a workflow. You can also save the resulting files and share them with other workflows. For more information, see "[Sharing data between jobs](/actions/learn-github-actions/essential-features-of-github-actions#sharing-data-between-jobs)."
+
+#### 自分のランナーをホストする
+
+If your jobs require specific hardware or software, {% data variables.product.prodname_actions %} allows you to host your own runners and send your jobs to them for processing. {% data variables.product.prodname_actions %} also lets you use policies to control how these runners are accessed, granting access at the organization or repository level. For more information, see ["Hosting your own runners](/actions/hosting-your-own-runners)."
+
+#### Concurrent jobs and execution time
+
+The concurrent jobs and workflow execution times in {% data variables.product.prodname_actions %} can vary depending on your {% data variables.product.company_short %} plan. 詳しい情報については、「[使用制限、支払い、および管理](/actions/reference/usage-limits-billing-and-administration)」を参照してください。
+
+#### Using different languages in {% data variables.product.prodname_actions %}
+
+When working with different languages in {% data variables.product.prodname_actions %}, you can create a step in your job to set up your language dependencies. For more information about working with a particular language, see the specific guide:
+ - [Node.js のビルドとテスト](/actions/guides/building-and-testing-nodejs)
+ - [Building and testing PowerShell](/actions/guides/building-and-testing-powershell)
+ - [Python のビルドとテスト](/actions/guides/building-and-testing-python)
+ - [MavenでのJavaのビルドとテスト](/actions/guides/building-and-testing-java-with-maven)
+ - [GradleでのJavaのビルドとテスト](/actions/guides/building-and-testing-java-with-gradle)
+ - [AntでのJavaのビルドとテスト](/actions/guides/building-and-testing-java-with-ant)
+
+### Executing scripts
+
+{% data variables.product.prodname_actions %} can use `run` steps to run scripts or shell commands. To use a particular shell, you can specify the `shell` type when providing the path to the script. 詳細については、「[{% data variables.product.prodname_actions %}のワークフロー構文](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun)」を参照してください。
+
+例:
+
+```yaml
+ steps:
+ - name: Run build script
+ run: ./.github/scripts/build.sh
+ shell: bash
+```
+
+### Error handling in {% data variables.product.prodname_actions %}
+
+When migrating to {% data variables.product.prodname_actions %}, there are different approaches to error handling that you might need to be aware of.
+
+#### Script error handling
+
+{% data variables.product.prodname_actions %} stops a job immediately if one of the steps returns an error code. 詳細については、「[{% data variables.product.prodname_actions %}のワークフロー構文](/actions/reference/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference)」を参照してください。
+
+#### Job error handling
+
+{% data variables.product.prodname_actions %} uses `if` conditionals to execute jobs or steps in certain situations. For example, you can run a step when another step results in a `failure()`. 詳しい情報については、「[{% data variables.product.prodname_actions %} のワークフロー構文](/actions/reference/workflow-syntax-for-github-actions#example-using-status-check-functions)」を参照してください。 You can also use [`continue-on-error`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontinue-on-error) to prevent a workflow run from stopping when a job fails.
+
+### Migrating syntax for conditionals and expressions
+
+To run jobs under conditional expressions, Travis CI and {% data variables.product.prodname_actions %} share a similar `if` condition syntax. {% data variables.product.prodname_actions %} lets you use the `if` conditional to prevent a job or step from running unless a condition is met. 詳しい情報については、「[{% data variables.product.prodname_actions %} のコンテキストと式構文](/actions/reference/context-and-expression-syntax-for-github-actions)」を参照してください。
+
+This example demonstrates how an `if` conditional can control whether a step is executed:
+
+```yaml
+jobs:
+ conditional:
+ runs-on: ubuntu-latest
+ steps:
+ - run: echo "This step runs with str equals 'ABC' and num equals 123"
+ if: env.str == 'ABC' && env.num == 123
+```
+
+### Migrating phases to steps
+
+Where Travis CI uses _phases_ to run _steps_, {% data variables.product.prodname_actions %} has _steps_ which execute _actions_. You can find prebuilt actions in the [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?type=actions), or you can create your own actions. 詳細については、「[アクションの構築について](/actions/building-actions)」を参照してください。
+
+以下が、それぞれのシステムの構文の例です。
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+language: python
+python:
+ - "3.7"
+
+script:
+ - python script.py
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+jobs:
+ run_python:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/setup-python@v2
+ with:
+ python-version: '3.7'
+ architecture: 'x64'
+ - run: python script.py
+```
+{% endraw %}
+
+
+
+
+### 依存関係のキャッシング
+
+Travis CI and {% data variables.product.prodname_actions %} let you manually cache dependencies for later reuse. This example demonstrates the cache syntax for each system.
+
+
+
+
+Travis CI
+
+
+GitHub Actions
+
+
+
+
+{% raw %}
+```yaml
+language: node_js
+cache: npm
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+- name: Cache node modules
+ uses: actions/cache@v2
+ with:
+ path: ~/.npm
+ key: v1-npm-deps-${{ hashFiles('**/package-lock.json') }}
+ restore-keys: v1-npm-deps-
+```
+{% endraw %}
+
+
+
+
+詳しい情報については、「[ワークフローを高速化するための依存関係のキャッシュ](/actions/guides/caching-dependencies-to-speed-up-workflows)」を参照してください。
+
+### 一般的なタスクの例
+
+This section compares how {% data variables.product.prodname_actions %} and Travis CI perform common tasks.
+
+#### Configuring environment variables
+
+You can create custom environment variables in a {% data variables.product.prodname_actions %} job. 例:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}のワークフロー
+
+
+
+
+
+ ```yaml
+env:
+ - MAVEN_PATH="/usr/local/maven"
+ ```
+
+
+
+
+ ```yaml
+ jobs:
+ maven-build:
+ env:
+ MAVEN_PATH: '/usr/local/maven'
+ ```
+
+
+
+
+
+#### Building with Node.js
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}のワークフロー
+
+
+
+
+{% raw %}
+ ```yaml
+install:
+ - npm install
+script:
+ - npm run build
+ - npm test
+ ```
+{% endraw %}
+
+
+{% raw %}
+ ```yaml
+name: Node.js CI
+on: [push]
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Use Node.js
+ uses: actions/setup-node@v1
+ with:
+ node-version: '12.x'
+ - run: npm install
+ - run: npm run build
+ - run: npm test
+ ```
+{% endraw %}
+
+
+
+
+### 次のステップ
+
+To continue learning about the main features of {% data variables.product.prodname_actions %}, see "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)."
diff --git a/translations/ja-JP/content/actions/learn-github-actions/security-hardening-for-github-actions.md b/translations/ja-JP/content/actions/learn-github-actions/security-hardening-for-github-actions.md
index 18a61c3b8a..b20d30b1ab 100644
--- a/translations/ja-JP/content/actions/learn-github-actions/security-hardening-for-github-actions.md
+++ b/translations/ja-JP/content/actions/learn-github-actions/security-hardening-for-github-actions.md
@@ -26,7 +26,7 @@ versions:
偶発的な開示を防ぐために、{% data variables.product.product_name %} は、実行ログに表示されるシークレットを編集しようとするメカニズムを使用しています。 この編集は、設定されたシークレットの完全一致、および Base64 などの値の一般的なエンコーディングを検索します。 ただし、シークレットの値を変換する方法は複数あるため、この編集は保証されません。 そのため、シークレットを確実に編集し、シークレットに関連する他のリスクを制限するために実行する必要がある、特定の予防的ステップと推奨事項は次のとおりです。
- **構造化データをシークレットとして使用しない**
- - 非構造化データは、ログ内のシークレットの編集失敗の原因となる可能性があります。これは、編集が特定のシークレット値の完全一致を見つけることに大きく依存しているためです。 たとえば、JSON、XML、または YAML(または同様)の Blob を使用してシークレット値をカプセル化しないでください。シークレットが適切に編集される可能性が大幅に低下するためです。 代わりに、機密値ごとに個別のシークレットを作成します。
+ - Structured data can cause secret redaction within logs to fail, because redaction largely relies on finding an exact match for the specific secret value. たとえば、JSON、XML、または YAML(または同様)の Blob を使用してシークレット値をカプセル化しないでください。シークレットが適切に編集される可能性が大幅に低下するためです。 代わりに、機密値ごとに個別のシークレットを作成します。
- **ワークフロー内で使用されるすべてのシークレットを登録する**
- シークレットを使用してワークフロー内で別の機密値を生成する場合は、生成された値を正式に[シークレットとして登録](https://github.com/actions/toolkit/tree/main/packages/core#setting-a-secret)して、ログに表示されたときに編集されるようにする必要があります。 たとえば、秘密鍵を使用して署名済み JWT を生成し、Web API にアクセスする場合は、その JWT をシークレットとして登録してください。そうしない場合、ログ出力に入力されても編集されません。
- シークレットの登録は、あらゆる種類の変換/エンコーディングにも適用されます。 シークレットが何らかの方法で変換された場合(Base64 や URL エンコードなど)、新しい値もシークレットとして登録してください。
@@ -98,7 +98,7 @@ versions:
### Auditing {% data variables.product.prodname_actions %} events
-You can use the audit log to monitor administrative tasks in an organization. The audit log records the type of action, when it was run, and which user account perfomed the action.
+You can use the audit log to monitor administrative tasks in an organization. The audit log records the type of action, when it was run, and which user account performed the action.
For example, you can use the audit log to track the `action:org.update_actions_secret` event, which tracks changes to organization secrets: 
diff --git a/translations/ja-JP/content/actions/managing-workflow-runs/manually-running-a-workflow.md b/translations/ja-JP/content/actions/managing-workflow-runs/manually-running-a-workflow.md
index 6529e43adb..42a903b3a9 100644
--- a/translations/ja-JP/content/actions/managing-workflow-runs/manually-running-a-workflow.md
+++ b/translations/ja-JP/content/actions/managing-workflow-runs/manually-running-a-workflow.md
@@ -10,7 +10,9 @@ versions:
{% data variables.product.prodname_actions %} の支払いを管理する
{% data variables.product.prodname_dotcom %}は、macOSランナーのホストに[MacStadium](https://www.macstadium.com/)を使用しています。
-ワークフローを手動で実行するには、`workflow_dispatch` イベントで実行するようにワークフローを設定する必要があります。 詳しい情報については、「[ワークフローをトリガーするイベント](/actions/reference/events-that-trigger-workflows)」を参照してください。
+### Configuring a workflow to run manually
+
+ワークフローを手動で実行するには、`workflow_dispatch` イベントで実行するようにワークフローを設定する必要があります。 For more information about configuring the `workflow_dispatch` event, see "[Events that trigger workflows](/actions/reference/events-that-trigger-workflows#workflow_dispatch)".
### {% data variables.product.prodname_dotcom %} でワークフローを実行する
diff --git a/translations/ja-JP/content/actions/reference/encrypted-secrets.md b/translations/ja-JP/content/actions/reference/encrypted-secrets.md
index e51c0f200a..3d267f91f6 100644
--- a/translations/ja-JP/content/actions/reference/encrypted-secrets.md
+++ b/translations/ja-JP/content/actions/reference/encrypted-secrets.md
@@ -105,7 +105,7 @@ steps:
```
{% endraw %}
-可能であれば、コマンドラインからプロセス間でシークレットを渡すのは避けてください。 コマンドラインプロセスは他のユーザから見えるかもしれず(`ps`コマンドを使って)、あるいは[セキュリティ監査イベント](https://docs.microsoft.com/en-us/windows-server/identity/ad-ds/manage/component-updates/command-line-process-auditing)でキャプチャされるかもしれません。 シークレットの保護のために、環境変数、`STDIN`、あるいはターゲットのプロセスがサポートしている他の仕組みの利用を考慮してください。
+可能であれば、コマンドラインからプロセス間でシークレットを渡すのは避けてください。 コマンドラインプロセスは他のユーザから見えるかもしれず(`ps`コマンドを使って)、あるいは[セキュリティ監査イベント](https://docs.microsoft.com/windows-server/identity/ad-ds/manage/component-updates/command-line-process-auditing)でキャプチャされるかもしれません。 シークレットの保護のために、環境変数、`STDIN`、あるいはターゲットのプロセスがサポートしている他の仕組みの利用を考慮してください。
コマンドラインからシークレットを渡さなければならない場合は、それらを適切なルールでクオート内に収めてください。 シークレットは、意図せずシェルに影響するかもしれない特殊なキャラクターをしばしば含みます。 それらの特殊なキャラクターをエスケープするには、環境変数をクオートで囲ってください。 例:
diff --git a/translations/ja-JP/content/actions/reference/events-that-trigger-workflows.md b/translations/ja-JP/content/actions/reference/events-that-trigger-workflows.md
index 7ab4eee37b..fa527efb1e 100644
--- a/translations/ja-JP/content/actions/reference/events-that-trigger-workflows.md
+++ b/translations/ja-JP/content/actions/reference/events-that-trigger-workflows.md
@@ -98,32 +98,41 @@ You can manually trigger a workflow run using the {% data variables.product.prod
REST API を使用してカスタム `workflow_dispatch` webhook イベントをトリガーするには、`POST` リクエストを {% data variables.product.prodname_dotcom %} API エンドポイントに送信し、`ref` および必要な `inputs` を入力する必要があります。 詳細については、「[ワークフローディスパッチイベントの作成](/rest/reference/actions/#create-a-workflow-dispatch-event)」REST API エンドポイントを参照してください。
+##### サンプル
+
+To use the `workflow_dispatch` event, you need to include it as a trigger in your GitHub Actions workflow file. The example below only runs the workflow when it's manually triggered:
+
+```yaml
+on: workflow_dispatch
+```
+
##### ワークフロー設定の例
-この例では、 `名` 定義し、入力 ` github.event.inputs.name` を使用してそれらを出力し、github.event.inputs.home コンテキスト `します。 ` `名が指定されていない場合は、既定値の 「Mona the Octocat」 が表示されます。
+この例では、 `名` 定義し、入力 ` github.event.inputs.name` を使用してそれらを出力し、github.event.inputs.home コンテキスト `します。 If a home` isn't provided, the default value 'The Octoverse' is printed.
-{% raw %}
-
-名前: 手動でトリガーされたワークフロー
-:
+{% raw %}
+```yaml
+name: Manually triggered workflow
+on:
workflow_dispatch:
- 入力:
- の説明:
-
- 説明: 必須: true
- デフォルト: 'モナ・ザ・オクトキャット' ホーム
- : 'モナ・ザ・オクトキャット'
- ホーム: '場所'
- 必要: 偽
+ inputs:
+ name:
+ description: 'Person to greet'
+ required: true
+ default: 'Mona the Octocat'
+ home:
+ description: 'location'
+ required: false
+ default: 'The Octoverse'
-ジョブ:
+jobs:
say_hello:
- 実行: ubuntu最新
- ステップ:
- - 実行 |
- エコー "こんにちは ${{ github.event.inputs.name }}!
+ runs-on: ubuntu-latest
+ steps:
+ - run: |
+ echo "Hello ${{ github.event.inputs.name }}!"
エコー "- ${{ github.event.inputs.home }}で!
-`
+```
{% endraw %}
#### `repository_dispatch`
@@ -244,7 +253,7 @@ on:
#### `delete`
-誰かがブランチまたはタグを作成し、それによって `delete` イベントがトリガーされるときにワークフローを実行します。 REST API の詳細については、「[リファレンスの削除](/v3/git/refs/#delete-a-reference)」を参照してください。
+誰かがブランチまたはタグを作成し、それによって `create` イベントがトリガーされるときにワークフローを実行します。 REST API の詳細については、「[リファレンスの削除](/v3/git/refs/#delete-a-reference)」を参照してください。
{% data reusables.github-actions.branch-requirement %}
@@ -377,6 +386,36 @@ on:
```
+The `issue_comment` event occurs for comments on both issues and pull requests. To determine whether the `issue_comment` event was triggered from an issue or pull request, you can check the event payload for the `issue.pull_request` property and use it as a condition to skip a job.
+
+For example, you can choose to run the `pr_commented` job when comment events occur in a pull request, and the `issue_commented` job when comment events occur in an issue.
+
+
+
+```yaml
+on: issue_comment
+
+jobs:
+ pr_commented:
+ # This job only runs for pull request comments
+ name: PR comment
+ if: ${{ github.event.issue.pull_request }}
+ runs-on: ubuntu-latest
+ steps:
+ - run: |
+ echo "Comment on PR #${{ github.event.issue.number }}"
+
+ issue-commented:
+ # This job only runs for issue comments
+ name: Issue comment
+ if: ${{ !github.event.issue.pull_request }}
+ runs-on: ubuntu-latest
+ steps:
+ - run: |
+ echo "Comment on issue #${{ github.event.issue.number }}"
+```
+
+
#### `issues`
@@ -459,7 +498,7 @@ on:
#### `page_build`
-誰かが {% data variables.product.product_name %} ページ対応のブランチを作成し、それによって `page_build` イベントがトリガーされるときにワークフローを実行します。 REST API の詳細については、「[ページ](/rest/reference/repos#pages)」を参照してください。
+誰かが {% data variables.product.product_name %} ページ対応のブランチを作成し、それによって `page_build` イベントがトリガーされるときにワークフローを実行します。 For information about the REST API, see "[Pages](/rest/reference/repos#pages)."
{% data reusables.github-actions.branch-requirement %}
@@ -587,7 +626,7 @@ on:
{% note %}
-**注:** デフォルトでは、ワークフローが実行されるのは`pull_request` のアクティビティタイプが `opened`、`synchronize`、または `reopened` の場合だけです。 他のアクティビティタイプについてもワークフローをトリガーするには、`types` キーワードを使用してください。
+**Note:** By default, a workflow only runs when a `pull_request`'s activity type is `opened`, `synchronize`, or `reopened`. 他のアクティビティタイプについてもワークフローをトリガーするには、`types` キーワードを使用してください。
{% endnote %}
@@ -822,6 +861,11 @@ on:
{% data reusables.webhooks.workflow_run_desc %}
+| webhook イベントのペイロード | アクティビティタイプ | `GITHUB_SHA` | `GITHUB_REF` |
+| -------------------------------------------------------- | ---------- | ----------------- | ------------ |
+| [`workflow_run`](/webhooks/event-payloads/#workflow_run) | - n/a | デフォルトブランチの直近のコミット | デフォルトブランチ |
+
+
このイベントからブランチをフィルタする必要がある場合は、`branches` または `branches-ignore` を使用できます。
この例では、ワークフローは別の「Run Tests」ワークフローの完了後に実行されるように設定されています。
diff --git a/translations/ja-JP/content/actions/reference/specifications-for-github-hosted-runners.md b/translations/ja-JP/content/actions/reference/specifications-for-github-hosted-runners.md
index 32030cf3f3..3885d4601c 100644
--- a/translations/ja-JP/content/actions/reference/specifications-for-github-hosted-runners.md
+++ b/translations/ja-JP/content/actions/reference/specifications-for-github-hosted-runners.md
@@ -29,7 +29,7 @@ versions:
#### {% data variables.product.prodname_dotcom %}ホストランナーのクラウドホスト
-{% data variables.product.prodname_dotcom %}は、Microsoft AzureのStandard_DS2_v2仮想マシン上で{% data variables.product.prodname_actions %}ランナーアプリケーションがインストールされたLinux及びWindowsランナーをホストします。 {% data variables.product.prodname_dotcom %}ホストランナーアプリケーションは、Azure Pipelines Agentのフォークです。 インバウンドのICMPパケットはすべてのAzure仮想マシンでブロックされるので、pingやtracerouteコマンドは動作しないでしょう。 Standard_DS2_v2マシンのリソースに関する詳しい情報については、Microsoft Azureドキュメンテーションの「[Dv2 and DSv2シリーズ](https://docs.microsoft.com/ja-jp/azure/virtual-machines/dv2-dsv2-series#dsv2-series)」を参照してください。
+{% data variables.product.prodname_dotcom %}は、Microsoft AzureのStandard_DS2_v2仮想マシン上で{% data variables.product.prodname_actions %}ランナーアプリケーションがインストールされたLinux及びWindowsランナーをホストします。 {% data variables.product.prodname_dotcom %}ホストランナーアプリケーションは、Azure Pipelines Agentのフォークです。 インバウンドのICMPパケットはすべてのAzure仮想マシンでブロックされるので、pingやtracerouteコマンドは動作しないでしょう。 For more information about the Standard_DS2_v2 machine resources, see "[Dv2 and DSv2-series](https://docs.microsoft.com/azure/virtual-machines/dv2-dsv2-series#dsv2-series)" in the Microsoft Azure documentation.
{% data variables.product.prodname_dotcom %}は、macOSランナーのホストに[MacStadium](https://www.macstadium.com/)を使用しています。
@@ -37,7 +37,7 @@ versions:
LinuxおよびmacOSの仮想環境は、パスワード不要の`sudo`により動作します。 現在のユーザが持っているよりも高い権限が求められるコマンドやインストールツールを実行する必要がある場合は、パスワードを入力する必要なく、`sudo`を使うことができます。 詳しい情報については、「[Sudo Manual](https://www.sudo.ws/man/1.8.27/sudo.man.html)」を参照してください。
-Windowsの仮想マシンは、ユーザアカウント制御(UAC)が無効化されて管理者として動作するように設定されています。 詳しい情報については、Windowsのドキュメンテーションの「[ユーザー アカウント制御のしくみ](https://docs.microsoft.com/en-us/windows/security/identity-protection/user-account-control/how-user-account-control-works)」を参照してください。
+Windowsの仮想マシンは、ユーザアカウント制御(UAC)が無効化されて管理者として動作するように設定されています。 詳しい情報については、Windowsのドキュメンテーションの「[ユーザー アカウント制御のしくみ](https://docs.microsoft.com/windows/security/identity-protection/user-account-control/how-user-account-control-works)」を参照してください。
### サポートされているランナーとハードウェアリソース
diff --git a/translations/ja-JP/content/actions/reference/workflow-commands-for-github-actions.md b/translations/ja-JP/content/actions/reference/workflow-commands-for-github-actions.md
index 3c73319d79..a5ec6b636a 100644
--- a/translations/ja-JP/content/actions/reference/workflow-commands-for-github-actions.md
+++ b/translations/ja-JP/content/actions/reference/workflow-commands-for-github-actions.md
@@ -164,6 +164,25 @@ echo "::warning file=app.js,line=1,col=5::Missing semicolon"
echo "::error file=app.js,line=10,col=15::Something went wrong"
```
+### Grouping log lines
+
+```
+::group::{title}
+::endgroup::
+```
+
+Creates an expandable group in the log. To create a group, use the `group` command and specify a `title`. Anything you print to the log between the `group` and `endgroup` commands is nested inside an expandable entry in the log.
+
+#### サンプル
+
+```bash
+echo "::group::My title"
+echo "Inside group"
+echo "::endgroup::"
+```
+
+
+
### ログ中での値のマスク
`::add-mask::{value}`
@@ -259,7 +278,8 @@ echo "action_state=yellow" >> $GITHUB_ENV
将来のステップで `$action_state` を実行すると `yellow` が返されるようになりました
-#### 複数行の文字列
+#### Multiline strings
+
複数行の文字列の場合、次の構文で区切り文字を使用できます。
```
@@ -268,7 +288,8 @@ echo "action_state=yellow" >> $GITHUB_ENV
{delimiter}
```
-#### サンプル
+##### サンプル
+
この例では、区切り文字として `EOF` を使用し、`JSON_RESPONSE` 環境変数を cURL レスポンスの値に設定します。
```
steps:
diff --git a/translations/ja-JP/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md b/translations/ja-JP/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
index 2356e76166..dc020454c6 100644
--- a/translations/ja-JP/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
+++ b/translations/ja-JP/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
@@ -10,7 +10,7 @@ versions:
### About authentication and user provisioning with Azure AD
-Azure Active Directory (Azure AD) is a service from Microsoft that allows you to centrally manage user accounts and access to web applications. For more information, see [What is Azure Active Directory?](https://docs.microsoft.com/en-us/azure/active-directory/fundamentals/active-directory-whatis) in the Microsoft Docs.
+Azure Active Directory (Azure AD) is a service from Microsoft that allows you to centrally manage user accounts and access to web applications. For more information, see [What is Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-whatis) in the Microsoft Docs.
To manage identity and access for {% data variables.product.product_name %}, you can use an Azure AD tenant as a SAML IdP for authentication. You can also configure Azure AD to automatically provision accounts and access with SCIM. This configuration allows you to assign or unassign the {% data variables.product.prodname_ghe_managed %} application for a user account in your Azure AD tenant to automatically create, grant access to, or deactivate a corresponding user account on {% data variables.product.product_name %}.
@@ -18,9 +18,9 @@ For more information about managing identity and access for your enterprise on {
### 必要な環境
-To configure authentication and user provisioning for {% data variables.product.product_name %} using Azure AD, you must have an Azure AD account and tenant. For more information, see the [Azure AD website](https://azure.microsoft.com/en-us/free/active-directory) and [Quickstart: Create an Azure Active Directory tenant](https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-create-new-tenant) in the Microsoft Docs.
+To configure authentication and user provisioning for {% data variables.product.product_name %} using Azure AD, you must have an Azure AD account and tenant. For more information, see the [Azure AD website](https://azure.microsoft.com/free/active-directory) and [Quickstart: Create an Azure Active Directory tenant](https://docs.microsoft.com/azure/active-directory/develop/quickstart-create-new-tenant) in the Microsoft Docs.
-{% data reusables.saml.assert-the-administrator-attribute %} For more information about including the `administrator` attribute in the SAML claim from Azure AD, see [How to: customize claims issued in the SAML token for enterprise applications](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-saml-claims-customization) in the Microsoft Docs.
+{% data reusables.saml.assert-the-administrator-attribute %} For more information about including the `administrator` attribute in the SAML claim from Azure AD, see [How to: customize claims issued in the SAML token for enterprise applications](https://docs.microsoft.com/azure/active-directory/develop/active-directory-saml-claims-customization) in the Microsoft Docs.
{% data reusables.saml.create-a-machine-user %}
diff --git a/translations/ja-JP/content/admin/authentication/using-saml.md b/translations/ja-JP/content/admin/authentication/using-saml.md
index cb5efd5876..26ad944782 100644
--- a/translations/ja-JP/content/admin/authentication/using-saml.md
+++ b/translations/ja-JP/content/admin/authentication/using-saml.md
@@ -29,7 +29,7 @@ versions:
`NameID`要素は、他の属性が存在する場合でも必須です。
-`NameID`と{% data variables.product.prodname_ghe_server %}ユーザ名の間にマッピングが作成されるので、`NameID`は永続的かつ一意でなければならず、ユーザのライフサイクルを通じて変化しないことが必要です。
+A mapping is created between the `NameID` and the {% data variables.product.prodname_ghe_server %} username, so the `NameID` should be persistent, unique, and not subject to change for the lifecycle of the user.
{% note %}
diff --git a/translations/ja-JP/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md b/translations/ja-JP/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md
index 396f810c8c..ea231b8282 100644
--- a/translations/ja-JP/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md
+++ b/translations/ja-JP/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md
@@ -1,11 +1,11 @@
---
title: GitHub Enterprise Serverで脆弱性のある依存関係に対するアラートを有効化する
-intro: '{% data variables.product.product_location %} を {% data variables.product.prodname_ghe_cloud %} に接続し、インスタンス内のリポジトリの脆弱な依存関係に対して{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}セキュリティ{% endif %}アラートを有効にすることができます。'
+intro: '{% data variables.product.product_location %} を {% data variables.product.prodname_ghe_cloud %} に接続し、インスタンス内のリポジトリの脆弱な依存関係に対して{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}セキュリティ{% endif %}アラートを有効にすることができます。'
redirect_from:
- /enterprise/admin/installation/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server
- /enterprise/admin/configuration/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server
- /enterprise/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server
-permissions: '接続された {% data variables.product.prodname_ghe_cloud %} Organization または Enterprise アカウントの所有者でもある {% data variables.product.prodname_ghe_server %} のサイト管理者は、{% data variables.product.prodname_ghe_server %} の脆弱性のある依存関係に対して{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} セキュリティ{% endif %}アラートを有効にできます。'
+permissions: '接続された {% data variables.product.prodname_ghe_cloud %} Organization または Enterprise アカウントの所有者でもある {% data variables.product.prodname_ghe_server %} のサイト管理者は、{% data variables.product.prodname_ghe_server %} の脆弱性のある依存関係に対して{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %} セキュリティ{% endif %}アラートを有効にできます。'
versions:
enterprise-server: '*'
---
@@ -14,11 +14,11 @@ versions:
{% data reusables.repositories.tracks-vulnerabilities %} 詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」を参照してください。
-{% data variables.product.product_location %} を {% data variables.product.prodname_dotcom_the_website %} に接続し、脆弱性データをインスタンスに同期して、脆弱性のある依存関係を持つリポジトリで {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}セキュリティ{% endif %}アラートを生成できます。
+{% data variables.product.product_location %} を {% data variables.product.prodname_dotcom_the_website %} に接続し、脆弱性データをインスタンスに同期して、脆弱性のある依存関係を持つリポジトリで {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}セキュリティ{% endif %}アラートを生成できます。
-{% data variables.product.product_location %} を {% data variables.product.prodname_dotcom_the_website %} に接続し、脆弱性のある依存関係に対して {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}セキュリティ{% endif %}アラートを有効化すると、脆弱性データは 1 時間に 1 回 {% data variables.product.prodname_dotcom_the_website %} からインスタンスに同期されます。 また、脆弱性データはいつでも手動で同期することができます。 {% data variables.product.product_location %} からのコードまたはコードに関する情報は、{% data variables.product.prodname_dotcom_the_website %} にアップロードされません。
+{% data variables.product.product_location %} を {% data variables.product.prodname_dotcom_the_website %} に接続し、脆弱性のある依存関係に対して {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}セキュリティ{% endif %}アラートを有効化すると、脆弱性データは 1 時間に 1 回 {% data variables.product.prodname_dotcom_the_website %} からインスタンスに同期されます。 また、脆弱性データはいつでも手動で同期することができます。 {% data variables.product.product_location %} からのコードまたはコードに関する情報は、{% data variables.product.prodname_dotcom_the_website %} にアップロードされません。
-{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate {% data variables.product.prodname_dependabot_short %} alerts. You can customize how you receive {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)."
+{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate {% data variables.product.prodname_dependabot_alerts %}. You can customize how you receive {% data variables.product.prodname_dependabot_alerts %}. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-dependabot-alerts)."
{% endif %}
{% if currentVersion == "enterprise-server@2.21" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate security alerts. You can customize how you receive security alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)."
@@ -28,23 +28,25 @@ versions:
{% endif %}
{% if currentVersion ver_gt "enterprise-server@2.21" %}
-### {% data variables.product.prodname_ghe_server %} 上の脆弱性のある依存関係に対して {% data variables.product.prodname_dependabot_short %} アラートを有効化にする
+### Enabling {% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}
{% else %}
### {% data variables.product.prodname_ghe_server %}で脆弱性のある依存関係に対するアラートを有効化する
{% endif %}
-{% data variables.product.product_location %} 上の脆弱性のある依存関係に対する {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} セキュリティ{% endif %}アラートを有効にする前に、{% data variables.product.product_location %} を {% data variables.product.prodname_dotcom_the_website %} に接続する必要があります。 詳細は、「[{% data variables.product.prodname_ghe_server %}を{% data variables.product.prodname_ghe_cloud %}に接続する](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)」を参照してください。
+{% data variables.product.product_location %} 上の脆弱性のある依存関係に対する {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %} セキュリティ{% endif %}アラートを有効にする前に、{% data variables.product.product_location %} を {% data variables.product.prodname_dotcom_the_website %} に接続する必要があります。 詳細は、「[{% data variables.product.prodname_ghe_server %}を{% data variables.product.prodname_ghe_cloud %}に接続する](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)」を参照してください。
{% if currentVersion ver_gt "enterprise-server@2.20" %}
-{% if currentVersion ver_gt "enterprise-server@2.21" %}メールの過負荷を避けるため、最初の数日間は {% data variables.product.prodname_dependabot_short %} アラートを通知なしに設定することをお勧めします。 数日後、通知を有効化すれば、通常どおり {% data variables.product.prodname_dependabot_short %} アラートを受信できます。{% endif %}
+{% if currentVersion ver_gt "enterprise-server@2.21" %}We recommend configuring {% data variables.product.prodname_dependabot_alerts %} without notifications for the first few days to avoid an overload of emails. After a few days, you can enable notifications to receive {% data variables.product.prodname_dependabot_alerts %} as usual.{% endif %}
{% if currentVersion == "enterprise-server@2.21" %}メールの過負荷を避けるため、最初の数日間はセキュリティアラートを通知なしに設定することをお勧めします。 数日後、通知を有効化すれば、通常どおりセキュリティアラートを受信できます。{% endif %}
{% endif %}
{% data reusables.enterprise_site_admin_settings.sign-in %}
-1. 管理シェルで、{% data variables.product.product_location %} の脆弱性のある依存関係に対する {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}セキュリティ{% endif %}アラートを有効にします。
+
+1. 管理シェルで、{% data variables.product.product_location %} の脆弱性のある依存関係に対する {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}セキュリティ{% endif %}アラートを有効にします。
+
``` shell
$ ghe-dep-graph-enable
```
diff --git a/translations/ja-JP/content/admin/enterprise-management/monitoring-cluster-nodes.md b/translations/ja-JP/content/admin/enterprise-management/monitoring-cluster-nodes.md
index c38c9ffa1b..1d57a988f3 100644
--- a/translations/ja-JP/content/admin/enterprise-management/monitoring-cluster-nodes.md
+++ b/translations/ja-JP/content/admin/enterprise-management/monitoring-cluster-nodes.md
@@ -34,13 +34,13 @@ admin@ghe-data-node-0:~$ ghe-cluster-status | grep error
#### Nagiosホストの設定
1. 空のパスフレーズで SSH キーを生成してください。 Nagios はこれを使用して {% data variables.product.prodname_ghe_server %} クラスタへの認証を行います。
```shell
- nagiosuser@nagios:~$ ssh-keygen -t rsa -b 4096
- > Generating public/private rsa key pair.
- > Enter file in which to save the key (/home/nagiosuser/.ssh/id_rsa):
+ nagiosuser@nagios:~$ ssh-keygen -t ed25519
+ > Generating public/private ed25519 key pair.
+ > Enter file in which to save the key (/home/nagiosuser/.ssh/id_ed25519):
> Enter passphrase (empty for no passphrase): leave blank by pressing enter
> Enter same passphrase again: press enter again
- > Your identification has been saved in /home/nagiosuser/.ssh/id_rsa.
- > Your public key has been saved in /home/nagiosuser/.ssh/id_rsa.pub.
+ > Your identification has been saved in /home/nagiosuser/.ssh/id_ed25519.
+ > Your public key has been saved in /home/nagiosuser/.ssh/id_ed25519.pub.
```
{% danger %}
@@ -48,13 +48,21 @@ admin@ghe-data-node-0:~$ ghe-cluster-status | grep error
**セキュリティの警告:** パスフレーズを持たない SSH キーは、ホストへの完全なアクセスを承認されていた場合、セキュリティリスクになることがあります。 このキーの承認は、単一の読み取りのみのコマンドに限定してください。
{% enddanger %}
-2. 秘密鍵 (`id_rsa`) を `nagios` ホームフォルダにコピーし、適切な所有権を設定します。
+ {% note %}
+
+ **Note:** If you're using a distribution of Linux that doesn't support the Ed25519 algorithm, use the command:
```shell
- nagiosuser@nagios:~$ sudo cp .ssh/id_rsa /var/lib/nagios/.ssh/
- nagiosuser@nagios:~$ sudo chown nagios:nagios /var/lib/nagios/.ssh/id_rsa
+ nagiosuser@nagios:~$ ssh-keygen -t rsa -b 4096
```
-3. `ghe-cluster-status -n` コマンド*のみ*を実行するために公開鍵を認証するには、`/data/user/common/authorized_keys` ファイル中で `command=` プレフィックスを使ってください。 任意のノードの管理シェルから、このファイルを変更してステップ1で生成した公開鍵を追加してください。 例: `command="/usr/local/bin/ghe-cluster-status -n" ssh-rsa AAAA....`
+ {% endnote %}
+2. Copy the private key (`id_ed25519`) to the `nagios` home folder and set the appropriate ownership.
+ ```shell
+ nagiosuser@nagios:~$ sudo cp .ssh/id_ed25519 /var/lib/nagios/.ssh/
+ nagiosuser@nagios:~$ sudo chown nagios:nagios /var/lib/nagios/.ssh/id_ed25519
+ ```
+
+3. `ghe-cluster-status -n` コマンド*のみ*を実行するために公開鍵を認証するには、`/data/user/common/authorized_keys` ファイル中で `command=` プレフィックスを使ってください。 任意のノードの管理シェルから、このファイルを変更してステップ1で生成した公開鍵を追加してください。 For example: `command="/usr/local/bin/ghe-cluster-status -n" ssh-ed25519 AAAA....`
4. `/data/user/common/authorized_keys` ファイルを変更したノード上で `ghe-cluster-config-apply` を実行し、設定を検証してクラスタ内の各ノードにコピーしてください。
diff --git a/translations/ja-JP/content/admin/enterprise-management/upgrading-github-enterprise-server.md b/translations/ja-JP/content/admin/enterprise-management/upgrading-github-enterprise-server.md
index 7492449afe..9dea765b38 100644
--- a/translations/ja-JP/content/admin/enterprise-management/upgrading-github-enterprise-server.md
+++ b/translations/ja-JP/content/admin/enterprise-management/upgrading-github-enterprise-server.md
@@ -49,7 +49,7 @@ versions:
| プラットフォーム | スナップショットの取得方法 | スナップショットドキュメンテーションのURL |
| --------------------- | ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
| Amazon AWS | ディスク | |
-| Azure | VM | |
+| Azure | VM | |
| Hyper-V | VM | |
| Google Compute Engine | ディスク | |
| VMware | VM | [https://pubs.vmware.com/vsphere-50/topic/com.vmware.wssdk.pg.doc_50/PG_Ch11_VM_Manage.13.3.html](https://pubs.vmware.com/vsphere-50/topic/com.vmware.wssdk.pg.doc_50/PG_Ch11_VM_Manage.13.3.html) |
diff --git a/translations/ja-JP/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/ja-JP/content/admin/enterprise-support/about-github-enterprise-support.md
index a3522c7714..c0c0c7aee1 100644
--- a/translations/ja-JP/content/admin/enterprise-support/about-github-enterprise-support.md
+++ b/translations/ja-JP/content/admin/enterprise-support/about-github-enterprise-support.md
@@ -29,9 +29,16 @@ In addition to all of the benefits of {% data variables.contact.enterprise_suppo
- GitHub Enterprise サポートページを通じた書面による 24 時間 365 日のサポート
- 24 時間 365 日の電話サポート
- A{% if currentVersion == "github-ae@latest" %}n enhanced{% endif %} Service Level Agreement (SLA) {% if enterpriseServerVersions contains currentVersion %}with guaranteed initial response times{% endif %}
- - Access to premium content{% if enterpriseServerVersions contains currentVersion %}
- - Scheduled health checks{% endif %}
- - 管理されたサービス
+{% if currentVersion == "github-ae@latest" %}
+ - An assigned Technical Service Account Manager
+ - Quarterly support reviews
+ - Managed Admin services
+{% else if enterpriseServerVersions contains currentVersion %}
+ - Technical account managers
+ - プレミアムコンテンツへのアクセス
+ - 定期的なヘルスチェック
+ - Managed Admin hours
+{% endif %}
{% data reusables.support.government-response-times-may-vary %}
diff --git a/translations/ja-JP/content/admin/enterprise-support/submitting-a-ticket.md b/translations/ja-JP/content/admin/enterprise-support/submitting-a-ticket.md
index e969b21b87..c1fcce70db 100644
--- a/translations/ja-JP/content/admin/enterprise-support/submitting-a-ticket.md
+++ b/translations/ja-JP/content/admin/enterprise-support/submitting-a-ticket.md
@@ -51,7 +51,7 @@ After submitting your support request and optional diagnostic information,
{% if currentVersion == "github-ae@latest" %}
### {% data variables.contact.ae_azure_portal %} を使ってチケットをサブミットする
-Commercial customers can submit a support request in the {% data variables.contact.contact_ae_portal %}. Government customers should use the [Azure portal for government customers](https://portal.azure.us/#blade/Microsoft_Azure_Support/HelpAndSupportBlade). For more information, see [Create an Azure support request](https://docs.microsoft.com/en-us/azure/azure-portal/supportability/how-to-create-azure-support-request) in the Microsoft documentation.
+Commercial customers can submit a support request in the {% data variables.contact.contact_ae_portal %}. Government customers should use the [Azure portal for government customers](https://portal.azure.us/#blade/Microsoft_Azure_Support/HelpAndSupportBlade). For more information, see [Create an Azure support request](https://docs.microsoft.com/azure/azure-portal/supportability/how-to-create-azure-support-request) in the Microsoft documentation.
For urgent issues, to ensure a quick response, after you submit a ticket, please call the support hotline immediately. Your Technical Support Account Manager (TSAM) will provide you with the number to use in your onboarding session.
diff --git a/translations/ja-JP/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md b/translations/ja-JP/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md
index c2215ccc01..1e04f11655 100644
--- a/translations/ja-JP/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md
+++ b/translations/ja-JP/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md
@@ -12,7 +12,7 @@ versions:
### Enterprise の {% data variables.product.prodname_actions %} 権限について
-{% data variables.product.prodname_ghe_server %} で {% data variables.product.prodname_actions %} を有効にすると、企業内のすべての Organization で有効になります。 Enterprise 内のすべての Organization に対して {% data variables.product.prodname_actions %} を無効化するか、特定の Organization のみを許可するかを選択できます。 You can also limit the use of public actions, so that people can only use local actions that exist in an organization.
+{% data variables.product.prodname_ghe_server %} で {% data variables.product.prodname_actions %} を有効にすると、企業内のすべての Organization で有効になります。 Enterprise 内のすべての Organization に対して {% data variables.product.prodname_actions %} を無効化するか、特定の Organization のみを許可するかを選択できます。 You can also limit the use of public actions, so that people can only use local actions that exist in your enterprise.
### Enterprise の {% data variables.product.prodname_actions %} 権限の管理
diff --git a/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-azure.md b/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-azure.md
index dfd32e1de8..00b9e5cf59 100644
--- a/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-azure.md
+++ b/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-azure.md
@@ -14,7 +14,7 @@ versions:
- {% data reusables.enterprise_installation.software-license %}
- 新しいコンピューターをプロビジョニングできる Azure アカウントを所有していなければなりません。 詳しい情報については [Microsoft Azure のウェブサイト](https://azure.microsoft.com)を参照してください。
-- 仮想マシン(VM)を起動するのに必要なアクションのほとんどは、Azureポータルを使っても行えます。 とはいえ、初期セットアップ用にはAzureコマンドラインインターフェース(CLI)をインストールすることをお勧めします。 以下の例では、Azure CLI 2.0が使われています。 詳しい情報についてはAzureのガイドの"[Azure CLI 2.0のインストール](https://docs.microsoft.com/ja-jp/cli/azure/install-azure-cli?view=azure-cli-latest)"を参照してください。
+- 仮想マシン(VM)を起動するのに必要なアクションのほとんどは、Azureポータルを使っても行えます。 とはいえ、初期セットアップ用にはAzureコマンドラインインターフェース(CLI)をインストールすることをお勧めします。 以下の例では、Azure CLI 2.0が使われています。 For more information, see Azure's guide "[Install Azure CLI 2.0](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest)."
### ハードウェアについて
@@ -26,9 +26,9 @@ versions:
#### サポートされているVMタイプとリージョン
-{% data variables.product.prodname_ghe_server %} アプライアンスは、プレミアムストレージのデータディスクを必要としており、プレミアムストレージをサポートするあらゆる Azure VM でサポートされます。 詳しい情報については、Azureドキュメンテーション中の"[サポート対象のVM](https://docs.microsoft.com/ja-jp/azure/virtual-machines/windows/premium-storage#supported-vms)"を参照してください。 利用可能なVMに関する一般的な情報については[Azure仮想マシンの概要ページ](https://azure.microsoft.com/ja-jp/pricing/details/virtual-machines/linux/)を参照してください。
+{% data variables.product.prodname_ghe_server %} アプライアンスは、プレミアムストレージのデータディスクを必要としており、プレミアムストレージをサポートするあらゆる Azure VM でサポートされます。 For more information, see "[Supported VMs](https://docs.microsoft.com/azure/storage/common/storage-premium-storage#supported-vms)" in the Azure documentation. For general information about available VMs, see [the Azure virtual machines overview page](https://azure.microsoft.com/pricing/details/virtual-machines/#Linux).
-{% data variables.product.prodname_ghe_server %} は、VM タイプをサポートするあらゆる地域をサポートします。 各VMがサポートされるリージョンに関する詳しい情報については"[リージョン別の利用可能な製品](https://azure.microsoft.com/ja-jp/global-infrastructure/services/)"を参照してください。
+{% data variables.product.prodname_ghe_server %} は、VM タイプをサポートするあらゆる地域をサポートします。 For more information about the supported regions for each VM, see Azure's "[Products available by region](https://azure.microsoft.com/regions/services/)."
#### 推奨VMタイプ
@@ -47,20 +47,20 @@ versions:
{% data reusables.enterprise_installation.create-ghe-instance %}
-1. 最新の {% data variables.product.prodname_ghe_server %} アプライアンスイメージを見つけます。 `vm image list` コマンドに関する詳しい情報については、Microsoftのドキュメンテーション中の"[az vm image list](https://docs.microsoft.com/ja-jp/cli/azure/vm/image?view=azure-cli-latest)"を参照してください。
+1. 最新の {% data variables.product.prodname_ghe_server %} アプライアンスイメージを見つけます。 For more information about the `vm image list` command, see "[az vm image list](https://docs.microsoft.com/cli/azure/vm/image?view=azure-cli-latest#az_vm_image_list)" in the Microsoft documentation.
```shell
$ az vm image list --all -f GitHub-Enterprise | grep '"urn":' | sort -V
```
-2. 見つけたアプライアンスイメージを使用して新しい VM を作成します。 詳しい情報については、Microsoftドキュメンテーションの「[az vm create](https://docs.microsoft.com/en-us/cli/azure/vm?view=azure-cli-latest#az_vm_create)」を参照してください。
+2. 見つけたアプライアンスイメージを使用して新しい VM を作成します。 詳しい情報については、Microsoftドキュメンテーションの「[az vm create](https://docs.microsoft.com/cli/azure/vm?view=azure-cli-latest#az_vm_create)」を参照してください。
- VM の名前、リソースグループ、VM のサイズ、優先する Azure リージョンの名前、前の手順でリストしたアプライアンスイメージ VM の名前、およびプレミアムストレージ用のストレージ SKU についてのオプションを渡します。 リソースグループに関する詳しい情報については、Microsoft ドキュメンテーションの「[Resource groups](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-overview#resource-groups)」を参照してください。
+ VM の名前、リソースグループ、VM のサイズ、優先する Azure リージョンの名前、前の手順でリストしたアプライアンスイメージ VM の名前、およびプレミアムストレージ用のストレージ SKU についてのオプションを渡します。 リソースグループに関する詳しい情報については、Microsoft ドキュメンテーションの「[Resource groups](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-overview#resource-groups)」を参照してください。
```shell
$ az vm create -n VM_NAME -g RESOURCE_GROUP --size VM_SIZE -l REGION --image APPLIANCE_IMAGE_NAME --storage-sku Premium_LRS
```
-3. 必要なポートを開くように VM でセキュリティを設定します。 詳しい情報については、Microsoft ドキュメンテーションの「[az vm open-port](https://docs.microsoft.com/en-us/cli/azure/vm?view=azure-cli-latest#az_vm_open_port)」を参照してください。 どのポートを開く必要があるかを判断するための各ポートの説明については、以下の表を参照してください。
+3. 必要なポートを開くように VM でセキュリティを設定します。 詳しい情報については、Microsoft ドキュメンテーションの「[az vm open-port](https://docs.microsoft.com/cli/azure/vm?view=azure-cli-latest#az_vm_open_port)」を参照してください。 どのポートを開く必要があるかを判断するための各ポートの説明については、以下の表を参照してください。
```shell
$ az vm open-port -n VM_NAME -g RESOURCE_GROUP --port PORT_NUMBER
@@ -70,7 +70,7 @@ versions:
{% data reusables.enterprise_installation.necessary_ports %}
-4. 暗号化されていない新しいデータディスクを作成してVMにアタッチし、ユーザライセンス数に応じてサイズを設定してください。 詳しい情報については、Microsoft ドキュメンテーションの「[az vm disk attach](https://docs.microsoft.com/en-us/cli/azure/vm/disk?view=azure-cli-latest#az_vm_disk_attach)」を参照してください。
+4. 暗号化されていない新しいデータディスクを作成してVMにアタッチし、ユーザライセンス数に応じてサイズを設定してください。 詳しい情報については、Microsoft ドキュメンテーションの「[az vm disk attach](https://docs.microsoft.com/cli/azure/vm/disk?view=azure-cli-latest#az_vm_disk_attach)」を参照してください。
VM の名前 (`ghe-acme-corp` など)、リソースグループ、プレミアムストレージ SKU、ディスクのサイズ (`100` など)、および作成する VHD の名前についてのオプションを渡します。
@@ -86,7 +86,7 @@ versions:
### {% data variables.product.prodname_ghe_server %} 仮想マシンを設定する
-1. VM を設定する前に、VMがReadyRole ステータスになるのを待つ必要があります。 VM のステータスを `vm list` コマンドで確認します。 詳しい情報については、Microsoft ドキュメンテーションの「[az vm list](https://docs.microsoft.com/en-us/cli/azure/vm?view=azure-cli-latest#az_vm_list)」を参照してください。
+1. VM を設定する前に、VMがReadyRole ステータスになるのを待つ必要があります。 VM のステータスを `vm list` コマンドで確認します。 詳しい情報については、Microsoft ドキュメンテーションの「[az vm list](https://docs.microsoft.com/cli/azure/vm?view=azure-cli-latest#az_vm_list)」を参照してください。
```shell
$ az vm list -d -g RESOURCE_GROUP -o table
> Name ResourceGroup PowerState PublicIps Fqdns Location Zones
@@ -96,7 +96,7 @@ versions:
```
{% note %}
- **メモ:** Azure は VM 用の FQDN エントリを自動的に作成しません。 詳しい情報については、"[Linux VM用Azure Portalでの完全修飾ドメイン名の作成](https://docs.microsoft.com/ja-jp/azure/virtual-machines/linux/portal-create-fqdn)" 方法に関する Azure のガイドを参照してください。
+ **メモ:** Azure は VM 用の FQDN エントリを自動的に作成しません。 For more information, see Azure's guide on how to "[Create a fully qualified domain name in the Azure portal for a Linux VM](https://docs.microsoft.com/azure/virtual-machines/linux/portal-create-fqdn)."
{% endnote %}
diff --git a/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md b/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md
index 81407ebad9..5f5bd9b049 100644
--- a/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md
+++ b/translations/ja-JP/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md
@@ -12,7 +12,7 @@ versions:
- {% data reusables.enterprise_installation.software-license %}
- Hyper-VをサポートしているWindows Server 2008からWindows Server 2016を持っている必要があります。
-- 仮想マシン(VM)の作成に必要なほとんどのアクションは、 [Hyper-V Manager](https://docs.microsoft.com/en-us/windows-server/virtualization/hyper-v/manage/remotely-manage-hyper-v-hosts)を使っても行えます。 とはいえ、初期セットアップのためにはWindows PowerShellコマンドラインシェルを使うことをおすすめします。 以下の例ではPowerShellを使っています。 詳しい情報については、Microsoftのガイド"[Windows PowerShell ファースト ステップ ガイド](https://docs.microsoft.com/ja-jp/powershell/scripting/getting-started/getting-started-with-windows-powershell?view=powershell-5.1GET)"を参照してください。
+- 仮想マシン(VM)の作成に必要なほとんどのアクションは、 [Hyper-V Manager](https://docs.microsoft.com/windows-server/virtualization/hyper-v/manage/remotely-manage-hyper-v-hosts)を使っても行えます。 とはいえ、初期セットアップのためにはWindows PowerShellコマンドラインシェルを使うことをおすすめします。 以下の例ではPowerShellを使っています。 For more information, see the Microsoft guide "[Getting Started with Windows PowerShell](https://docs.microsoft.com/powershell/scripting/getting-started/getting-started-with-windows-powershell?view=powershell-5.1)."
### ハードウェアについて
@@ -30,23 +30,23 @@ versions:
{% data reusables.enterprise_installation.create-ghe-instance %}
-1. PowerShell で、新しい第1世代の仮想マシンを作成し、ユーザライセンス数に基づいてサイズを設定し、ダウンロードした{% data variables.product.prodname_ghe_server %}イメージをアタッチします。 詳しい情報については、Microsoft ドキュメンテーションの「[New-VM](https://docs.microsoft.com/en-us/powershell/module/hyper-v/new-vm?view=win10-ps)」を参照してください。
+1. PowerShell で、新しい第1世代の仮想マシンを作成し、ユーザライセンス数に基づいてサイズを設定し、ダウンロードした{% data variables.product.prodname_ghe_server %}イメージをアタッチします。 詳しい情報については、Microsoft ドキュメンテーションの「[New-VM](https://docs.microsoft.com/powershell/module/hyper-v/new-vm?view=win10-ps)」を参照してください。
```shell
PS C:\> New-VM -Generation 1 -Name VM_NAME -MemoryStartupBytes MEMORY_SIZE -BootDevice VHD -VHDPath PATH_TO_VHD
```
-{% data reusables.enterprise_installation.create-attached-storage-volume %} `PATH_TO_DATA_DISK` をディスクを作成した場所へのパスに置き換えます。 詳しい情報については、Microsoft ドキュメンテーションの「[New-VHD](https://docs.microsoft.com/en-us/powershell/module/hyper-v/new-vhd?view=win10-ps)」を参照してください。
+{% data reusables.enterprise_installation.create-attached-storage-volume %} `PATH_TO_DATA_DISK` をディスクを作成した場所へのパスに置き換えます。 詳しい情報については、Microsoft ドキュメンテーションの「[New-VHD](https://docs.microsoft.com/powershell/module/hyper-v/new-vhd?view=win10-ps)」を参照してください。
```shell
PS C:\> New-VHD -Path PATH_TO_DATA_DISK -SizeBytes DISK_SIZE
```
-3. データディスクをインスタンスにアタッチします。 詳しい情報については、Microsoftドキュメンテーションの「[Add-VMHardDiskDrive](https://docs.microsoft.com/en-us/powershell/module/hyper-v/add-vmharddiskdrive?view=win10-ps)」を参照してください。
+3. データディスクをインスタンスにアタッチします。 詳しい情報については、Microsoftドキュメンテーションの「[Add-VMHardDiskDrive](https://docs.microsoft.com/powershell/module/hyper-v/add-vmharddiskdrive?view=win10-ps)」を参照してください。
```shell
PS C:\> Add-VMHardDiskDrive -VMName VM_NAME -Path PATH_TO_DATA_DISK
```
-4. VM を起動します。 詳しい情報については、Microsoftドキュメンテーションの「[Start-VM](https://docs.microsoft.com/en-us/powershell/module/hyper-v/start-vm?view=win10-ps)」を参照してください。
+4. VM を起動します。 詳しい情報については、Microsoftドキュメンテーションの「[Start-VM](https://docs.microsoft.com/powershell/module/hyper-v/start-vm?view=win10-ps)」を参照してください。
```shell
PS C:\> Start-VM -Name VM_NAME
```
-5. VM の IP アドレスを入手します。 詳しい情報については、Microsoftドキュメンテーションの「[Get-VMNetworkAdapter](https://docs.microsoft.com/en-us/powershell/module/hyper-v/get-vmnetworkadapter?view=win10-ps)」を参照してください。
+5. VM の IP アドレスを入手します。 詳しい情報については、Microsoftドキュメンテーションの「[Get-VMNetworkAdapter](https://docs.microsoft.com/powershell/module/hyper-v/get-vmnetworkadapter?view=win10-ps)」を参照してください。
```shell
PS C:\> (Get-VMNetworkAdapter -VMName VM_NAME).IpAddresses
```
diff --git a/translations/ja-JP/content/admin/packages/configuring-third-party-storage-for-packages.md b/translations/ja-JP/content/admin/packages/configuring-third-party-storage-for-packages.md
index 86b393647e..55dae8e0d4 100644
--- a/translations/ja-JP/content/admin/packages/configuring-third-party-storage-for-packages.md
+++ b/translations/ja-JP/content/admin/packages/configuring-third-party-storage-for-packages.md
@@ -13,7 +13,7 @@ versions:
{% data variables.product.prodname_ghe_server %} 上の {% data variables.product.prodname_registry %} は、外部の blob ストレージを使用してパッケージを保存します。 必要なストレージ容量は、{% data variables.product.prodname_registry %} の使用状況によって異なります。
-現時点では、{% data variables.product.prodname_registry %} は Amazon Web Services (AWS) S3 で blob ストレージをサポートしています。 MinIO もサポートされていますが、設定は現在 {% data variables.product.product_name %} インタフェースに実装されていません。 AWS S3 の手順に従って MinIO 設定に同様の情報を入力することで、ストレージにMinIO を使用できます。
+現時点では、{% data variables.product.prodname_registry %} は Amazon Web Services (AWS) S3 で blob ストレージをサポートしています。 MinIO もサポートされていますが、設定は現在 {% data variables.product.product_name %} インタフェースに実装されていません。 You can use MinIO for storage by following the instructions for AWS S3, entering the analogous information for your MinIO configuration.
最適なエクスペリエンスを得るには、{% data variables.product.prodname_actions %} のストレージに使用するバケットとは別に、{% data variables.product.prodname_registry %} }専用のバケットを使用することをお勧めします。
diff --git a/translations/ja-JP/content/admin/policies/creating-a-pre-receive-hook-script.md b/translations/ja-JP/content/admin/policies/creating-a-pre-receive-hook-script.md
index 3d3c4f4f80..37c3f79ffc 100644
--- a/translations/ja-JP/content/admin/policies/creating-a-pre-receive-hook-script.md
+++ b/translations/ja-JP/content/admin/policies/creating-a-pre-receive-hook-script.md
@@ -102,8 +102,8 @@ pre-receive フックスクリプトは、{% data variables.product.prodname_ghe
adduser git -D -G root -h /home/git -s /bin/bash && \
passwd -d git && \
su git -c "mkdir /home/git/.ssh && \
- ssh-keygen -t rsa -b 4096 -f /home/git/.ssh/id_rsa -P '' && \
- mv /home/git/.ssh/id_rsa.pub /home/git/.ssh/authorized_keys && \
+ ssh-keygen -t ed25519 -f /home/git/.ssh/id_ed25519 -P '' && \
+ mv /home/git/.ssh/id_ed25519.pub /home/git/.ssh/authorized_keys && \
mkdir /home/git/test.git && \
git --bare init /home/git/test.git"
@@ -135,7 +135,7 @@ pre-receive フックスクリプトは、{% data variables.product.prodname_ghe
> Sending build context to Docker daemon 3.584 kB
> Step 1 : FROM gliderlabs/alpine:3.3
> ---> 8944964f99f4
- > Step 2 : RUN apk add --no-cache git openssh bash && ssh-keygen -A && sed -i "s/#AuthorizedKeysFile/AuthorizedKeysFile/g" /etc/ssh/sshd_config && adduser git -D -G root -h /home/git -s /bin/bash && passwd -d git && su git -c "mkdir /home/git/.ssh && ssh-keygen -t rsa -b 4096 -f /home/git/.ssh/id_rsa -P ' && mv /home/git/.ssh/id_rsa.pub /home/git/.ssh/authorized_keys && mkdir /home/git/test.git && git --bare init /home/git/test.git"
+ > Step 2 : RUN apk add --no-cache git openssh bash && ssh-keygen -A && sed -i "s/#AuthorizedKeysFile/AuthorizedKeysFile/g" /etc/ssh/sshd_config && adduser git -D -G root -h /home/git -s /bin/bash && passwd -d git && su git -c "mkdir /home/git/.ssh && ssh-keygen -t ed25519 -f /home/git/.ssh/id_ed25519 -P ' && mv /home/git/.ssh/id_ed25519.pub /home/git/.ssh/authorized_keys && mkdir /home/git/test.git && git --bare init /home/git/test.git"
> ---> Running in e9d79ab3b92c
> fetch http://alpine.gliderlabs.com/alpine/v3.3/main/x86_64/APKINDEX.tar.gz
> fetch http://alpine.gliderlabs.com/alpine/v3.3/community/x86_64/APKINDEX.tar.gz
@@ -143,9 +143,9 @@ pre-receive フックスクリプトは、{% data variables.product.prodname_ghe
> OK: 34 MiB in 26 packages
> ssh-keygen: generating new host keys: RSA DSA ECDSA ED25519
> Password for git changed by root
- > Generating public/private rsa key pair.
- > Your identification has been saved in /home/git/.ssh/id_rsa.
- > Your public key has been saved in /home/git/.ssh/id_rsa.pub.
+ > Generating public/private ed25519 key pair.
+ > Your identification has been saved in /home/git/.ssh/id_ed25519.
+ > Your public key has been saved in /home/git/.ssh/id_ed25519.pub.
....出力を省略....
> Initialized empty Git repository in /home/git/test.git/
> Successfully built dd8610c24f82
@@ -173,7 +173,7 @@ pre-receive フックスクリプトは、{% data variables.product.prodname_ghe
9. 生成された SSH キーをデータコンテナからローカルマシンにコピーしてください:
```shell
- $ docker cp data:/home/git/.ssh/id_rsa .
+ $ docker cp data:/home/git/.ssh/id_ed25519 .
```
10. テストリポジトリのリモートを修正して、Docker コンテナ内の `test.git` リポジトリにプッシュしてください。 この例では `git@github.com:octocat/Hello-World.git` を使っていますが、どのリポジトリを使ってもかまいません。 この例ではローカルマシン (127.0.0.1) がポート 52311 をバインドしているものとしていますが、docker がリモートマシンで動作しているなら異なる IP アドレスを使うことができます。
@@ -182,7 +182,7 @@ pre-receive フックスクリプトは、{% data variables.product.prodname_ghe
$ git clone git@github.com:octocat/Hello-World.git
$ cd Hello-World
$ git remote add test git@127.0.0.1:test.git
- $ GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 52311 -i ../id_rsa" git push -u test main
+ $ GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 52311 -i ../id_ed25519" git push -u test main
> Warning: Permanently added '[192.168.99.100]:52311' (ECDSA) to the list of known hosts.
> Counting objects: 7, done.
> Delta compression using up to 4 threads.
diff --git a/translations/ja-JP/content/admin/user-management/auditing-users-across-your-enterprise.md b/translations/ja-JP/content/admin/user-management/auditing-users-across-your-enterprise.md
index c234f6cb5c..68c7b32c32 100644
--- a/translations/ja-JP/content/admin/user-management/auditing-users-across-your-enterprise.md
+++ b/translations/ja-JP/content/admin/user-management/auditing-users-across-your-enterprise.md
@@ -66,9 +66,9 @@ The audit log lists the following information about actions made within your ent
`org` 修飾子は、特定の Organization にアクションを限定します。 例:
-* `org:my-org`は`my-org`というOrganizationで生じたすべてのイベントを検索します。
+* `org:my-org` finds all events that occurred for the `my-org` organization.
* `org:my-org action:team`は`my-org`というOrganization内で行われたすべてのteamイベントを検索します。
-* `-org:my-org`は`my-org`というOrganizationで生じたすべてのイベントを除外します。
+* `-org:my-org` excludes all events that occurred for the `my-org` organization.
#### 実行されたアクションに基づく検索
diff --git a/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md b/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md
index 43d213ce69..4cb2ac5de4 100644
--- a/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md
+++ b/translations/ja-JP/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md
@@ -80,12 +80,8 @@ Now that you've created and published your repository, you're ready to make chan
2. Make some changes to the _README.md_ file that you previously created. You can add information that describes your project, like what it does and why it is useful. When you are satisfied with your changes, save them in your text editor.
3. In {% data variables.product.prodname_desktop %}, navigate to the **Changes** view. ファイルのリストに、_README.md_ が表示されているはずです。 The checkmark to the left of the _README.md_ file indicates that the changes you've made to the file will be part of the commit you make. 今後、複数のファイルに変更を行って、そのうちの一部のファイルのみの変更をコミットしたい場合があるかもしれません。 If you click the checkmark next to a file, that file will not be included in the commit. 
-4. [**Changes**] リストの下に、コミットメッセージを入力します。 プロフィール画像の右側で、コミットについて簡潔な説明を入力します。 ここでは _README.md_ ファイルを変更するので、「プロジェクトの目的について情報を追加する」などがコミットの要約として良いかもしれません。 Below the summary, you'll see a "Description" text field where you can type a longer description of the changes in the commit, which is helpful when looking back at the history of a project and understanding why changes were made. 今は _README.md_ ファイルの基本的な更新を行っているところなので、この内容は飛ばしてもかまいません。  <<<<<<< HEAD
-5. Click **Commit to BRANCH NAME**. The commit button shows your current branch so you can be sure to commit to the branch you want.
-
-=======
-5. [**Commit to master**] をクリックします。 The commit button shows your current branch, which in this case is `master`, so that you know which branch you are making a commit to. ![[Commit to master]](/assets/images/help/desktop/getting-started-guide/click-commit-to-master.png)
-> > > > > > > master
+4. [**Changes**] リストの下に、コミットメッセージを入力します。 プロフィール画像の右側で、コミットについて簡潔な説明を入力します。 ここでは _README.md_ ファイルを変更するので、「プロジェクトの目的について情報を追加する」などがコミットの要約として良いかもしれません。 Below the summary, you'll see a "Description" text field where you can type a longer description of the changes in the commit, which is helpful when looking back at the history of a project and understanding why changes were made. 今は _README.md_ ファイルの基本的な更新を行っているところなので、この内容は飛ばしてもかまいません。 
+5. Click **Commit to BRANCH NAME**. The commit button shows your current branch so you can be sure to commit to the branch you want. 
6. 変更を {% data variables.product.product_name %} のリモートリポジトリにプッシュするには、[**Push origin**] をクリックします。 ![[Push origin]](/assets/images/help/desktop/getting-started-guide/push-to-origin.png)
- The **Push origin** button is the same one that you clicked to publish your repository to {% data variables.product.product_name %}. This button changes contextually based on where you are at in the Git workflow. It should now say `Push origin` with a `1` next to it, indicating that there is one commit that has not been pushed up to {% data variables.product.product_name %}.
- The "origin" in **Push origin** means that you are pushing changes to the remote called `origin`, which in this case is your project's repository on {% data variables.product.prodname_dotcom_the_website %}. {% data variables.product.product_name %} に何か新しいコミットをプッシュするまで、お手元のコンピューターにあるプロジェクトのリポジトリと、{% data variables.product.prodname_dotcom_the_website %} にあるプロジェクトのリポジトリには違いがあります。 This allows you to work locally and only push your changes to {% data variables.product.prodname_dotcom_the_website %} when you're ready.
diff --git a/translations/ja-JP/content/developers/apps/about-apps.md b/translations/ja-JP/content/developers/apps/about-apps.md
index 326362ca82..a99bedb059 100644
--- a/translations/ja-JP/content/developers/apps/about-apps.md
+++ b/translations/ja-JP/content/developers/apps/about-apps.md
@@ -1,6 +1,6 @@
---
title: アプリケーションについて
-intro: 'You can build integrations with the {% data variables.product.prodname_dotcom %} APIs to add flexibility and reduce friction in your own workflow.{% if currentVersion == "free-pro-team@latest" %} You can also share integrations with others on [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace).{% endif %}'
+intro: '{% data variables.product.prodname_dotcom %} API でインテグレーションを構築し、柔軟性を強化してワークフローの摩擦を軽減できます。{% if currentVersion == "free-pro-team@latest" %}また、[{% data variables.product.prodname_marketplace %}](https://github.com/marketplace) で他のユーザとインテグレーションを共有することも可能です。{% endif %}'
redirect_from:
- /apps/building-integrations/setting-up-a-new-integration/
- /apps/building-integrations/
diff --git a/translations/ja-JP/content/developers/apps/authorizing-oauth-apps.md b/translations/ja-JP/content/developers/apps/authorizing-oauth-apps.md
index 2145896811..3189fba3c2 100644
--- a/translations/ja-JP/content/developers/apps/authorizing-oauth-apps.md
+++ b/translations/ja-JP/content/developers/apps/authorizing-oauth-apps.md
@@ -14,7 +14,7 @@ versions:
github-ae: '*'
---
-{% data variables.product.product_name %}'s OAuth implementation supports the standard [authorization code grant type](https://tools.ietf.org/html/rfc6749#section-4.1){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" or currentVersion == "github-ae@latest" %} and the OAuth 2.0 [Device Authorization Grant](https://tools.ietf.org/html/rfc8628) for apps that don't have access to a web browser{% endif %}.
+{% data variables.product.product_name %} のOAuthの実装は、標準の[認可コード許可タイプ](https://tools.ietf.org/html/rfc6749#section-4.1){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" or currentVersion == "github-ae@latest" %}およびWebブラウザを利用できないアプリケーションのためのOAuth 2.0の[Device Authorization Grant](https://tools.ietf.org/html/rfc8628){% endif %}をサポートしています。
アプリケーションをテストする場合のように、標準的な方法でのアプリケーションの認可をスキップしたい場合には[非Webアプリケーションフロー](#non-web-application-flow)を利用できます。
diff --git a/translations/ja-JP/content/developers/apps/creating-a-github-app-using-url-parameters.md b/translations/ja-JP/content/developers/apps/creating-a-github-app-using-url-parameters.md
index fbc290cab7..b9d3d93097 100644
--- a/translations/ja-JP/content/developers/apps/creating-a-github-app-using-url-parameters.md
+++ b/translations/ja-JP/content/developers/apps/creating-a-github-app-using-url-parameters.md
@@ -13,8 +13,8 @@ versions:
### {% data variables.product.prodname_github_app %} URL パラメータについて
個人または Organization アカウントで、{% data variables.product.prodname_github_app %} の構成を事前設定する以下の URL をクエリパラメータに追加できます。
-* **User account:** `{% data variables.product.oauth_host_code %}/settings/apps/new`
-* **Organization account:** `{% data variables.product.oauth_host_code %}/:org/settings/apps/new`
+* **ユーザアカウント:** `{% data variables.product.oauth_host_code %}/settings/apps/new`
+* **Organization アカウント:** `{% data variables.product.oauth_host_code %}/:org/settings/apps/new`
アプリケーションを作成するユーザは、アプリケーションをサブミットする前に {% data variables.product.prodname_github_app %} 登録ページから事前設定する値を編集できます。 URL クエリ文字列に `name` などの必須の値を含めない場合、アプリケーションを作成するユーザが、アプリケーションをサブミットする前に値を入力する必要があります。
@@ -56,7 +56,7 @@ versions:
| [`checks`](/rest/reference/permissions-required-for-github-apps/#permission-on-checks) | [Checks API](/v3/checks/) へのアクセス権を付与します。 `none`、`read`、`write` のいずれかです。 |
| `content_references` | 「[コンテンツ添付の作成](/v3/apps/installations/#create-a-content-attachment)」エンドポイントへのアクセス権を付与します。 `none`、`read`、`write` のいずれかです。 |
| [`contents`](/rest/reference/permissions-required-for-github-apps/#permission-on-contents) | さまざまなエンドポイントにアクセス権を付与し、リポジトリのコンテンツを変更できるようにします。 `none`、`read`、`write` のいずれかです。 |
-| [`deployments`](/rest/reference/permissions-required-for-github-apps/#permission-on-deployments) | [Deployments API](/rest/reference/repos#deployments) へのアクセス権を付与します。 Can be one of: `none`, `read`, or `write`.{% if currentVersion == "free-pro-team@latest" or enterpriseServerVersions contains currentVersion %}
+| [`deployments`](/rest/reference/permissions-required-for-github-apps/#permission-on-deployments) | [Deployments API](/rest/reference/repos#deployments) へのアクセス権を付与します。 `none`、`read`、`write` のいずれかです。{% if currentVersion == "free-pro-team@latest" or enterpriseServerVersions contains currentVersion %}
| [`emails`](/rest/reference/permissions-required-for-github-apps/#permission-on-emails) | [Emails API](/v3/users/emails/) へのアクセス権を付与します。 `none`、`read`、`write` のいずれかです。{% endif %}
| [`followers`](/rest/reference/permissions-required-for-github-apps/#permission-on-followers) | [Followers API](/v3/users/followers/) へのアクセス権を付与します。 `none`、`read`、`write` のいずれかです。 |
| [`gpg_keys`](/rest/reference/permissions-required-for-github-apps/#permission-on-gpg-keys) | [GPG Keys API](/v3/users/gpg_keys/) へのアクセス権を付与します。 `none`、`read`、`write` のいずれかです。 |
diff --git a/translations/ja-JP/content/developers/apps/creating-ci-tests-with-the-checks-api.md b/translations/ja-JP/content/developers/apps/creating-ci-tests-with-the-checks-api.md
index 9f17a30fe4..1fd6c308d6 100644
--- a/translations/ja-JP/content/developers/apps/creating-ci-tests-with-the-checks-api.md
+++ b/translations/ja-JP/content/developers/apps/creating-ci-tests-with-the-checks-api.md
@@ -22,9 +22,9 @@ CI サーバーは、コードの文法チェッカー (スタイルフォーマ
#### Checks API の概要
-[Checks API](/v3/checks/) を使用すると、リポジトリでコミットされている各コードに対して自動的に実行される CI テストを設定できます。 The Checks API reports detailed information about each check on GitHub in the pull request's **Checks** tab. Checks API を使用すると、コードの特定の行に対して追加的な情報を含むアノテーションを作成できます。 アノテーションは **Checks** タブに表示されます。 プルリクエストの一部であるファイルに対してアノテーションを作成すると、そのアノテーションは**Files changed** タブにも表示されます。
+[Checks API](/v3/checks/) を使用すると、リポジトリでコミットされている各コードに対して自動的に実行される CI テストを設定できます。 Checks API は、プルリクエストの [**Checks**] タブにおいて、各チェックについての詳細情報をレポートします。 Checks API を使用すると、コードの特定の行に対して追加的な情報を含むアノテーションを作成できます。 アノテーションは [**Checks**] タブに表示されます。 プルリクエストの一部であるファイルに対してアノテーションを作成すると、そのアノテーションは [**Files changed**] タブにも表示されます。
-_チェックスイート_とは、 _チェック実行_ (個々の CI テスト) をグループ化したものです。 チェックスイートにもチェック実行にも_ステータス_が含まれており、GitHub のプルリクエストで表示できます。 You can use statuses to determine when a code commit introduces errors. これらのステータスを[保護されたブランチ](/v3/repos/branches/)で使用すると、プルリクエストを早まってマージすることを防げます。 詳細は「[ステータスチェック必須の有効化](/articles/enabling-required-status-checks/)」を参照してください。
+_チェックスイート_とは、 _チェック実行_ (個々の CI テスト) をグループ化したものです。 チェックスイートにもチェック実行にも_ステータス_が含まれており、GitHub のプルリクエストで表示できます。 ステータスを使用して、コードコミットがエラーを発生させるタイミングを決定できます。 これらのステータスを[保護されたブランチ](/v3/repos/branches/)で使用すると、プルリクエストを早まってマージすることを防げます。 詳細は「[ステータスチェック必須の有効化](/articles/enabling-required-status-checks/)」を参照してください。
Checks API は、新しいコードがリポジトリにプッシュされるたびに、リポジトリにインストールされている全ての GitHub App に [`check_suite` webhook イベント](/webhooks/event-payloads/#check_suite)を送信します。 Checks API イベントの全てのアクションを受信するには、アプリケーションに `checks:write` 権限が必要です。 GitHub はデフォルトのフローを使ってリポジトリの新しいコードのコミットに `check_suite` イベントを自動的に作成しますが、[チェックスイートのためのリポジトリプリファレンスの更新](/v3/checks/suites/#update-repository-preferences-for-check-suites)を行っても構いません。 デフォルトのフローは以下の通りです。
@@ -43,64 +43,64 @@ Checks API は、新しいコードがリポジトリにプッシュされるた
* Create annotations on lines of code that GitHub displays in the **Checks** and **Files Changed** tab of a pull request.
* Automatically fix linter recommendations by exposing a "Fix this" button in the **Checks** tab of the pull request.
-To get an idea of what your Checks API CI server will do when you've completed this quickstart, check out the demo below:
+このクイックスタートを完了したときに Checks API CI サーバーがどのように動作するかを理解するには、以下のデモをご覧ください。

### 必要な環境
-Before you get started, you may want to familiarize yourself with [Github Apps](/apps/), [Webhooks](/webhooks), and the [Checks API](/v3/checks/), if you're not already. You'll find more APIs in the [REST API docs](/v3/). The Checks API is also available to use in [GraphQL](/v4/), but this quickstart focuses on REST. See the GraphQL [Checks Suite](/v4/object/checksuite/) and [Check Run](/v4/object/checkrun/) objects for more details.
+以下の作業に取りかかる前に、[Github Apps](/apps/)、[webhook](/webhooks)、[Checks API](/v3/checks/) を使い慣れていない場合は、ある程度慣れておくとよいでしょう。 [REST API ドキュメント](/v3/)には、さらに API が掲載されています。 Checks API は [GraphQL](/v4/) でも使用できますが、このクイックスタートでは REST に焦点を当てます。 詳細については、GraphQL [Checks Suite](/v4/object/checksuite/) および [Check Run](/v4/object/checkrun/) オブジェクトを参照してください。
You'll use the [Ruby programming language](https://www.ruby-lang.org/en/), the [Smee](https://smee.io/) webhook payload delivery service, the [Octokit.rb Ruby library](http://octokit.github.io/octokit.rb/) for the GitHub REST API, and the [Sinatra web framework](http://sinatrarb.com/) to create your Checks API CI server app.
-You don't need to be an expert in any of these tools or concepts to complete this project. This guide will walk you through all the required steps. Before you begin creating CI tests with the Checks API, you'll need to do the following:
+このプロジェクトを完了するために、これらのツールや概念のエキスパートである必要はありません。 このガイドでは、必要なステップを順番に説明していきます。 Checks API で CI テストを作成する前に、以下を行う必要があります。
-1. Clone the [Creating CI tests with the Checks API](https://github.com/github-developer/creating-ci-tests-with-the-checks-api) repository.
+1. [Checks API で CI テストを作成する](https://github.com/github-developer/creating-ci-tests-with-the-checks-api) リポジトリをクローンします。
```shell
$ git clone https://github.com/github-developer/creating-ci-tests-with-the-checks-api.git
```
- Inside the directory, you'll find a `template_server.rb` file with the template code you'll use in this quickstart and a `server.rb` file with the completed project code.
+ ディレクトリの中には、このクイックスタートで使用する `template_server.rb` ファイルと、完成したプロジェクトコードである `server.rb` ファイルがあります。
-1. Follow the steps in the "[Setting up your development environment](/apps/quickstart-guides/setting-up-your-development-environment/)" quickstart to configure and run the app server. **Note:** Instead of [cloning the GitHub App template repository](/apps/quickstart-guides/setting-up-your-development-environment/#prerequisites), use the `template_server.rb` file in the repository you cloned in the previous step in this quickstart.
+1. 「[開発環境をセットアップする](/apps/quickstart-guides/setting-up-your-development-environment/)」クイックスタートに記載されたステップに従い、アプリケーションサーバーを構成して実行します。 **注釈:** [GitHub App のテンプレートリポジトリをクローンする](/apps/quickstart-guides/setting-up-your-development-environment/#prerequisites)のではなく、このクイックスタートの直前のステップでクローンしたリポジトリにある `template_server.rb` ファイルを使用します。
- If you've completed a GitHub App quickstart before, make sure to register a _new_ GitHub App and start a new Smee channel to use with this quickstart.
+ GitHub App クイックスタートガイドを以前に完了している場合、このクイックスタートでは必ず_新たな_ GitHub App を登録し、このクイックスタートで使用する Smee チャンネルを新しく開始するようにしてください。
- See the [troubleshooting](/apps/quickstart-guides/setting-up-your-development-environment/#troubleshooting) section if you are running into problems setting up your template GitHub App.
+ テンプレート GitHub App の設定で問題にぶつかった場合は、[トラブルシューティング](/apps/quickstart-guides/setting-up-your-development-environment/#troubleshooting)のセクションを参照してください。
### パート1. Checks API インターフェースを作成する
-In this part, you will add the code necessary to receive `check_suite` webhook events and create and update check runs. You'll also learn how to create check runs when a check was re-requested on GitHub. At the end of this section, you'll be able to view the check run you created in a GitHub pull request.
+このパートでは、`check_suite` webhook イベントを受信するために必要なコードを追加し、チェック実行を作成して更新します。 また、GitHub でチェックが再リクエストされた場合にチェック実行を作成する方法についても学びます。 At the end of this section, you'll be able to view the check run you created in a GitHub pull request.
-Your check run will not be performing any checks on the code in this section. You'll add that functionality in [Part 2: Creating the Octo RuboCop CI test](#part-2-creating-the-octo-rubocop-ci-test).
+このセクションでは、作成したチェック実行はコードでチェックを実行しません。 この機能については、[パート 2: Octo RuboCop CI テストを作成する](#part-2-creating-the-octo-rubocop-ci-test)で追加します。
-You should already have a Smee channel configured that is forwarding webhook payloads to your local server. Your server should be running and connected to the GitHub App you registered and installed on a test repository. If you haven't completed the steps in "[Setting up your development environment](/apps/quickstart-guides/setting-up-your-development-environment/)," you'll need to do that before you can continue.
+ローカルサーバーにwebhook ペイロードを転送するよう Smee チャンネルが構成されているでしょうか。 サーバーは実行中で、登録済みかつテストリポジトリにインストールした GitHub App に接続している必要があります。 「[開発環境をセットアップする](/apps/quickstart-guides/setting-up-your-development-environment/)」のステップを完了していない場合は、次に進む前にこれを実行する必要があります。
-Let's get started! These are the steps you'll complete in Part 1:
+さあ、始めましょう! パート 1 では、以下のステップを完了させます。
-1. [Updating app permissions](#step-11-updating-app-permissions)
-1. [Adding event handling](#step-12-adding-event-handling)
-1. [Creating a check run](#step-13-creating-a-check-run)
-1. [Updating a check run](#step-14-updating-a-check-run)
+1. [アプリケーションの権限を更新する](#step-11-updating-app-permissions)
+1. [イベントの処理を追加する](#step-12-adding-event-handling)
+1. [チェック実行を作成する](#step-13-creating-a-check-run)
+1. [チェック実行を更新する](#step-14-updating-a-check-run)
-### ステップ 1.1. Updating app permissions
+### ステップ 1.1. アプリケーションの権限を更新する
-When you [first registered your app](#prerequisites), you accepted the default permissions, which means your app doesn't have access to most resources. For this example, your app will need permission to read and write checks.
+[最初にアプリケーションを登録](#prerequisites)した際は、デフォルトの権限を受け入れています。これは、アプリケーションがほとんどのリソースにアクセスできないことを意味します。 この例においては、アプリケーションにはチェックを読み取りおよび書き込みする権限が必要となります。
-To update your app's permissions:
+アプリケーションの権限を更新するには、以下の手順に従います。
-1. Select your app from the [app settings page](https://github.com/settings/apps) and click **Permissions & Webhooks** in the sidebar.
-1. In the "Permissions" section, find "Checks", and select **Read & write** in the Access dropdown next to it.
-1. In the "Subscribe to events" section, select **Check suite** and **Check run** to subscribe to these events.
+1. [アプリケーションの設定ページ](https://github.com/settings/apps)からアプリケーションを選択肢、サイドバーの [**Permissions & Webhooks**] をクリックします。
+1. [Permissions] セクションで [Checks] を見つけて、隣にある [Access] ドロップダウンで [**Read & write**] を選択します。
+1. [Subscribe to events] セクションで [**Check suite**] と [**Check run**] を選択してこれらのイベントをサブスクライブします。
{% data reusables.apps.accept_new_permissions_steps %}
-これでうまくいきました。 Your app has permission to do the tasks you want it to do. Now you can add the code to handle the events.
+これでうまくいきました。 アプリケーションは必要なタスクを実行する権限を所有しています。 これでイベントを処理するコードを追加できるようになりました。
-### ステップ 1.2. Adding event handling
+### ステップ 1.2. イベントの処理を追加する
-Now that your app is subscribed to the **Check suite** and **Check run** events, it will start receiving the [`check_suite`](/webhooks/event-payloads/#check_suite) and [`check_run`](/webhooks/event-payloads/#check_run) webhooks. GitHub sends webhook payloads as `POST` requests. Because you forwarded your Smee webhook payloads to `http://localhost/event_handler:3000`, your server will receive the `POST` request payloads at the `post '/event_handler'` route.
+ここまでで、アプリケーションが **Check suite** および **Check run** イベントにサブスクライブされ、[`check_suite`](/webhooks/event-payloads/#check_suite) および [`check_run`](/webhooks/event-payloads/#check_run) webhook を受信し始めます。 GitHub は webhook ペイロードを `POST` リクエストとして送信します。 Smee webhook ペイロードを `http://localhost/event_handler:3000` に転送したため、サーバーは `POST` リクエストのペイロードを `post '/event_handler'` ルートで受信します。
-An empty `post '/event_handler'` route is already included in the `template_server.rb` file, which you downloaded in the [prerequisites](#prerequisites) section. The empty route looks like this:
+空の `post '/event_handler'` ルートは、[必要な環境](#prerequisites)セクションでダウンロードした `template_server.rb` ファイルに既に含まれています。 空のルートは次のようになっています。
``` ruby
post '/event_handler' do
@@ -113,7 +113,7 @@ An empty `post '/event_handler'` route is already included in the `template_serv
end
```
-Use this route to handle the `check_suite` event by adding the following code:
+次のコードを追加し、このルートを使用して `check_suite` イベントを処理します。
``` ruby
# Get the event type from the HTTP_X_GITHUB_EVENT header
@@ -126,13 +126,13 @@ when 'check_suite'
end
```
-Every event that GitHub sends includes a request header called `HTTP_X_GITHUB_EVENT`, which indicates the type of event in the `POST` request. Right now, you're only interested in events of type `check_suite`, which are emitted when a new check suite is created. Each event has an additional `action` field that indicates the type of action that triggered the events. For `check_suite`, the `action` field can be `requested`, `rerequested`, or `completed`.
+GitHub が送信する全てのイベントには、`HTTP_X_GITHUB_EVENT` というリクエストヘッダが含まれており、これは `POST` リクエストのイベントの型を示します。 ここでは `check_suite` 型のイベントにのみ注目しましょう。これは新しいチェックスイートが作成された時に発生します。 各イベントには、アクションをトリガーしたイベントのタイプを示す `action` フィールドが付いています。 `check_suite` では、`action` フィールドは `requested`、`rerequested`、`completed` のいずれかとなります。
-The `requested` action requests a check run each time code is pushed to the repository, while the `rerequested` action requests that you re-run a check for code that already exists in the repository. Because both the `requested` and `rerequested` actions require creating a check run, you'll call a helper called `create_check_run`. Let's write that method now.
+`requested` アクションはリポジトリにコードがプッシュされるたびにチェック実行をリクエストし、`rerequested` アクションはリポジトリに既存のコードにチェックを再実行するようリクエストします。 `requested` と `rerequested` の両方のアクションでチェック実行の作成が必要なため、`create_check_run` というヘルパーを呼び出します。 では、このメソッドを書いてみましょう。
-### ステップ 1.3. Creating a check run
+### ステップ 1.3. チェック実行を作成する
-You'll add this new method as a [Sinatra helper](https://github.com/sinatra/sinatra#helpers) in case you want other routes to use it too. Under `helpers do`, add this `create_check_run` method:
+他のルートでも使用する場合のために、新しいメソッドを [Sinatra ヘルパー](https://github.com/sinatra/sinatra#helpers) として追加します。 `helpers do` の下に、以下の `create_check_run` メソッドを追加します。
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %}
``` ruby
@@ -175,17 +175,17 @@ end
```
{% endif %}
-This code calls the "[Create a check run](/v3/checks/runs/#create-a-check-run)" endpoint using the generic [HTTP `POST` method](http://octokit.github.io/octokit.rb/Octokit/Connection.html#post-instance_method). This method takes two parameters: the URL of the endpoint and the input parameters to the method.
+このコードは [HTTP `POST` メソッド](http://octokit.github.io/octokit.rb/Octokit/Connection.html#post-instance_method)を使用して、「[チェック実行の作成](/v3/checks/runs/#create-a-check-run)」エンドポイントを呼び出します。 このメソッドは、エンドポイントの URL とメソッドの入力パラメータという 2 つのパラメータを取ります。
-To create a check run, only two input parameters are required: `name` and `head_sha`. We will use [Rubocop](https://rubocop.readthedocs.io/en/latest/) to implement the CI test later in this quickstart, which is why the name "Octo Rubocop" is used here, but you can choose any name you'd like for the check run.
+チェック実行を作成するために必要なのは、`name` と `head_sha` の 2 つの入力パラメータのみです。 このクイックスタートでは、後で [Rubocop](https://rubocop.readthedocs.io/en/latest/) を使用して CI テストを実装します。そのため、ここでは「Octo Rubocop」という名前を使っていますが、チェック実行には任意の名前を選ぶことができます。
-You're only supplying the required parameters now to get the basic functionality working, but you'll update the check run later as you collect more information about the check run. By default, GitHub sets the `status` to `queued`.
+ここでは基本的な機能を実行するため必要なパラメータのみを指定していますが、チェック実行について必要な情報を収集するため、後でチェック実行を更新することになります。 デフォルトでは、GitHub は `status` を `queued` に設定します。
-GitHub creates a check run for a specific commit SHA, which is why `head_sha` is a required parameter. You can find the commit SHA in the webhook payload. Although you're only creating a check run for the `check_suite` event right now, it's good to know that the `head_sha` is included in both the `check_suite` and `check_run` objects in the event payloads.
+GitHub は特定のコミット SHA に対するチェック実行を作成します。これが `head_sha` が必須パラメータである理由です。 コミット SHA は、webhook ペイロードで確認できます。 現時点では `check_suite` イベントにチェック実行を作成しているだけですが、`head_sha` がイベントペイロードの `check_suite` と `check_run` の両方のオブジェクトに含まれていることは知っておくとよいでしょう。
-In the code above, you're using the [ternary operator](https://ruby-doc.org/core-2.3.0/doc/syntax/control_expressions_rdoc.html#label-Ternary+if), which works like an `if/else` statement, to check if the payload contains a `check_run` object. If it does, you read the `head_sha` from the `check_run` object, otherwise you read it from the `check_suite` object.
+上記のコードでは、`if/else` 文のように機能する[三項演算子](https://ruby-doc.org/core-2.3.0/doc/syntax/control_expressions_rdoc.html#label-Ternary+if)を使用して、ペイロードが `check_run` オブジェクトを含んでいるか確認しています。 含んでいる場合、`check_run` オブジェクトから `head_sha` を読み取り、含んでいない場合は `check_suite` オブジェクトから読み取ります。
-To test this code, restart the server from your terminal:
+このコードをテストするには、サーバーをターミナルから再起動します。
```shell
$ ruby template_server.rb
@@ -193,21 +193,21 @@ $ ruby template_server.rb
{% data reusables.apps.sinatra_restart_instructions %}
-Now open a pull request in the repository where you installed your app. Your app should respond by creating a check run on your pull request. Click on the **Checks** tab, and you should see something like this:
+さて、それではアプリケーションをインストールしたリポジトリにあるプルリクエストを開いてください。 アプリケーションは応答し、プルリクエストのチェック実行を作成するはずです。 [**Checks**] タブをクリックすると、画面が以下のようになっているはずです。

-If you see other apps in the Checks tab, it means you have other apps installed on your repository that have **Read & write** access to checks and are subscribed to **Check suite** and **Check run** events.
+[Checks] タブに他のアプリケーションが表示されている場合は、チェックに対して**読み取りおよび書き込み**アクセス権を持ち、**Check suite** および **Check run** イベントにサブスクライブしている他のアプリケーションをリポジトリにインストールしているものと思われます。
-これでうまくいきました。 You've told GitHub to create a check run. You can see the check run status is set to `queued` next to a yellow icon. Next, you'll want to wait for GitHub to create the check run and update its status.
+これでうまくいきました。 ここまでで、GitHub にチェック実行を作成するよう指示しました。 チェック実行のステータスが `queued` に設定されていることが、黄色のアイコンの右側で確認できます。 次は、GitHub がチェック実行を作成し、ステータスを更新するのを待てばよいでしょう。
-### ステップ 1.4. Updating a check run
+### ステップ 1.4. チェック実行を更新する
-When your `create_check_run` method runs, it asks GitHub to create a new check run. When Github finishes creating the check run, you'll receive the `check_run` webhook event with the `created` action. That event is your signal to begin running the check.
+`create_check_run` メソッドが実行されると、メソッドは GitHub に新しいチェック実行を作成するよう依頼します。 Github がチェック実行の作成を完了すると、`created` アクションの `check_run` webhook イベントを受信します。 このイベントは、チェックの実行が始まる合図です。
-You'll want to update your event handler to look for the `created` action. While you're updating the event handler, you can add a conditional for the `rerequested` action. When someone re-runs a single test on GitHub by clicking the "Re-run" button, GitHub sends the `rerequested` check run event to your app. When a check run is `rerequested`, you'll want to start the process all over and create a new check run.
+イベントハンドラーを更新し、`created` アクションを待ち受けるようにしましょう。 イベントハンドラーを更新する際、`rerequested` アクションに条件を追加できます。 誰かが [Re-run] ボタンをクリックして GitHub 上で単一のテストを再実行すると、GitHub はアプリケーションに `rerequested` チェック実行イベントを送信します。 チェック実行が `rerequested` の場合、すべてのプロセスを開始し、新しいチェック実行を作成します。
-To include a condition for the `check_run` event in the `post '/event_handler'` route, add the following code under `case request.env['HTTP_X_GITHUB_EVENT']`:
+To include a condition for the event in the `post '/event_handler'` ルートに `check_run` イベントの条件を含めるには、`case request.env['HTTP_X_GITHUB_EVENT']` の下に次のコードを追加します。
``` ruby
when 'check_run'
@@ -222,13 +222,13 @@ when 'check_run'
end
```
-GitHub sends all events for `created` check runs to every app installed on a repository that has the necessary checks permissions. That means that your app will receive check runs created by other apps. A `created` check run is a little different from a `requested` or `rerequested` check suite, which GitHub sends only to apps that are being requested to run a check. The code above looks for the check run's application ID. This filters out all check runs for other apps on the repository.
+GitHub は `created` チェック実行のすべてのイベントを、必要なチェック権限を持つリポジトリにインストールされたあらゆるアプリケーションに送信します。 これはつまり、あなたのアプリケーションが他のアプリケーションにより作成されたチェック実行を受信するということです。 `created` チェック実行は、チェックを要求されているアプリケーションのみに GitHub が送信する `requested` や `rerequested` チェックスイートとは少し違います。 上記のコードは、チェック実行のアプリケーション ID を待ち受けます。 リポジトリの他のアプリケーションに対するチェック実行はすべて遮断されます。
-Next you'll write the `initiate_check_run` method, which is where you'll update the check run status and prepare to kick off your CI test.
+次に `initiate_check_run` メソッドを書きます。これは、チェック実行のステータスを更新し、CI テストの開始を準備するものです。
-In this section, you're not going to kick off the CI test yet, but you'll walk through how to update the status of the check run from `queued` to `pending` and then from `pending` to `completed` to see the overall flow of a check run. In "[Part 2: Creating the Octo RuboCop CI test](#part-2-creating-the-octo-rubocop-ci-test)," you'll add the code that actually performs the CI test.
+このセクションでは、まだ CI テストは開始しません。その代わり、チェック実行のステータスを `queued` から `pending` に、そしてその後 `pending` から `completed` に更新する手順を確認し、チェック実行のフロー全体を確認します。 「[パート2: Octo RuboCop CI テストを作成する](#part-2-creating-the-octo-rubocop-ci-test)」では、CI テストを実際に実行するコードを追加します。
-Let's create the `initiate_check_run` method and update the status of the check run. Add the following code to the helpers section:
+`initiate_check_run` メソッドを作成し、チェック実行のステータスを更新しましょう。 以下のコードを helpers セクションに追加します。
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %}
``` ruby
@@ -305,53 +305,53 @@ end
```
{% endif %}
-The code above calls the "[Update a check run](/v3/checks/runs/#update-a-check-run)" API endpoint using the generic [`patch` HTTP method](http://octokit.github.io/octokit.rb/Octokit/Connection.html#patch-instance_method) to update the check run that you already created.
+上記のコードは、ジェネリックな [`patch` HTTP method](http://octokit.github.io/octokit.rb/Octokit/Connection.html#patch-instance_method)メソッドを使用して「[チェック実行を更新する](/v3/checks/runs/#update-a-check-run)」API エンドポイントを呼び出し、既に作成したチェック実行を更新します。
-Here's what this code is doing. First, it updates the check run's status to `in_progress` and sets the `started_at` time to the current time. In [Part 2](#part-2-creating-the-octo-rubocop-ci-test) of this quickstart, you'll add code that kicks off a real CI test under `***** RUN A CI TEST *****`. For now, you'll leave that section as a placeholder, so the code that follows it will just simulate that the CI process succeeds and all tests pass. Finally, the code updates the status of the check run again to `completed`.
+このコードがしていることを説明しましょう。 まず、チェック実行のステータスを `in_progress` に更新し、`started_at` の時刻を現在の時刻に設定します。 このクイックスタートの[パート 2](#part-2-creating-the-octo-rubocop-ci-test)では、実際の CI テストを開始するコードを `***** RUN A CI TEST *****` の下に追加します。 今はこのセクションをプレースホルダーとして残しておきましょう。そうすると、続くコードが CI のプロセスを成功させ、すべてのテストに合格したことをシミュレートすることになります。 最後に、コードはチェック実行のステータスを再び `completed` に更新します。
-You'll notice in the "[Update a check run](/v3/checks/runs/#update-a-check-run)" docs that when you provide a status of `completed`, the `conclusion` and `completed_at` parameters are required. The `conclusion` summarizes the outcome of a check run and can be `success`, `failure`, `neutral`, `cancelled`, `timed_out`, or `action_required`. You'll set the conclusion to `success`, the `completed_at` time to the current time, and the status to `completed`.
+「[チェック実行を更新する](/v3/checks/runs/#update-a-check-run)」 ドキュメントに、`completed` のステータスを指定すると、`conclusion` と `completed_at` のパラメータが必須となることが書かれています。 `conclusion` はチェック実行の結果を要約するもので、`success`、`failure`、`neutral`、`cancelled`、`timed_out`、`action_required` のいずれかになります。 この結果 (conclusion) は `success` に、`completed_at` の時刻は現在の時刻に、ステータスは `completed` に設定します。
-You could also provide more details about what your check is doing, but you'll get to that in the next section. Let's test this code again by re-running `template_server.rb`:
+チェックが行っていることについてより詳しく指定することもできますが、それは次のセクションで行うことにします。 では、`template_server.rb` を実行して、このコードを再びテストしましょう。
```shell
$ ruby template_server.rb
```
-Head over to your open pull request and click the **Checks** tab. Click the "Re-run all" button in the upper left corner. You should see the check run move from `pending` to `in_progress` and end with `success`:
+開いたプルリクエストに移動し、[**Checks**] タブをクリックします。 左上隅にある [Re-run all] ボタンをクリックしてください。 チェック実行が `pending` から `in_progress` に移動し、`success` で終わることが確認できるはずです。

### パート2. Octo RuboCop CI テストを作成する
-[RuboCop](https://rubocop.readthedocs.io/en/latest/) is a Ruby code linter and formatter. It checks Ruby code to ensure that it complies with the "[Ruby Style Guide](https://github.com/rubocop-hq/ruby-style-guide)." RuboCop has three primary functions:
+[RuboCop](https://rubocop.readthedocs.io/en/latest/) は Ruby のコード文法チェッカーおよびフォーマッタです。 Ruby のコードが「[Ruby スタイルガイド](https://github.com/rubocop-hq/ruby-style-guide)」に準拠するようチェックします。 RuboCop の主な機能は、以下の 3 つです。
-* Linting to check code style
-* Code formatting
+* コードのスタイルを確認する文法チェック
+* コードの整形
* Replaces the native Ruby linting capabilities using `ruby -w`
-Now that you've got the interface created to receive Checks API events and create check runs, you can create a check run that implements a CI test.
+さて、Checks API を受信し、チェック実行を作成するために作ったインターフェースができあがったところで、今度は CI テストを実装するチェック実行を作成しましょう。
-Your app will run RuboCop on the CI server and create check runs (CI tests in this case) that report the results that RuboCop reports to GitHub.
+あなたのアプリケーションは CI サーバー上の RuboCop で実行され、結果を RuboCop が GitHub に報告するチェック実行 (ここでは CI テスト) を作成します。
-The Checks API allows you to report rich details about each check run, including statuses, images, summaries, annotations, and requested actions.
+Checks API を使用すると、ステータス、画像、要約、アノテーション、リクエストされたアクションなどの、各チェック実行の詳細情報を報告できます。
-Annotations are information about specific lines of code in a repository. An annotation allows you to pinpoint and visualize the exact parts of the code you'd like to show additional information for. That information can be anything: for example, a comment, an error, or a warning. This quickstart uses annotations to visualize RuboCop errors.
+アノテーションとは、リポジトリのコードの特定の行についての情報です。 アノテーションを使用すると、追加情報を表示したいコードの部分を細かく指定して、それを視覚化できます。 この情報は、たとえばコメント、エラー、警告など何でも構いません。 このクイックスタートでは、RuboCop のエラーを視覚化するためにアノテーションを使用します。
-To take advantage of requested actions, app developers can create buttons in the **Checks** tab of pull requests. When someone clicks one of these buttons, the click sends a `requested_action` `check_run` event to the GitHub App. The action that the app takes is completely configurable by the app developer. This quickstart will walk you through adding a button that allows users to request that RuboCop fix the errors it finds. RuboCop supports automatically fixing errors using a command-line option, and you'll configure the `requested_action` to take advantage of this option.
+リクエストされたアクションを利用るため、アプリケーション開発者はプルリクエストの [**Checks**] タブにボタンを作成できます。 このボタンがクリックされると、そのクリックにより GitHub App に `requested_action` `check_run` イベントが送信されます。 アプリケーションが行うアクションは、アプリケーション開発者が自由に設定できます。 このクイックスタートでは、RuboCop が見つけたエラーを修正するようユーザがリクエストするためのボタンを追加する方法について説明します。 RuboCop はコマンドラインオプションによるエラーの自動的な修正をサポートしており、ここでは `requested_action` を設定して、このオプションを使用できるようにします。
-Let's get started! These are the steps you'll complete in this section:
+さあ、始めましょう! このセクションでは、以下のステップを完了させます。
-1. [Adding a Ruby file](#step-21-adding-a-ruby-file)
-1. [Cloning the repository](#step-22-cloning-the-repository)
-1. [Running RuboCop](#step-23-running-rubocop)
-1. [Collecting RuboCop errors](#step-24-collecting-rubocop-errors)
-1. [Updating the check run with CI test results](#step-25-updating-the-check-run-with-ci-test-results)
-1. [Automatically fixing RuboCop errors](#step-26-automatically-fixing-rubocop-errors)
-1. [Security tips](#step-27-security-tips)
+1. [Ruby ファイルを追加する](#step-21-adding-a-ruby-file)
+1. [リポジトリをクローンする](#step-22-cloning-the-repository)
+1. [RuboCop を実行する](#step-23-running-rubocop)
+1. [RuboCop のエラーを収集する](#step-24-collecting-rubocop-errors)
+1. [CI テスト結果でチェック実行を更新する](#step-25-updating-the-check-run-with-ci-test-results)
+1. [RuboCop のエラーを自動的に修正する](#step-26-automatically-fixing-rubocop-errors)
+1. [セキュリティのヒント](#step-27-security-tips)
-### ステップ 2.1. Adding a Ruby file
+### ステップ 2.1. Ruby ファイルを追加する
-You can pass specific files or entire directories for RuboCop to check. In this quickstart, you'll run RuboCop on an entire directory. Because RuboCop only checks Ruby code, you'll want at least one Ruby file in your repository that contains errors. The example file provided below contains a few errors. Add this example Ruby file to the repository where your app is installed (make sure to name the file with an `.rb` extension, as in `myfile.rb`):
+RuboCop がチェックするため、特定のファイルまたはディレクトリ全体を渡すことができます。 このクイックスタートでは、ディレクトリ全体で RuboCop を実行します。 RuboCop がチェックするのは Ruby のコードのみなので、エラーが含まれる Ruby ファイルをリポジトリ内に最低 1 つ置くとよいでしょう。 以下に示すサンプルのファイルには、いくつかのエラーが含まれています。 Add this example Ruby file to the repository where your app is installed (make sure to name the file with an `.rb` extension, as in `myfile.rb`):
```ruby
# The Octocat class tells you about different breeds of Octocat
@@ -373,7 +373,7 @@ m = Octocat.new("Mona", "cat", "octopus")
m.display
```
-### ステップ 2.2. Cloning the repository
+### ステップ 2.2. リポジトリをクローンする
RuboCop is available as a command-line utility. That means your GitHub App will need to clone a local copy of the repository on the CI server so RuboCop can parse the files. To run Git operations in your Ruby app, you can use the [ruby-git](https://github.com/ruby-git/ruby-git) gem.
@@ -383,9 +383,9 @@ The `Gemfile` in the `building-a-checks-api-ci-server` repository already includ
require 'git'
```
-Your app needs read permission for "Repository contents" to clone a repository. Later in this quickstart, you'll need to push contents to GitHub, which requires write permission. Go ahead and set your app's "Repository contents" permission to **Read & write** now so you don't need to update it again later. To update your app's permissions:
+Your app needs read permission for "Repository contents" to clone a repository. Later in this quickstart, you'll need to push contents to GitHub, which requires write permission. Go ahead and set your app's "Repository contents" permission to **Read & write** now so you don't need to update it again later. アプリケーションの権限を更新するには、以下の手順に従います。
-1. Select your app from the [app settings page](https://github.com/settings/apps) and click **Permissions & Webhooks** in the sidebar.
+1. [アプリケーションの設定ページ](https://github.com/settings/apps)からアプリケーションを選択肢、サイドバーの [**Permissions & Webhooks**] をクリックします。
1. In the "Permissions" section, find "Repository contents", and select **Read & write** in the "Access" dropdown next to it.
{% data reusables.apps.accept_new_permissions_steps %}
@@ -433,7 +433,7 @@ clone_repository(full_repo_name, repository, head_sha)
The code above gets the full repository name and the head SHA of the commit from the `check_run` webhook payload.
-### ステップ 2.3. Running RuboCop
+### ステップ 2.3. RuboCop を実行する
これでうまくいきました。 You're cloning the repository and creating check runs using your CI server. Now you'll get into the nitty gritty details of the [RuboCop linter](https://rubocop.readthedocs.io/en/latest/basic_usage/#rubocop-as-a-code-style-checker) and [Checks API annotations](/v3/checks/runs/#create-a-check-run).
@@ -519,7 +519,7 @@ You should see the linting errors in the debug output, although they aren't prin
}
```
-### ステップ 2.4. Collecting RuboCop errors
+### ステップ 2.4. RuboCop のエラーを収集する
The `@output` variable contains the parsed JSON results of the RuboCop report. As shown above, the results contain a `summary` section that your code can use to quickly determine if there are any errors. The following code will set the check run conclusion to `success` when there are no reported errors. RuboCop reports errors for each file in the `files` array, so if there are errors, you'll need to extract some data from the file object.
@@ -594,7 +594,7 @@ This code also iterates through each error in the `offenses` array and collects
This code doesn't yet create an annotation for the check run. You'll add that code in the next section.
-### ステップ 2.5. Updating the check run with CI test results
+### ステップ 2.5. CI テスト結果でチェック実行を更新する
Each check run from GitHub contains an `output` object that includes a `title`, `summary`, `text`, `annotations`, and `images`. The `summary` and `title` are the only required parameters for the `output`, but those alone don't offer much detail, so this quickstart adds `text` and `annotations` too. The code here doesn't add an image, but feel free to add one if you'd like!
@@ -714,7 +714,7 @@ If the annotations are related to a file already included in the PR, the annotat

-### ステップ 2.6. Automatically fixing RuboCop errors
+### ステップ 2.6. RuboCop のエラーを自動的に修正する
If you've made it this far, kudos! 👏 You've already created a CI test. In this section, you'll add one more feature that uses RuboCop to automatically fix the errors it finds. You already added the "Fix this" button in the [previous section](#step-25-updating-the-check-run-with-ci-test-results). Now you'll add the code to handle the `requested_action` check run event triggered when someone clicks the "Fix this" button.
@@ -814,7 +814,7 @@ Because a new commit was pushed to the repo, you'll see a new check suite for Oc
You can find the completed code for the app you just built in the `server.rb` file in the [Creating CI tests with the Checks API](https://github.com/github-developer/creating-ci-tests-with-the-checks-api) repository.
-### ステップ 2.7. Security tips
+### ステップ 2.7. セキュリティのヒント
The template GitHub App code already has a method to verify incoming webhook payloads to ensure they are from a trusted source. If you are not validating webhook payloads, you'll need to ensure that when repository names are included in the webhook payload, the webhook does not contain arbitrary commands that could be used maliciously. The code below validates that the repository name only contains Latin alphabetic characters, hyphens, and underscores. To provide you with a complete example, the complete `server.rb` code available in the [companion repository](https://github.com/github-developer/creating-ci-tests-with-the-checks-api) for this quickstart includes both the method of validating incoming webhook payloads and this check to verify the repository name.
@@ -836,7 +836,7 @@ Here are a few common problems and some suggested solutions. If you run into any
* **Q:** My app isn't pushing code to GitHub. I don't see the fixes that RuboCop automatically makes!
- **A:** Make sure you have **Read & write** permissions for "Repository contents," and that you are cloning the repository with your intallation token. See [Step 2.2. Cloning the repository](#step-22-cloning-the-repository) for details.
+ **A:** Make sure you have **Read & write** permissions for "Repository contents," and that you are cloning the repository with your installation token. See [Step 2.2. Cloning the repository](#step-22-cloning-the-repository) for details.
* **Q:** I see an error in the `template_server.rb` debug output related to cloning my repository.
diff --git a/translations/ja-JP/content/developers/apps/deleting-a-github-app.md b/translations/ja-JP/content/developers/apps/deleting-a-github-app.md
index e845399f14..f60b5be4c0 100644
--- a/translations/ja-JP/content/developers/apps/deleting-a-github-app.md
+++ b/translations/ja-JP/content/developers/apps/deleting-a-github-app.md
@@ -1,5 +1,5 @@
---
-title: Deleting a GitHub App
+title: GitHub App を削除する。
intro: '{% data reusables.shortdesc.deleting_github_apps %}'
redirect_from:
- /apps/building-integrations/managing-github-apps/deleting-a-github-app/
@@ -13,8 +13,8 @@ versions:
{% data reusables.user-settings.access_settings %}
{% data reusables.user-settings.developer_settings %}
{% data reusables.user-settings.github_apps %}
-4. Select the GitHub App you want to delete. 
+4. 削除する GitHub App を選択します。 
{% data reusables.user-settings.github_apps_advanced %}
-6. Click **Delete GitHub App**. 
-7. Type the name of the GitHub App to confirm you want to delete it. 
-8. Click **I understand the consequences, delete this GitHub App**. 
+6. [**Delete GitHub App**] をクリックします。 
+7. 削除する GitHub App の名前を入力して、削除を確認します。 
+8. [**I understand the consequences, delete this GitHub App**] をクリックします。 
diff --git a/translations/ja-JP/content/developers/apps/deleting-an-oauth-app.md b/translations/ja-JP/content/developers/apps/deleting-an-oauth-app.md
index a31cc01776..ff65cf31bf 100644
--- a/translations/ja-JP/content/developers/apps/deleting-an-oauth-app.md
+++ b/translations/ja-JP/content/developers/apps/deleting-an-oauth-app.md
@@ -1,5 +1,5 @@
---
-title: Deleting an OAuth App
+title: OAuth App を削除する
intro: '{% data reusables.shortdesc.deleting_oauth_apps %}'
redirect_from:
- /apps/building-integrations/managing-oauth-apps/deleting-an-oauth-app/
@@ -13,6 +13,6 @@ versions:
{% data reusables.user-settings.access_settings %}
{% data reusables.user-settings.developer_settings %}
{% data reusables.user-settings.oauth_apps %}
-4. Select the {% data variables.product.prodname_oauth_app %} you want to modify. 
-5. Click **Delete application**. 
-6. Click **Delete this OAuth Application**. 
+4. 変更する {% data variables.product.prodname_oauth_app %} を選択します。 
+5. [**Delete application**] をクリックします。 
+6. [**Delete this OAuth Application**] をクリックします。 
diff --git a/translations/ja-JP/content/developers/apps/differences-between-github-apps-and-oauth-apps.md b/translations/ja-JP/content/developers/apps/differences-between-github-apps-and-oauth-apps.md
index 044bb5ce95..7cb1f10a2b 100644
--- a/translations/ja-JP/content/developers/apps/differences-between-github-apps-and-oauth-apps.md
+++ b/translations/ja-JP/content/developers/apps/differences-between-github-apps-and-oauth-apps.md
@@ -1,5 +1,5 @@
---
-title: Differences between GitHub Apps and OAuth Apps
+title: GitHub App と OAuth App の違い
intro: 'Understanding the differences between {% data variables.product.prodname_github_app %}s and {% data variables.product.prodname_oauth_app %}s will help you decide which app you want to create. An {% data variables.product.prodname_oauth_app %} acts as a GitHub user, whereas a {% data variables.product.prodname_github_app %} uses its own identity when installed on an organization or on repositories within an organization.'
redirect_from:
- /early-access/integrations/integrations-vs-oauth-applications/
diff --git a/translations/ja-JP/content/developers/apps/editing-a-github-apps-permissions.md b/translations/ja-JP/content/developers/apps/editing-a-github-apps-permissions.md
index a1af9a5404..f2d30396e3 100644
--- a/translations/ja-JP/content/developers/apps/editing-a-github-apps-permissions.md
+++ b/translations/ja-JP/content/developers/apps/editing-a-github-apps-permissions.md
@@ -19,7 +19,7 @@ versions:
{% data reusables.user-settings.access_settings %}
{% data reusables.user-settings.developer_settings %}
{% data reusables.user-settings.github_apps %}
-4. Select the GitHub App whose permissions you want to change. 
+4. Select the GitHub App whose permissions you want to change. 
5. 左サイドバーで、[**Permissions & webhooks**] をクリックします。 
6. Modify the permissions you'd like to change. For each type of permission, select either "Read-only", "Read & write", or "No access" from the dropdown. 
7. In "Subscribe to events", select any events to which you'd like to subscribe your app. 
diff --git a/translations/ja-JP/content/developers/apps/getting-started-with-apps.md b/translations/ja-JP/content/developers/apps/getting-started-with-apps.md
index d6bc3d7a0f..e2e2225a23 100644
--- a/translations/ja-JP/content/developers/apps/getting-started-with-apps.md
+++ b/translations/ja-JP/content/developers/apps/getting-started-with-apps.md
@@ -1,6 +1,6 @@
---
-title: Getting started with apps
-intro: Learn about building apps and setting up your development environment.
+title: アプリケーションに取りかかる
+intro: アプリケーションの構築や、解決環境の設定について学びます。
mapTopic: true
versions:
free-pro-team: '*'
diff --git a/translations/ja-JP/content/developers/apps/guides.md b/translations/ja-JP/content/developers/apps/guides.md
index 93d1806b82..b697da04a8 100644
--- a/translations/ja-JP/content/developers/apps/guides.md
+++ b/translations/ja-JP/content/developers/apps/guides.md
@@ -1,6 +1,6 @@
---
title: ガイド
-intro: 'Learn about using the {% data variables.product.prodname_dotcom %} API with your app, continuous integration, and how to build with apps.'
+intro: '{% data variables.product.prodname_dotcom %} API をアプリケーション、継続的インテグレーションで使用する方法と、アプリケーションの構築方法について学びます。'
mapTopic: true
redirect_from:
- /apps/quickstart-guides
diff --git a/translations/ja-JP/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md b/translations/ja-JP/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
index caf5cb2e4b..8c79d44673 100644
--- a/translations/ja-JP/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
+++ b/translations/ja-JP/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
@@ -662,7 +662,7 @@ While most of your API interaction should occur using your server-to-server inst
* [Create commit signature protection](/v3/repos/branches/#create-commit-signature-protection)
* [Delete commit signature protection](/v3/repos/branches/#delete-commit-signature-protection)
* [Get status checks protection](/v3/repos/branches/#get-status-checks-protection)
-* [Update status check potection](/v3/repos/branches/#update-status-check-potection)
+* [Update status check protection](/v3/repos/branches/#update-status-check-protection)
* [Remove status check protection](/v3/repos/branches/#remove-status-check-protection)
* [Get all status check contexts](/v3/repos/branches/#get-all-status-check-contexts)
* [Add status check contexts](/v3/repos/branches/#add-status-check-contexts)
diff --git a/translations/ja-JP/content/developers/apps/making-a-github-app-public-or-private.md b/translations/ja-JP/content/developers/apps/making-a-github-app-public-or-private.md
index bf01890758..3d32c8b321 100644
--- a/translations/ja-JP/content/developers/apps/making-a-github-app-public-or-private.md
+++ b/translations/ja-JP/content/developers/apps/making-a-github-app-public-or-private.md
@@ -30,7 +30,7 @@ To change who can install the GitHub App:
{% data reusables.user-settings.access_settings %}
{% data reusables.user-settings.developer_settings %}
{% data reusables.user-settings.github_apps %}
-3. Select the GitHub App whose installation option you want to change. 
+3. Select the GitHub App whose installation option you want to change. 
{% data reusables.user-settings.github_apps_advanced %}
5. Depending on the installation option of your GitHub App, click either **Make public** or **Make internal**. 
6. Depending on the installation option of your GitHub App, click either **Yes, make this GitHub App public** or **Yes, make this GitHub App internal**. 
diff --git a/translations/ja-JP/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md b/translations/ja-JP/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md
index 31c8f2d70f..c2d8321ed8 100644
--- a/translations/ja-JP/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md
+++ b/translations/ja-JP/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md
@@ -262,7 +262,7 @@ Before you can use the Octokit.rb library to make API calls, you'll need to init
# Instantiate an Octokit client authenticated as a GitHub App.
# GitHub App authentication requires that you construct a
# JWT (https://jwt.io/introduction/) signed with the app's private key,
-# so GitHub can be sure that it came from the app an not altererd by
+# so GitHub can be sure that it came from the app an not altered by
# a malicious third party.
def authenticate_app
payload = {
diff --git a/translations/ja-JP/content/developers/apps/suspending-a-github-app-installation.md b/translations/ja-JP/content/developers/apps/suspending-a-github-app-installation.md
index 1bb9ceeee0..962e058f9b 100644
--- a/translations/ja-JP/content/developers/apps/suspending-a-github-app-installation.md
+++ b/translations/ja-JP/content/developers/apps/suspending-a-github-app-installation.md
@@ -25,6 +25,6 @@ People who have installed a GitHub App, also called installation owners, can onl
{% data reusables.user-settings.developer_settings %}
{% data reusables.user-settings.github_apps %}
4. {% data variables.product.prodname_github_app %} you want to suspend.
-
+
{% data reusables.user-settings.github_apps_advanced %}
6. Next to the suspension settings for the installation, click **Suspend** or **Unsuspend**. 
diff --git a/translations/ja-JP/content/developers/apps/transferring-ownership-of-a-github-app.md b/translations/ja-JP/content/developers/apps/transferring-ownership-of-a-github-app.md
index ea865da97c..7ed06990bb 100644
--- a/translations/ja-JP/content/developers/apps/transferring-ownership-of-a-github-app.md
+++ b/translations/ja-JP/content/developers/apps/transferring-ownership-of-a-github-app.md
@@ -13,7 +13,7 @@ versions:
{% data reusables.user-settings.access_settings %}
{% data reusables.user-settings.developer_settings %}
{% data reusables.user-settings.github_apps %}
-4. Select the GitHub App whose ownership you want to transfer. 
+4. Select the GitHub App whose ownership you want to transfer. 
{% data reusables.user-settings.github_apps_advanced %}
6. Click **Transfer ownership**. 
7. Type the name of the GitHub App you want to transfer. 
diff --git a/translations/ja-JP/content/developers/apps/transferring-ownership-of-an-oauth-app.md b/translations/ja-JP/content/developers/apps/transferring-ownership-of-an-oauth-app.md
index 4f1cdbe512..27618d6675 100644
--- a/translations/ja-JP/content/developers/apps/transferring-ownership-of-an-oauth-app.md
+++ b/translations/ja-JP/content/developers/apps/transferring-ownership-of-an-oauth-app.md
@@ -13,7 +13,7 @@ versions:
{% data reusables.user-settings.access_settings %}
{% data reusables.user-settings.developer_settings %}
{% data reusables.user-settings.oauth_apps %}
-4. Select the {% data variables.product.prodname_oauth_app %} you want to modify. 
+4. 変更する {% data variables.product.prodname_oauth_app %} を選択します。 
5. Click **Transfer ownership**. 
6. Type the name of the {% data variables.product.prodname_oauth_app %} you want to transfer. 
7. Type the name of the user or organization you want to transfer the {% data variables.product.prodname_oauth_app %} to. 
diff --git a/translations/ja-JP/content/developers/apps/using-the-github-api-in-your-app.md b/translations/ja-JP/content/developers/apps/using-the-github-api-in-your-app.md
index 0c9001aa6a..5d8116f1ff 100644
--- a/translations/ja-JP/content/developers/apps/using-the-github-api-in-your-app.md
+++ b/translations/ja-JP/content/developers/apps/using-the-github-api-in-your-app.md
@@ -43,7 +43,7 @@ Before you begin, you'll need to do the following:
$ git clone https://github.com/github-developer/using-the-github-api-in-your-app.git
```
- Inside the directory, you'll find a `template_server.rb` file with the template code you'll use in this quickstart and a `server.rb` file with the completed project code.
+ ディレクトリの中には、このクイックスタートで使用する `template_server.rb` ファイルと、完成したプロジェクトコードである `server.rb` ファイルがあります。
1. Follow the steps in the [Setting up your development environment](/apps/quickstart-guides/setting-up-your-development-environment/) quickstart to configure and run the `template_server.rb` app server. If you've previously completed a GitHub App quickstart other than [Setting up your development environment](/apps/quickstart-guides/setting-up-your-development-environment/), you should register a _new_ GitHub App and start a new Smee channel to use with this quickstart.
@@ -76,22 +76,22 @@ These are the steps you'll complete to create your first GitHub App:
When you [first registered your app](/apps/quickstart-guides/setting-up-your-development-environment/#step-2-register-a-new-github-app), you accepted the default permissions, which means your app doesn't have access to most resources. For this example, your app will need permission to read issues and write labels.
-To update your app's permissions:
+アプリケーションの権限を更新するには、以下の手順に従います。
-1. Select your app from the [app settings page](https://github.com/settings/apps) and click **Permissions & Webhooks** in the sidebar.
+1. [アプリケーションの設定ページ](https://github.com/settings/apps)からアプリケーションを選択肢、サイドバーの [**Permissions & Webhooks**] をクリックします。
1. In the "Permissions" section, find "Issues," and select **Read & Write** in the "Access" dropdown next to it. The description says this option grants access to both issues and labels, which is just what you need.
1. In the "Subscribe to events" section, select **Issues** to subscribe to the event.
{% data reusables.apps.accept_new_permissions_steps %}
-これでうまくいきました。 Your app has permission to do the tasks you want it to do. Now you can add the code to make it work.
+これでうまくいきました。 アプリケーションは必要なタスクを実行する権限を所有しています。 Now you can add the code to make it work.
### ステップ 2. Add event handling
The first thing your app needs to do is listen for new issues that are opened. Now that you've subscribed to the **Issues** event, you'll start receiving the [`issues`](/webhooks/event-payloads/#issues) webhook, which is triggered when certain issue-related actions occur. You can filter this event type for the specific action you want in your code.
-GitHub sends webhook payloads as `POST` requests. Because you forwarded your Smee webhook payloads to `http://localhost/event_handler:3000`, your server will receive the `POST` request payloads in the `post '/event_handler'` route.
+GitHub は webhook ペイロードを `POST` リクエストとして送信します。 Because you forwarded your Smee webhook payloads to `http://localhost/event_handler:3000`, your server will receive the `POST` request payloads in the `post '/event_handler'` route.
-An empty `post '/event_handler'` route is already included in the `template_server.rb` file, which you downloaded in the [prerequisites](#prerequisites) section. The empty route looks like this:
+空の `post '/event_handler'` ルートは、[必要な環境](#prerequisites)セクションでダウンロードした `template_server.rb` ファイルに既に含まれています。 空のルートは次のようになっています。
``` ruby
post '/event_handler' do
@@ -115,7 +115,7 @@ when 'issues'
end
```
-Every event that GitHub sends includes a request header called `HTTP_X_GITHUB_EVENT`, which indicates the type of event in the `POST` request. Right now, you're only interested in `issues` event types. Each event has an additional `action` field that indicates the type of action that triggered the events. For `issues`, the `action` field can be `assigned`, `unassigned`, `labeled`, `unlabeled`, `opened`, `edited`, `milestoned`, `demilestoned`, `closed`, or `reopened`.
+GitHub が送信する全てのイベントには、`HTTP_X_GITHUB_EVENT` というリクエストヘッダが含まれており、これは `POST` リクエストのイベントの型を示します。 Right now, you're only interested in `issues` event types. 各イベントには、アクションをトリガーしたイベントのタイプを示す `action` フィールドが付いています。 For `issues`, the `action` field can be `assigned`, `unassigned`, `labeled`, `unlabeled`, `opened`, `edited`, `milestoned`, `demilestoned`, `closed`, or `reopened`.
To test your event handler, try adding a temporary helper method. You'll update later when you [Add label handling](#step-4-add-label-handling). For now, add the following code inside the `helpers do` section of the code. You can put the new method above or below any of the other helper methods. Order doesn't matter.
diff --git a/translations/ja-JP/content/developers/github-marketplace/handling-plan-cancellations.md b/translations/ja-JP/content/developers/github-marketplace/handling-plan-cancellations.md
index 502e117917..3d7dc3242d 100644
--- a/translations/ja-JP/content/developers/github-marketplace/handling-plan-cancellations.md
+++ b/translations/ja-JP/content/developers/github-marketplace/handling-plan-cancellations.md
@@ -15,19 +15,19 @@ versions:
### ステップ 1. キャンセルイベント
-If a customer chooses to cancel a {% data variables.product.prodname_marketplace %} order, GitHub sends a [`marketplace_purchase`](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/) webhook with the action `cancelled` to your app when the cancellation takes effect. If the customer cancels during a free trial, your app will receive the event immediately. When a customer cancels a paid plan, the cancellation will occur at the end of the customer's billing cycle.
+顧客が{% data variables.product.prodname_marketplace %}の注文をキャンセルすることにした場合、GitHubは[`marketplace_purchase`](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/) webhookを`cancelled`というアクション付きで、キャンセルが有効になった時点でアプリケーションに送信します。 顧客が無料トライアル中にキャンセルした場合、アプリケーションはすぐにこのイベントを受け取ります。 顧客が有料プランをキャンセルした場合、キャンセルは顧客の支払いサイクルの終了時に行われます。
-### ステップ 2. Deactivating customer accounts
+### ステップ 2. 顧客のアカウントのアクティベーション解除
-When a customer cancels a free or paid plan, your app must perform these steps to complete cancellation:
+顧客が無料もしくは有料のプランをキャンセルした場合、アプリケーションはキャンセルを完了するために以下のステップを実行しなければなりません。
-1. Deactivate the account of the customer who cancelled their plan.
-1. Revoke the OAuth token your app received for the customer.
-1. If your app is an OAuth App, remove all webhooks your app created for repositories.
-1. Remove all customer data within 30 days of receiving the `cancelled` event.
+1. プランをキャンセルした顧客のアカウントのアクティベーションを解除する。
+1. 顧客用にアプリケーションが受け取ったOAuthトークンを取り消す。
+1. アプリケーションがOAuthアプリケーションの場合、リポジトリ用にアプリケーションが作成したすべてのwebhookを削除する。
+1. `cancelled`イベントを受け取ってから30日以内に顧客のすべてのデータを削除する。
{% note %}
-**Note:** We recommend using the [`marketplace_purchase`](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/) webhook's `effective_date` to determine when a plan change will occur and periodically synchronizing the [List accounts for a plan](/v3/apps/marketplace/#list-accounts-for-a-plan). For more information on webhooks, see "[{% data variables.product.prodname_marketplace %} webhook events](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/)."
+**ノート:** プランの変更がいつ生じるのかを知るために[`marketplace_purchase`](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/) webhookの`effective_date`を利用し、定期的に[プランのリストアカウント](/v3/apps/marketplace/#list-accounts-for-a-plan)を同期することをおすすめします。 webhookに関する詳しい情報については「[{% data variables.product.prodname_marketplace %}のwebhookイベント](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/)」を参照してください。
{% endnote %}
diff --git a/translations/ja-JP/content/developers/github-marketplace/handling-plan-changes.md b/translations/ja-JP/content/developers/github-marketplace/handling-plan-changes.md
index 0f3d2dd67e..8b20394f2f 100644
--- a/translations/ja-JP/content/developers/github-marketplace/handling-plan-changes.md
+++ b/translations/ja-JP/content/developers/github-marketplace/handling-plan-changes.md
@@ -1,9 +1,9 @@
---
-title: Handling plan changes
-intro: 'Upgrading or downgrading a {% data variables.product.prodname_marketplace %} app triggers the [`marketplace_purchase` event](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/) webhook with the `changed` action, which kicks off the upgrade or downgrade flow.'
+title: プラン変更の処理
+intro: '{% data variables.product.prodname_marketplace %} アプリケーションのアップグレードあるいはダウングレードによって、[`marketplace_purchase` イベント](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/) webhookが`changed`アクション付きでトリガされ、それによってアップグレードあるいはダウングレードのフローが開始されます。'
redirect_from:
- /apps/marketplace/administering-listing-plans-and-user-accounts/upgrading-or-downgrading-plans/
- - /apps/marketplace/integrating-with-the-github-marketplace-api/upgrading-and-downgrading-plans/
+ - /apps/marketplace/administering-listing-plans-and-user-accounts/upgrading-or-downgrading-plans/
- /marketplace/integrating-with-the-github-marketplace-api/upgrading-and-downgrading-plans
versions:
free-pro-team: '*'
@@ -11,54 +11,54 @@ versions:
-For more information about upgrading and downgrading as it relates to billing, see "[Integrating with the {% data variables.product.prodname_marketplace %} API](/marketplace/integrating-with-the-github-marketplace-api/)."
+支払いに関連するアップグレード及びダウングレードに関する詳しい説明については「[{% data variables.product.prodname_marketplace %} APIとのインテグレーション](/marketplace/integrating-with-the-github-marketplace-api/)」を参照してください。
-### ステップ 1. Pricing plan change event
+### ステップ 1. 料金プランの変更イベント
-GitHub send the `marketplace_purchase` webhook with the `changed` action to your app, when a customer makes any of these changes to their {% data variables.product.prodname_marketplace %} order:
-* Upgrades to a more expensive pricing plan or downgrades to a lower priced plan.
-* Adds or removes seats to their existing plan.
-* Changes the billing cycle.
+顧客が{% data variables.product.prodname_marketplace %}の注文に対して以下のいずれかの変更を行うと、GitHubは`marketplace_purchase` webhookを`changed`アクション付きでアプリケーションに送信します。
+* より高価な価格プランへのアップグレードあるいは低価格なプランへのダウングレード
+* 既存のプランへのシートの追加あるいはシートの削除
+* 支払いサイクルの変更
-GitHub will send the webhook when the change takes effect. For example, when a customer downgrades a plan, GitHub sends the webhook at the end of the customer's billing cycle. GitHub sends a webhook to your app immediately when a customer upgrades their plan to allow them access to the new service right away. If a customer switches from a monthly to a yearly billing cycle, it's considered an upgrade. See "[Billing customers in {% data variables.product.prodname_marketplace %}](/marketplace/selling-your-app/billing-customers-in-github-marketplace/)" to learn more about what actions are considered an upgrade or downgrade.
+GitHubは、変更が有効になるとwebhookを送信します。 たとえば、顧客がプランをダウングレードすると、その顧客の支払いサイクルの終了時点でwebhookを送信します。 顧客がプランをアップグレードした場合には、新しいサービスをすぐに利用できるようにするため、GitHubは即座にアプリケーションにwebhookを送信します。 顧客が支払いサイクルを月次から年次に切り替えた場合は、アップグレードと見なされます。 どういったアクションがアップグレードやダウングレードと見なされるかを詳しく学ぶには、「[{% data variables.product.prodname_marketplace %}での顧客への課金](/marketplace/selling-your-app/billing-customers-in-github-marketplace/)」を参照してください。
-Read the `effective_date`, `marketplace_purchase`, and `previous_marketplace_purchase` from the `marketplace_purchase` webhook to update the plan's start date and make changes to the customer's billing cycle and pricing plan. `marketplace_purchase`イベントペイロードの例については「[{% data variables.product.prodname_marketplace %} webhookイベント](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/)」を参照してください。
+プランの開始日を更新し、顧客の支払いサイクルと価格プランを変更するために、`marketplace_purchase`から`effective_date`、`marketplace_purchase`、`previous_marketplace_purchase`を読み取ってください。 `marketplace_purchase`イベントペイロードの例については「[{% data variables.product.prodname_marketplace %} webhookイベント](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/)」を参照してください。
-If your app offers free trials, you'll receive the `marketplace_purchase` webhook with the `changed` action when the free trial expires. If the customer's free trial expires, upgrade the customer to the paid version of the free-trial plan.
+アプリケーションが無料トライアルを提供しているなら、無料トライアルの有効期限が切れると`marketplace_purchase` webhookを`changed`アクション付きで受け取ります。 顧客の無料トライアル期間が終了したら、その顧客を無料トライアルプランの有料バージョンにアップグレードしてください。
-### ステップ 2. Updating customer accounts
+### ステップ 2. 顧客アカウントの更新
-You'll need to update the customer's account information to reflect the billing cycle and pricing plan changes the customer made to their {% data variables.product.prodname_marketplace %} order. Display upgrades to the pricing plan, `seat_count` (for per-unit pricing plans), and billing cycle on your Marketplace app's website or your app's UI when you receive the `changed` action webhook.
+顧客が{% data variables.product.prodname_marketplace %}の注文に対して行った支払いサイクルや価格プランの変更を反映させるために、顧客のアカウント情報を更新しなければなりません。 `changed`アクションwebhookを受信した際に、MarketplaceアプリケーションのWebサイトか、アプリケーションのUIに、価格プラン、`seat_count`(ユニット単位の価格プランの場合)、支払いサイクルのアップグレードを表示してください。
-When a customer downgrades a plan, it's recommended to review whether a customer has exceeded their plan limits and engage with them directly in your UI or by reaching out to them by phone or email.
+顧客がプランをダウングレードした場合には、顧客がプランの制限を超えているかをレビューし、UIで直接関わるか、電話やメールで連絡することをおすすめします。
-To encourage people to upgrade you can display an upgrade URL in your app's UI. See "[About upgrade URLs](#about-upgrade-urls)" for more details.
+アップグレードを促すために、アップグレードのURLをアプリケーションのUIに表示できます。 詳細については「[アップグレードURLについて](#about-upgrade-urls)」を参照してください。
{% note %}
-**Note:** We recommend performing a periodic synchronization using `GET /marketplace_listing/plans/:id/accounts` to ensure your app has the correct plan, billing cycle information, and unit count (for per-unit pricing) for each account.
+**ノート:** `GET /marketplace_listing/plans/:id/accounts`を使って定期的に同期を行い、それぞれのアカウントに対してアプリケーションが正しいプラン、支払いサイクルの情報、ユニット数(ユニット単位の料金の場合)を保持していることを確認するようおすすめします。
{% endnote %}
-### Failed upgrade payments
+### アップグレードの支払いの失敗
{% data reusables.marketplace.marketplace-failed-purchase-event %}
-### About upgrade URLs
+### アップグレードURLについて
-You can redirect users from your app's UI to upgrade on GitHub using an upgrade URL:
+アップグレードURLを使い、ユーザをアプリケーションのUIからGitHub上でのアップグレードへリダイレクトできます。
```
https://www.github.com/marketplace//upgrade//
```
-For example, if you notice that a customer is on a 5 person plan and needs to move to a 10 person plan, you could display a button in your app's UI that says "Here's how to upgrade" or show a banner with a link to the upgrade URL. The upgrade URL takes the customer to your listing plan's upgrade confirmation page.
+たとえば、顧客が5人のプランを使っていて、10人のプランに移行する必要があることに気づいた場合、アプリケーションのUIに「アップグレードの方法はこちら」というボタンを表示したり、アップグレードURLへのリンクを持つバナーを表示したりできます。 アップグレードURLは顧客をリストされたプランのアップグレードの確認ページへ移動させます。
-Use the `LISTING_PLAN_NUMBER` for the plan the customer would like to purchase. When you create new pricing plans they receive a `LISTING_PLAN_NUMBER`, which is unique to each plan across your listing, and a `LISTING_PLAN_ID`, which is unique to each plan in the {% data variables.product.prodname_marketplace %}. You can find these numbers when you [List plans](/v3/apps/marketplace/#list-plans), which identifies your listing's pricing plans. Use the `LISTING_PLAN_ID` and the "[List accounts for a plan](/v3/apps/marketplace/#list-accounts-for-a-plan)" endpoint to get the `CUSTOMER_ACCOUNT_ID`.
+顧客が購入したいであろうプランの`LISTING_PLAN_NUMBER`を使ってください。 新しい価格プランを作成すると、それらにはリスト内で各プランに対してユニークな`LISTING_PLAN_NUMBER`と、{% data variables.product.prodname_marketplace %}内で各プランに対してユニークな`LISTING_PLAN_ID`が与えられます。 [プランをリスト](/v3/apps/marketplace/#list-plans)する際にはこれらの番号があり、リストの価格プランを特定できます。 `LISTING_PLAN_ID`と「[プランに対するアカウントのリスト](/v3/apps/marketplace/#list-accounts-for-a-plan)」エンドポイントを使って、`CUSTOMER_ACCOUNT_ID`を取得してください。
{% note %}
-**Note:** If your customer upgrades to additional units (such as seats), you can still send them to the appropriate plan for their purchase, but we are unable to support `unit_count` parameters at this time.
+**ノート:** 顧客が追加ユニット(シートなど)のアップグレードをした場合でも、顧客に購入に対する適切なプランを送信することはできますが、その時点で弊社は`unit_count`パラメータをサポートできません。
{% endnote %}
diff --git a/translations/ja-JP/content/developers/github-marketplace/index.md b/translations/ja-JP/content/developers/github-marketplace/index.md
index 34b9741c61..67402d4a74 100644
--- a/translations/ja-JP/content/developers/github-marketplace/index.md
+++ b/translations/ja-JP/content/developers/github-marketplace/index.md
@@ -1,6 +1,6 @@
---
title: GitHub Marketplace
-intro: 'List your tools in {% data variables.product.prodname_dotcom %} Marketplace for developers to use or purchase.'
+intro: '{% data variables.product.prodname_dotcom %} Marketplaceで開発者が利用したり購入したりできるように、ツールをリストしてください。'
redirect_from:
- /apps/adding-integrations/listing-apps-on-github-marketplace/about-github-marketplace/
- /apps/marketplace/
diff --git a/translations/ja-JP/content/developers/github-marketplace/listing-an-app-on-github-marketplace.md b/translations/ja-JP/content/developers/github-marketplace/listing-an-app-on-github-marketplace.md
index 58924a15d0..ee5b558623 100644
--- a/translations/ja-JP/content/developers/github-marketplace/listing-an-app-on-github-marketplace.md
+++ b/translations/ja-JP/content/developers/github-marketplace/listing-an-app-on-github-marketplace.md
@@ -1,6 +1,6 @@
---
-title: Listing an app on GitHub Marketplace
-intro: 'Learn about requirements and best practices for listing your app on {% data variables.product.prodname_marketplace %}.'
+title: GitHub Marketplace上でのアプリケーションのリスト
+intro: 'アプリケーションを{% data variables.product.prodname_marketplace %}上でリストする際の要件とベストプラクティスについて学んでください。'
mapTopic: true
redirect_from:
- /apps/adding-integrations/listing-apps-on-github-marketplace/
diff --git a/translations/ja-JP/content/developers/github-marketplace/pricing-plans-for-github-marketplace-apps.md b/translations/ja-JP/content/developers/github-marketplace/pricing-plans-for-github-marketplace-apps.md
index bb33fe004f..f0d7d1d4af 100644
--- a/translations/ja-JP/content/developers/github-marketplace/pricing-plans-for-github-marketplace-apps.md
+++ b/translations/ja-JP/content/developers/github-marketplace/pricing-plans-for-github-marketplace-apps.md
@@ -1,6 +1,6 @@
---
-title: Pricing plans for GitHub Marketplace apps
-intro: 'Pricing plans allow you to provide your app with different levels of service or resources. You can offer up to 10 pricing plans in your {% data variables.product.prodname_marketplace %} listing.'
+title: GitHub Marketplaceアプリケーションの価格プラン
+intro: '価格プランを利用して、様々なレベルのサービスやリソースと共にアプリケーションを提供できます。 {% data variables.product.prodname_marketplace %}のリストでは、最大で10個の価格プランを提供できます。'
redirect_from:
- /apps/marketplace/selling-your-app/github-marketplace-pricing-plans/
- /marketplace/selling-your-app/github-marketplace-pricing-plans
@@ -10,38 +10,38 @@ versions:
-{% data variables.product.prodname_marketplace %} pricing plans can be free, flat rate, or per-unit, and GitHub lists the price in US dollars. Customers purchase your app using a payment method attached to their {% data variables.product.product_name %} account, without having to leave GitHub.com. You don't have to write code to perform billing transactions, but you will have to handle [billing flows](/marketplace/integrating-with-the-github-marketplace-api/#billing-flows) for purchase events.
+{% data variables.product.prodname_marketplace %}の価格プランは、無料、定額料金、ユニット単位にすることができ、GitHubは価格を米ドルでリストします。 顧客はGitHub.comを離れることなく、{% data variables.product.product_name %}アカウントに添付された支払い方法を使ってアプリケーションを購入します。 支払い処理を行うためのコードを書く必要はありませんが、購入イベントのための[支払いフロー](/marketplace/integrating-with-the-github-marketplace-api/#billing-flows)は処理しなければなりません。
-If the app you're listing on {% data variables.product.prodname_marketplace %} has multiple plan options, you can set up corresponding pricing plans. For example, if your app has two plan options, an open source plan and a pro plan, you can set up a free pricing plan for your open source plan and a flat pricing plan for your pro plan. Each {% data variables.product.prodname_marketplace %} listing must have an annual and a monthly price for every plan that's listed.
+{% data variables.product.prodname_marketplace %}上でリストしているアプリケーションが複数のプランのオプションを持っているなら、対応する価格プランをセットアップできます。 たとえばアプリケーションが2つのプランの選択肢としてオープンソースプランとプロプランを持っているなら、オープンソースプランに対して無料価格プランを、そしてプロプランに対して定額料金プランをセットアップできます。 それぞれの{% data variables.product.prodname_marketplace %}リストには、リストされたすべてのプランに対して年間及び月間の価格がなければなりません。
-For more information on how to create a pricing plan, see "[Setting a {% data variables.product.prodname_marketplace %} listing's pricing plan](/marketplace/listing-on-github-marketplace/setting-a-github-marketplace-listing-s-pricing-plan/)."
+価格プランの作成方法に関する詳しい情報については「[{% data variables.product.prodname_marketplace %}リストの価格プランの設定](/marketplace/listing-on-github-marketplace/setting-a-github-marketplace-listing-s-pricing-plan/)」を参照してください。
{% note %}
-**Note:** If you're listing an app on {% data variables.product.prodname_marketplace %}, you can't list your app with a free pricing plan if you offer a paid service outside of {% data variables.product.prodname_marketplace %}.
+**ノート:**{% data variables.product.prodname_marketplace %}上でアプリケーションをリストする場合、{% data variables.product.prodname_marketplace %}の外部で有料サービスを提供しているなら無料プランでアプリケーションをリストすることはできません。
{% endnote %}
-### Types of pricing plans
+### 価格プランの種類
-**Free pricing plans** are completely free for users. If you set up a free pricing plan, you cannot charge users that choose the free pricing plan for the use of your app. You can create both free and paid plans for your listing. Unverified free apps do not need to implement any billing flows. Free apps that are verified by Github need to implement billing flows for new purchases and cancellations, but do not need to implement billing flows for free trials, upgrades, and downgrades. If you add a paid plan to an app that you've already listed in {% data variables.product.prodname_marketplace %} as a free service, you'll need to resubmit the app for review.
+**無料プラン**は、完全に無料です。 無料プランをセットアップした場合、アプリケーションを利用するために無料プランを選択したユーザに課金することはできません。 リストでは無料と有料のプランをどちらも作成できます。 未検証の無料アプリケーションは、支払いフローを実装する必要はありません。 GitHubによって検証される無料アプリケーションは、新規の購入とキャンセルのための支払いフローを実装しなければなりませんが、無料トライアル、アップグレード、ダウングレードの支払いフローを実装する必要はありません。 無料のサービスとして{% data variables.product.prodname_marketplace %}にリスト済みのアプリケーションに有料プランを追加する場合は、そのアプリケーションをレビューのために再度サブミットしなければなりません。
-**Flat rate pricing plans** charge a set fee on a monthly and yearly basis.
+**定額料金プラン**は、月単位及び年単位で設定された料金を課金します。
-**Per-unit pricing plans** charge a set fee on either a monthly or yearly basis for a unit that you specify. A "unit" can be anything you'd like (for example, a user, seat, or person).
+**ユニット単位の価格プラン**は、月単位あるいは年単位で、指定した単位に基づいて設定された料金を課金します。 「ユニット」には好きなもの(たとえばユーザ、シート、あるいは人)を指定できます。
-**Marketplace free trials** provide 14-day free trials of OAuth or GitHub Apps to customers. When you [set up a Marketplace pricing plan](/marketplace/listing-on-github-marketplace/setting-a-github-marketplace-listing-s-pricing-plan/), you can select the option to provide a free trial for flat-rate or per-unit pricing plans.
+**Marketplace無料トライアル**は、OAuthあるいはGitHubアプリケーションを顧客に対して14日間の無料トライアルを提供します。 [Marketplaceの価格プランをセットアップ](/marketplace/listing-on-github-marketplace/setting-a-github-marketplace-listing-s-pricing-plan/)する際に、このオプションを選択して定額料金あるいはユニット単位の価格プランに対して無料トライアルを提供できます。
-### Free trials
+### 無料トライアル
-Customers can start a free trial for any available paid plan on a Marketplace listing, but will not be able to create more than one free trial for a Marketplace product.
+顧客はMarketplaceのリスト上の利用可能な任意の有料プランに対して無料トライアルを開始できますが、1つのMarketplace製品に対して複数の無料トライアルを作成することはできません。
-Free trials have a fixed length of 14 days. Customers are notified 4 days before the end of their trial period (on day 11 of the free trial) that their plan will be upgraded. At the end of a free trial, customers will be auto-enrolled into the plan they are trialing if they do not cancel.
+無料トライアルの期間は固定の14日間です。 顧客はトライアル期間の終了の4日前(無料トライアルの11日目)に、プランがアップグレードされるという通知を受け取ります。 顧客は、キャンセルしないかぎり、無料トライアルの終わりにトライアルを行っていたプランに自動的に登録されます。
-See "[New purchases and free trials](/marketplace/integrating-with-the-github-marketplace-api/handling-new-purchases-and-free-trials/)" for details on how to handle free trials in your app.
+アプリケーションで無料トライアルを処理する方法の詳細については「[新規の購入と無料トライアル](/marketplace/integrating-with-the-github-marketplace-api/handling-new-purchases-and-free-trials/)」を参照してください。
{% note %}
-**Note:** GitHub expects you to delete any private customer data within 30 days of a cancelled trial, beginning at the receipt of the cancellation event.
+**ノート:** GitHubは、キャンセルされたトライアルのすべてのプライベートな顧客データが、キャンセルイベントの受け付け開始から30日以内に削除されるものと期待します。
{% endnote %}
diff --git a/translations/ja-JP/content/developers/github-marketplace/receiving-payment-for-app-purchases.md b/translations/ja-JP/content/developers/github-marketplace/receiving-payment-for-app-purchases.md
index 3c8a760f58..87b9392e12 100644
--- a/translations/ja-JP/content/developers/github-marketplace/receiving-payment-for-app-purchases.md
+++ b/translations/ja-JP/content/developers/github-marketplace/receiving-payment-for-app-purchases.md
@@ -1,6 +1,6 @@
---
-title: Receiving payment for app purchases
-intro: 'At the end of each month, you''ll receive payment for your {% data variables.product.prodname_marketplace %} listing.'
+title: アプリケーションの購入に対する支払いの受け取り
+intro: '各月の終わりに、{% data variables.product.prodname_marketplace %}リストに対する支払いを受け取ります。'
redirect_from:
- /apps/adding-integrations/managing-pricing-and-payments-for-a-github-marketplace-listing/receiving-payment-for-a-github-marketplace-listing/
- /apps/marketplace/managing-pricing-and-payments-for-a-github-marketplace-listing/receiving-payment-for-a-github-marketplace-listing/
@@ -13,8 +13,8 @@ versions:
-After your {% data variables.product.prodname_marketplace %} listing is created and approved, you'll provide payment details to {% data variables.product.product_name %} as part of the onboarding process.
+{% data variables.product.prodname_marketplace %}のリストが作成され、承認されたあと、オンボーディングプロセスの一環として{% data variables.product.product_name %}への支払いの詳細を提供します。
-Once your revenue reaches a minimum of $500 U.S. Dollars for the month, you'll receive an electronic payment from {% data variables.product.product_name %} for 75% of the sales price.
+1ヶ月の収益が$500米ドルに達すると、 {% data variables.product.product_name %}から販売価格の75%の電子支払いを受け取ります。
{% data reusables.apps.marketplace_revenue_share %}
diff --git a/translations/ja-JP/content/developers/github-marketplace/requirements-for-listing-an-app.md b/translations/ja-JP/content/developers/github-marketplace/requirements-for-listing-an-app.md
index 39be5af538..3d38fbd3af 100644
--- a/translations/ja-JP/content/developers/github-marketplace/requirements-for-listing-an-app.md
+++ b/translations/ja-JP/content/developers/github-marketplace/requirements-for-listing-an-app.md
@@ -1,6 +1,6 @@
---
-title: Requirements for listing an app
-intro: 'Apps on {% data variables.product.prodname_marketplace %} must meet the requirements outlined on this page before our {% data variables.product.prodname_marketplace %} onboarding specialists will approve the listing.'
+title: アプリケーションのリストのための要件
+intro: '{% data variables.product.prodname_marketplace %}上のアプリケーションは、弊社の{% data variables.product.prodname_marketplace %}オンボーディングスペシャリストがリストを承認する前に、このページに記載されている要件概要を満たしていなければなりません。'
redirect_from:
- /apps/adding-integrations/listing-apps-on-github-marketplace/requirements-for-listing-an-app-on-github-marketplace/
- /apps/marketplace/listing-apps-on-github-marketplace/requirements-for-listing-an-app-on-github-marketplace/
@@ -14,47 +14,47 @@ versions:
-Before you submit your app for review, you must read and accept the terms of the "[{% data variables.product.prodname_marketplace %} Developer Agreement](/articles/github-marketplace-developer-agreement/)." You'll accept the terms within your [draft listing](/marketplace/listing-on-github-marketplace/creating-a-draft-github-marketplace-listing/) on {% data variables.product.product_name %}. Once you've submitted your app, one of the {% data variables.product.prodname_marketplace %} onboarding specialists will reach out to you with more information about the onboarding process, and review your app to ensure it meets these requirements:
+レビューのためにアプリケーションをサブミットする前に、「[{% data variables.product.prodname_marketplace %}開発者契約](/articles/github-marketplace-developer-agreement/)」の条項を読んで同意しなければなりません。 {% data variables.product.product_name %}上の[ドラフトリスト](/marketplace/listing-on-github-marketplace/creating-a-draft-github-marketplace-listing/)内の条項に同意しなければなりません。 アプリケーションをサブミットすると、オンボーディングプロセスに関するさらなる情報と共に{% data variables.product.prodname_marketplace %}オンボーディングスペシャリストの一人から連絡があり、アプリケーションをレビューして以下の要件を満たしていることを確認してくれます。
-### User experience
+### ユーザー体験
-- {% data variables.product.prodname_github_app %}s should have a minimum of 100 installations.
-- {% data variables.product.prodname_oauth_app %}s should have a minimum of 200 users.
-- Apps must provide value to customers and integrate with the platform in some way beyond authentication.
-- Apps must be publicly available in {% data variables.product.prodname_marketplace %} and cannot be in beta or available by invite only.
-- Apps cannot actively persuade users away from {% data variables.product.product_name %}.
-- Marketing materials for the app must accurately represent the app's behavior.
-- Apps must include links to user-facing documentation that describe how to set up and use the app.
-- When a customer purchases an app and GitHub redirects them to the app's installation URL, the app must begin the OAuth flow immediately. For details, see "[Handling new purchases and free trials](/marketplace/integrating-with-the-github-marketplace-api/handling-new-purchases-and-free-trials/#step-3-authorization)."
+- {% data variables.product.prodname_github_app %}は、最低でも100個のインストールが必要です。
+- {% data variables.product.prodname_oauth_app %}は最低200ユーザが必要です。
+- アプリケーションは顧客に価値を提供し、認証以外の方法でプラットフォームと統合されていなければなりません
+- アプリケーションケーションは{% data variables.product.prodname_marketplace %}で公開されなければならず、ベータや招待のみでの利用であってはなりません。
+- アプリケーションはユーザを{% data variables.product.product_name %}から積極的に離れさせるようにしてはなりません。
+- アプリケーションのマーケティング資料は、アプリケーションの動作を正確に表現していなければなりません。
+- アプリケーションは、アプリケーションのセットアップと利用の方法を述べたユーザ向けのドキュメンテーションへのリンクを含まなければなりません。
+- 顧客がアプリケーションを購入し、GitHubがそのユーザをアプリケーションのインストールURLにリダイレクトしたなら、アプリケーションはすぐにOAuthフローを開始しなければなりません。 詳細については「[新規購入や無料トライアルの取り扱い](/marketplace/integrating-with-the-github-marketplace-api/handling-new-purchases-and-free-trials/#step-3-authorization)」を参照してください。
-- Customers must be able to install your app and select repositories on both a personal and organization account. They should be able to view and manage those accounts separately.
+- 顧客はアプリケーションをインストールし、個人及びOrganization双方のアカウント上のリポジトリを選択できなければなりません。 顧客はそれらのアカウントを個別に表示及び管理できなければなりません。
-### Brand and listing
+### ブランドとリスト
-- Apps that use GitHub logos must follow the "[{% data variables.product.product_name %} Logos and Usage](https://github.com/logos)" guidelines.
-- Apps must have a logo, feature card, and screenshots images that meet the recommendations provided in "[Writing {% data variables.product.prodname_marketplace %} listing descriptions](/marketplace/listing-on-github-marketplace/writing-github-marketplace-listing-descriptions/)."
-- Listings must include descriptions that are well written and free of grammatical errors. For guidance in writing your listing, see "[Writing {% data variables.product.prodname_marketplace %} listing descriptions](/marketplace/listing-on-github-marketplace/writing-github-marketplace-listing-descriptions/)."
+- GitHubを使うアプリケーションは、「[{% data variables.product.product_name %} ロゴと利用](https://github.com/logos)」ガイドラインに従わなければなりません。
+- アプリケーションは、「[{% data variables.product.prodname_marketplace %}リストの説明の作成](/marketplace/listing-on-github-marketplace/writing-github-marketplace-listing-descriptions/)」にある推奨事項を満たすロゴ、機能カード、スクリーンショット画像を持っていなければなりません。
+- リストには、十分に書かれた文法上の誤りがない説明が含まれていなければなりません。 リストの作成のガイダンスとしては、「[{% data variables.product.prodname_marketplace %}リストの説明の作成](/marketplace/listing-on-github-marketplace/writing-github-marketplace-listing-descriptions/)」を参照してください。
### セキュリティ
-Apps will go through a security review before being listed on {% data variables.product.prodname_marketplace %}. A successful review will meet the requirements and follow the security best practices listed in "[Security review process](/marketplace/getting-started/security-review-process/)." For information on the review process, contact [marketplace@github.com](mailto:marketplace@github.com).
+アプリケーションは、{% data variables.product.prodname_marketplace %}にリストされる前にセキュリティレビューを経ることになります。 レビューが成功するためには、「[セキュリティレビュープロセス](/marketplace/getting-started/security-review-process/)」にリストされている要件を満たし、セキュリティのベストプラクティスにしたがっていなければなりません。 レビュープロセスに関する情報については、[marketplace@github.com](mailto:marketplace@github.com)までお問い合わせください。
-### Billing flows
+### 支払いのフロー
-Your app must integrate [billing flows](/marketplace/integrating-with-the-github-marketplace-api/#billing-flows) using the [{% data variables.product.prodname_marketplace %} webhook event](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/).
+アプリケーションは、[{% data variables.product.prodname_marketplace %} webhookイベント](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/)を使って[支払いフロー](/marketplace/integrating-with-the-github-marketplace-api/#billing-flows)を統合していなければなりません。
-#### Free apps
+#### 無料アプリケーション
-{% data reusables.marketplace.free-apps-encouraged %} If you are listing a free app, you'll need to meet these requirements:
+{% data reusables.marketplace.free-apps-encouraged %}無料アプリケーションをリストするなら、以下の要件を満たさなければなりません。
-- Customers must be able to see that they have a free plan in the billing, profile, or account settings section of the app.
-- When a customer cancels your app, you must follow the flow for [cancelling plans](/marketplace/integrating-with-the-github-marketplace-api/cancelling-plans/).
+- 顧客はアプリケーションの支払い、プロフィール、アカウント設定のセクションで、無料プランがあるのを見ることができなければなりません。
+- 顧客がアプリケーションをキャンセルする際には、[プランのキャンセル](/marketplace/integrating-with-the-github-marketplace-api/cancelling-plans/)のためのフローに従わなければなりません。
-#### Paid apps
+#### 有料アプリケーション
-To offer your app as a paid service, you'll need to meet these requirements to list your app on {% data variables.product.prodname_marketplace %}:
+アプリケーションを有料サービスとして提供するためには、{% data variables.product.prodname_marketplace %}上でアプリケーションをリストする上で以下の要件を満たさなければなりません。
-- To sell your app in {% data variables.product.prodname_marketplace %}, it must use GitHub's billing system. Your app does not need to handle payments but does need to use "[{% data variables.product.prodname_marketplace %} purchase events](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/)" to manage new purchases, upgrades, downgrades, cancellations, and free trials. See "[Billing flows](/marketplace/integrating-with-the-github-marketplace-api/#billing-flows)" to learn about how to integrate these events into your app. Using GitHub's billing system allows customers to purchase an app without leaving GitHub and pay for the service with the payment method already attached to their {% data variables.product.product_name %} account.
-- Apps must support both monthly and annual billing for paid subscriptions purchases.
-- Listings may offer any combination of free and paid plans. Free plans are optional but encouraged. For more information, see "[Setting a {% data variables.product.prodname_marketplace %} listing's pricing plan](/marketplace/listing-on-github-marketplace/setting-a-github-marketplace-listing-s-pricing-plan/)."
+- {% data variables.product.prodname_marketplace %}でアプリケーションを販売するには、GitHubの支払いシステムを使わなければなりません。 アプリケーションは支払いを処理する必要はありませんが、「[{% data variables.product.prodname_marketplace %} 購入イベント](/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-webhook-events/)」を使って新規の購入、アップグレード、ダウングレード、キャンセル、無料トライアルを管理しなければなりません。 これらのイベントをアプリケーションに統合する方法を学ぶには、「[支払いフロー](/marketplace/integrating-with-the-github-marketplace-api/#billing-flows)」を参照してください。 GitHubの支払いシステムを使えば、顧客はGitHubを離れることなくアプリケーションを購入し、自分の{% data variables.product.product_name %}アカウントにすでに結合されている支払い方法でサービスに対する支払いを行えます。
+- アプリケーションは、有料のサブスクリプションの購入について、月次及び年次の支払いをサポートしなければなりません。
+- リストは、無料及び有料プランの任意の組み合わせを提供できます。 無料プランはオプションですが、推奨されます。 詳しい情報については「[{% data variables.product.prodname_marketplace %}リストの価格プランの設定](/marketplace/listing-on-github-marketplace/setting-a-github-marketplace-listing-s-pricing-plan/)」を参照してください。
{% data reusables.marketplace.marketplace-billing-ui-requirements %}
diff --git a/translations/ja-JP/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md b/translations/ja-JP/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md
index ffbc4c69fc..ca90f5d346 100644
--- a/translations/ja-JP/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md
+++ b/translations/ja-JP/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md
@@ -1,6 +1,6 @@
---
-title: REST endpoints for the GitHub Marketplace API
-intro: 'To help manage your app on {% data variables.product.prodname_marketplace %}, use these {% data variables.product.prodname_marketplace %} API endoints.'
+title: GItHub Marketplace API用のRESTエンドポイント
+intro: '{% data variables.product.prodname_marketplace %}上でのアプリケーションの管理を支援するために、以下の{% data variables.product.prodname_marketplace %} APIエンドポイントを使ってください。'
redirect_from:
- /apps/marketplace/github-marketplace-api-endpoints/
- /apps/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-rest-api-endpoints/
@@ -11,20 +11,20 @@ versions:
-Here are some useful endpoints available for Marketplace listings:
+以下は、Marketplaceのリストで利用できる便利なエンドポイントです。
-* [List plans](/v3/apps/marketplace/#list-plans)
-* [List accounts for a plan](/v3/apps/marketplace/#list-accounts-for-a-plan)
-* [Get a subscription plan for an account](/v3/apps/marketplace/#get-a-subscription-plan-for-an-account)
-* [List subscriptions for the authenticated user](/v3/apps/marketplace/#list-subscriptions-for-the-authenticated-user)
+* [プランのリスト](/v3/apps/marketplace/#list-plans)
+* [プランのアカウントのリスト](/v3/apps/marketplace/#list-accounts-for-a-plan)
+* [アカウントのサブスクリプションプランの取得](/v3/apps/marketplace/#get-a-subscription-plan-for-an-account)
+* [認証されたユーザのサブスクリプションのリスト](/v3/apps/marketplace/#list-subscriptions-for-the-authenticated-user)
-See these pages for details on how to authenticate when using the {% data variables.product.prodname_marketplace %} API:
+{% data variables.product.prodname_marketplace %} APIを使用する際の認証の受け方の詳細については、以下のページを参照してください。
-* [Authorization options for OAuth Apps](/apps/building-oauth-apps/authorizing-oauth-apps/)
-* [Authentication options for GitHub Apps](/apps/building-github-apps/authenticating-with-github-apps/)
+* [OAuth Appの認可オプション](/apps/building-oauth-apps/authorizing-oauth-apps/)
+* [GitHub Appの認可オプション](/apps/building-github-apps/authenticating-with-github-apps/)
{% note %}
-**Note:** [Rate limits for the REST API](/v3/#rate-limiting) apply to all {% data variables.product.prodname_marketplace %} API endpoints.
+**ノート:** [REST APIのためのレート制限](/v3/#rate-limiting)は、{% data variables.product.prodname_marketplace %} APIのすべてのエンドポイントに適用されます。
{% endnote %}
diff --git a/translations/ja-JP/content/developers/github-marketplace/security-review-process-for-submitted-apps.md b/translations/ja-JP/content/developers/github-marketplace/security-review-process-for-submitted-apps.md
index 33f079be65..40f7032bae 100644
--- a/translations/ja-JP/content/developers/github-marketplace/security-review-process-for-submitted-apps.md
+++ b/translations/ja-JP/content/developers/github-marketplace/security-review-process-for-submitted-apps.md
@@ -1,6 +1,6 @@
---
-title: Security review process for submitted apps
-intro: 'GitHub''s security team reviews all apps submitted to {% data variables.product.prodname_marketplace %} to ensure that they meet security requirements. Follow these best practices to be prepared for the review process.'
+title: サブミットされたアプリケーションに対するセキュリティレビューのプロセス
+intro: 'GitHubのセキュリティチームは、{% data variables.product.prodname_marketplace %}にサブミットされたすべてのアプリケーションをレビューし、それらがセキュリティの要件を満たしていることを確認します。 このレビューのプロセスに備えるために、以下のベストプラクティスに従ってください。'
redirect_from:
- /apps/marketplace/getting-started/security-review-process/
- /marketplace/getting-started/security-review-process
@@ -10,23 +10,23 @@ versions:
-After you've submitted your app for approval, the GitHub security team will request that you complete a security questionnaire about your app and overall security program. As part of the review, you will have the option to provide documentation to support your responses. You must submit two required documents before your app will be approved for {% data variables.product.prodname_marketplace %}: an [incident response plan](#incident-response-plan) and [vulnerability management workflow](#vulnerability-management-workflow).
+承認のためにアプリケーションをサブミットすると、GitHubのセキュリティチームはそのアプリケーションと全体的なセキュリティプログラムに関するセキュリティアンケートへの回答を求めます。 レビューの一環として、回答をサポートするためのドキュメンテーションを提供することもできます。 {% data variables.product.prodname_marketplace %}が承認される前に、[インシデントレスポンス計画](#incident-response-plan)と[脆弱性管理ワークフロー](#vulnerability-management-workflow)という2つの必須ドキュメントを提出しなければなりません。
-### Security best practices
+### セキュリティのベストプラクティス
-Follow these best practices to have a successful security review and provide a secure user experience.
+セキュリティレビューを成功させ、セキュアなユーザ体験を提供するために、以下のベストプラクティスに従ってください。
-#### Authorization, authentication, and access control
+#### 認可、認証、アクセスコントロール
-We recommend submitting a GitHub App rather than an OAuth App. {% data reusables.marketplace.github_apps_preferred %}. See "[Differences between GitHub Apps and OAuth Apps](/apps/differences-between-apps/)" for more details.
-- Apps must use the "[principle of least privilege](https://en.wikipedia.org/wiki/Principle_of_least_privilege)" and should only request the OAuth scopes and GitHub App permissions that the app needs to perform its intended functionality.
-- Apps must provide customers with a way to delete their account, without having to email or call a support person.
-- Apps should not share tokens between different implementations of the app. For example, a desktop app should have a separate token from a web-based app. Individual tokens allow each app to request the access needed for GitHub resources separately.
-- Design your app with different user roles, depending on the functionality needed by each type of user. For example, a standard user should not have access to admin functionality, and billing managers might not need push access to repository code.
-- Your app should not share service accounts such as email or database services to manage your SaaS service.
-- All services used in your app should have unique login and password credentials.
-- Admin privilege access to the production hosting infrastructure should only be given to engineers and employees with administrative duties.
+OAuth Appよりは、GitHub Appをサブミットすることをおすすめします。 {% data reusables.marketplace.github_apps_preferred %}. 詳細については、「[GitHub AppsとOAuth Appsの違い](/apps/differences-between-apps/)」を参照してください。
+- アプリケーションは「[最小の権限の原則](https://en.wikipedia.org/wiki/Principle_of_least_privilege)」を用いなければならず、要求するOAuthのスコープやGitHub Appの権限は、意図された機能を実行するのにアプリケーションが必要とするものだけにすべきです。
+- アプリケーションは、サポート担当者にメールや連絡をすることなく、顧客が自分のアカウントを削除する方法を提供しなければなりません。
+- アプリケーションは、異なる実装間でトークンを共有してはなりません。 たとえば、デスクトップのアプリケーションはWebベースのアプリケーションとは別のトークンを持つべきです。 個々のトークンを使うことで、それぞれのアプリケーションはGitHubのリソースに必要なアクセスを個別にリクエストできます。
+- ユーザの種類に応じて求められる機能によって、様々なユーザのロールを持たせてアプリケーションを設計してください。 たとえば、標準的なユーザは管理機能を利用できるべきではなく、支払いマネージャーはリポジトリのコードにプッシュアクセスできるべきではありません。
+- アプリケーションは、SaaSサービスを管理するためのメールやデータベースサービスのようなサービスアカウントを共有するべきではありません。
+- アプリケーションで使用されるすべてのサービスは、固有のログインとパスワードクレデンシャルを持たなければなりません。
+- プロダクションのホスティングインフラストラクチャへの管理権限でのアクセスは、管理業務を持つエンジニアや従業員にのみ与えられるべきです。
- Apps cannot use personal access tokens to authenticate and must authenticate as an [OAuth App](/apps/about-apps/#about-oauth-apps) or [GitHub App](/apps/about-apps/#about-github-apps):
- OAuth Appsは、[OAuthトークン](/apps/building-oauth-apps/authorizing-oauth-apps/)を使って認証を受けなければなりません。
- GitHub Apps must authenticate using either a [JSON Web Token (JWT)](/apps/building-github-apps/authenticating-with-github-apps/#authenticating-as-a-github-app), [OAuth token](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/), or [installation access token](/apps/building-github-apps/authenticating-with-github-apps/#authenticating-as-an-installation).
diff --git a/translations/ja-JP/content/github/administering-a-repository/about-dependabot-version-updates.md b/translations/ja-JP/content/github/administering-a-repository/about-dependabot-version-updates.md
new file mode 100644
index 0000000000..7c56d142b9
--- /dev/null
+++ b/translations/ja-JP/content/github/administering-a-repository/about-dependabot-version-updates.md
@@ -0,0 +1,45 @@
+---
+title: About Dependabot version updates
+intro: '{% data variables.product.prodname_dependabot %} を使用して、使用するパッケージを最新バージョンに更新しておくことができます。'
+redirect_from:
+ - /github/administering-a-repository/about-dependabot
+ - /github/administering-a-repository/about-github-dependabot-version-updates
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.dependabot.beta-note %}
+
+### {% data variables.product.prodname_dependabot_version_updates %} について
+
+{% data variables.product.prodname_dependabot %} は、依存関係を維持する手間を省きます。 これを使用して、リポジトリが依存するパッケージおよびアプリケーションの最新リリースに自動的に対応できるようにすることができます。
+
+{% data variables.product.prodname_dependabot_version_updates %} を有効にするには、リポジトリに設定ファイルをチェックインします。 設定ファイルでは、リポジトリに保存されているマニフェストまたは他のパッケージ定義ファイルの場所を指定します。 {% data variables.product.prodname_dependabot %} はこの情報を使用して、古いパッケージとアプリケーションをチェックします。 {% data variables.product.prodname_dependabot %} は、依存関係のセマンティックバージョニング([semver](https://semver.org/))を調べて、そのバージョンへの更新の必要性を判断することにより、依存関係の新しいバージョンの有無を決定します。 For certain package managers, {% data variables.product.prodname_dependabot_version_updates %} also supports vendoring. Vendored (or cached) dependencies are dependencies that are checked in to a specific directory in a repository, rather than referenced in a manifest. Vendored dependencies are available at build time even if package servers are unavailable. {% data variables.product.prodname_dependabot_version_updates %} can be configured to check vendored dependencies for new versions and update them if necessary.
+
+{% data variables.product.prodname_dependabot %} が古い依存関係を特定すると、プルリクエストを発行して、マニフェストを依存関係の最新バージョンに更新します。 For vendored dependencies, {% data variables.product.prodname_dependabot %} raises a pull request to directly replace the outdated dependency with the new version. テストに合格したことを確認し、プルリクエストの概要に含まれている変更履歴とリリースノートを確認して、マージします。 詳しい情報については、「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates)」を参照してください。
+
+セキュリティアップデートを有効にすると、{% data variables.product.prodname_dependabot %} はプルリクエストを発行し、脆弱性のある依存関係を更新します。 For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
+
+{% data reusables.dependabot.dependabot-tos %}
+
+### {% data variables.product.prodname_dependabot %} のプルリクエストの頻度
+
+設定ファイルで、新しいバージョンの各エコシステムをチェックする頻度を、毎日、毎週、毎月の中から指定します。
+
+{% data reusables.dependabot.initial-updates %}
+
+セキュリティアップデートを有効にした場合、セキュリティアップデートの追加に対するプルリクエストが表示されることがあります。 これらは、デフォルトブランチへの依存関係に対する {% data variables.product.prodname_dependabot %} アラートによってトリガーされます。 {% data variables.product.prodname_dependabot %} はプルリクエストを自動的に生成し、脆弱性のある依存関係を更新します。
+
+### サポートされているリポジトリとエコシステム
+
+{% note %}
+
+{% data reusables.dependabot.private-dependencies %}
+
+{% endnote %}
+
+サポートされているパッケージマネージャーのいずれかの依存関係マニフェストまたはロックファイルを含むリポジトリのバージョン更新を設定できます。 For some package managers, you can also configure vendoring for dependencies. 詳しい情報については、「[依存関係の更新の設定オプション](/github/administering-a-repository/configuration-options-for-dependency-updates#vendor) 」を参照してください。
+
+{% data reusables.dependabot.supported-package-managers %}
+
+リポジトリですでに依存関係管理にインテグレーションを使用している場合は、{% data variables.product.prodname_dependabot %} を有効にする前にそれを無効にする必要があります。 詳しい情報については、「[インテグレーションについて](/github/customizing-your-github-workflow/about-integrations)」を参照してください。
diff --git a/translations/ja-JP/content/github/administering-a-repository/about-releases.md b/translations/ja-JP/content/github/administering-a-repository/about-releases.md
index b224708755..628e57ad37 100644
--- a/translations/ja-JP/content/github/administering-a-repository/about-releases.md
+++ b/translations/ja-JP/content/github/administering-a-repository/about-releases.md
@@ -32,7 +32,7 @@ People with admin permissions to a repository can choose whether
{% if currentVersion == "free-pro-team@latest" %}
リリースでセキュリティの脆弱性が修正された場合は、リポジトリにセキュリティアドバイザリを公開する必要があります。
-{% data variables.product.prodname_dotcom %} は公開された各セキュリティアドバイザリを確認し、それを使用して、影響を受けるリポジトリに {% data variables.product.prodname_dependabot_short %} アラートを送信できます。 詳しい情報については、「[GitHub セキュリティアドバイザリについて](/github/managing-security-vulnerabilities/about-github-security-advisories)」 を参照してください。
+{% data variables.product.prodname_dotcom %} reviews each published security advisory and may use it to send {% data variables.product.prodname_dependabot_alerts %} to affected repositories. 詳しい情報については、「[GitHub セキュリティアドバイザリについて](/github/managing-security-vulnerabilities/about-github-security-advisories)」 を参照してください。
リポジトリ内のコードに依存しているリポジトリとパッケージを確認するために、依存関係グラフの [**依存関係**] タブを表示することができますが、それによって、新しいリリースの影響を受ける可能性があります。 詳しい情報については、「[依存関係グラフについて](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)」を参照してください。
{% endif %}
diff --git a/translations/ja-JP/content/github/administering-a-repository/about-securing-your-repository.md b/translations/ja-JP/content/github/administering-a-repository/about-securing-your-repository.md
index bc531d3540..215aaa2b6c 100644
--- a/translations/ja-JP/content/github/administering-a-repository/about-securing-your-repository.md
+++ b/translations/ja-JP/content/github/administering-a-repository/about-securing-your-repository.md
@@ -21,13 +21,13 @@ versions:
リポジトリのコードのセキュリティの脆弱性について、非公開で議論して修正します。 その後、セキュリティアドバイザリを公開して、コミュニティに脆弱性を警告し、アップグレードするように促すことができます。 詳しい情報については「[{% data variables.product.prodname_security_advisories %}について](/github/managing-security-vulnerabilities/about-github-security-advisories)」を参照してください。
-- **{% data variables.product.prodname_dependabot_short %} alerts and security updates**
+- **{% data variables.product.prodname_dependabot_alerts %} and security updates**
- セキュリティの脆弱性を含むことを把握している依存関係に関するアラートを表示し、プルリクエストを自動的に生成してこれらの依存関係を更新するかどうかを選択します。 For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."
+ セキュリティの脆弱性を含むことを把握している依存関係に関するアラートを表示し、プルリクエストを自動的に生成してこれらの依存関係を更新するかどうかを選択します。 For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
-- **{% data variables.product.prodname_dependabot_short %} version updates**
+- **{% data variables.product.prodname_dependabot %} version updates**
- Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. 詳しい情報については、「[{% data variables.product.prodname_dependabot_version_updates %} について](/github/administering-a-repository/about-github-dependabot-version-updates)」を参照してください。
+ Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. 詳しい情報については、「[{% data variables.product.prodname_dependabot_version_updates %} について](/github/administering-a-repository/about-dependabot-version-updates)」を参照してください。
- **{% data variables.product.prodname_code_scanning_capc %} アラート**
@@ -43,6 +43,6 @@ versions:
* リポジトリが依存しているエコシステムとパッケージ
* リポジトリに依存しているリポジトリとパッケージ
-{% data variables.product.prodname_dotcom %} がセキュリティの脆弱性のある依存関係に対して {% data variables.product.prodname_dependabot_short %} アラートを生成する前に、依存関係グラフを有効にする必要があります。
+You must enable the dependency graph before {% data variables.product.prodname_dotcom %} can generate {% data variables.product.prodname_dependabot_alerts %} for dependencies with security vulnerabilities.
依存関係グラフは、リポジトリの [**Insights**] タブにあります。 詳しい情報については、「[依存関係グラフについて](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)」を参照してください。
diff --git a/translations/ja-JP/content/github/administering-a-repository/configuration-options-for-dependency-updates.md b/translations/ja-JP/content/github/administering-a-repository/configuration-options-for-dependency-updates.md
index cb15877b9e..222804d1e3 100644
--- a/translations/ja-JP/content/github/administering-a-repository/configuration-options-for-dependency-updates.md
+++ b/translations/ja-JP/content/github/administering-a-repository/configuration-options-for-dependency-updates.md
@@ -12,7 +12,7 @@ versions:
{% data variables.product.prodname_dependabot %} の設定ファイルである *dependabot.yml* では YAML 構文を使用します。 YAMLについて詳しくなく、学んでいきたい場合は、「[Learn YAML in five minutes (5分で学ぶYAML)](https://www.codeproject.com/Articles/1214409/Learn-YAML-in-five-minutes)」をお読みください。
-このファイルは、リポジトリの `.github` ディレクトリに保存する必要があります。 *dependabot.yml* ファイルを追加または更新すると、即座にバージョン更新を確認します。 セキュリティアップデートに影響するオプションは、次にセキュリティアラートがセキュリティアップデートのプルリクエストをトリガーするときにも使用されます。 詳しい情報については、「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates)」および「[{% data variables.product.prodname_dependabot_security_updates %} を設定する](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)」を参照してください。
+このファイルは、リポジトリの `.github` ディレクトリに保存する必要があります。 *dependabot.yml* ファイルを追加または更新すると、即座にバージョン更新を確認します。 Any options that also affect security updates are used the next time a security alert triggers a pull request for a security update. 詳しい情報については、「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates)」および「[{% data variables.product.prodname_dependabot_security_updates %} を設定する](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)」を参照してください。
### *dependabot.yml* の設定オプション
@@ -56,13 +56,13 @@ versions:
脆弱性のあるパッケージマニフェストのセキュリティアップデートは、デフォルトブランチでのみ発生します。 設定オプションが同じブランチに設定され(`target-branch` を使用しない場合は true)、脆弱性のあるマニフェストの `package-ecosystem` と `directory` を指定している場合、セキュリティアップデートのプルリクエストで関連オプションが使用されます。
-一般に、セキュリティアップデートでは、メタデータの追加や動作の変更など、プルリクエストに影響する設定オプションが使用されます。 セキュリティアップデートに関する詳しい情報については、「[{% data variables.product.prodname_dependabot_security_updates %} を設定する](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)」を参照してください。
+一般に、セキュリティアップデートでは、メタデータの追加や動作の変更など、プルリクエストに影響する設定オプションが使用されます。 セキュリティアップデートに関する詳しい情報については、「[{% data variables.product.prodname_dependabot_security_updates %} を設定する](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)」を参照してください。
{% endnote %}
### `package-ecosystem`
-**必須** {% data variables.product.prodname_dependabot %} で新しいバージョンを監視するパッケージマネージャーごとに、`package-ecosystem` 要素を1つ追加してください。 リポジトリには、これらの各パッケージマネージャーの依存関係マニフェストまたはロックファイルも含まれている必要があります。 If you want to enable vendoring for a package manager that supports it, the vendored dependencies must be located in the required directory. For more information, see [`vendor`](#vendor) below.
+**Required** You add one `package-ecosystem` element for each package manager that you want {% data variables.product.prodname_dependabot %} to monitor for new versions. リポジトリには、これらの各パッケージマネージャーの依存関係マニフェストまたはロックファイルも含まれている必要があります。 If you want to enable vendoring for a package manager that supports it, the vendored dependencies must be located in the required directory. For more information, see [`vendor`](#vendor) below.
{% data reusables.dependabot.supported-package-managers %}
@@ -308,7 +308,7 @@ updates:
{% note %}
-構成ファイルの `ignore` オプションにプライベート依存関係を追加しても、{% data variables.product.prodname_dependabot_version_updates %} はプライベート Git 依存関係またはプライベート Git レジストリを含むマニフェストの依存関係のバージョン更新を実行できません。 詳しい情報については、「[{% data variables.product.prodname_dependabot_version_updates %} について](/github/administering-a-repository/about-github-dependabot#supported-repositories-and-ecosystems)」を参照してください。
+構成ファイルの `ignore` オプションにプライベート依存関係を追加しても、{% data variables.product.prodname_dependabot_version_updates %} はプライベート Git 依存関係またはプライベート Git レジストリを含むマニフェストの依存関係のバージョン更新を実行できません。 詳しい情報については、「[{% data variables.product.prodname_dependabot_version_updates %} について](/github/administering-a-repository/about-dependabot#supported-repositories-and-ecosystems)」を参照してください。
{% endnote %}
@@ -542,7 +542,7 @@ updates:
### `vendor`
-Use the `vendor` option to tell {% data variables.product.prodname_dependabot_short %} to vendor dependencies when updating them.
+Use the `vendor` option to tell {% data variables.product.prodname_dependabot %} to vendor dependencies when updating them.
```yaml
# Configure version updates for both dependencies defined in manifests and vendored dependencies
@@ -557,7 +557,7 @@ updates:
interval: "weekly"
```
-{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository.
+{% data variables.product.prodname_dependabot %} only updates the vendored dependencies located in specific directories in a repository.
| パッケージマネージャー | Required file path for vendored dependencies | 詳細情報 |
| ----------- | ------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------- |
diff --git a/translations/ja-JP/content/github/administering-a-repository/customizing-dependency-updates.md b/translations/ja-JP/content/github/administering-a-repository/customizing-dependency-updates.md
index a0dd7e14d9..c07cde3b8a 100644
--- a/translations/ja-JP/content/github/administering-a-repository/customizing-dependency-updates.md
+++ b/translations/ja-JP/content/github/administering-a-repository/customizing-dependency-updates.md
@@ -20,7 +20,7 @@ versions:
設定オプションの詳細については、「[依存関係の更新の設定オプション](/github/administering-a-repository/configuration-options-for-dependency-updates) 」を参照してください。
-リポジトリ内の *dependabot.yml* ファイルを更新すると、{% data variables.product.prodname_dependabot %} は新しい設定で即座にチェックを実行します。 数分以内に、[**{% data variables.product.prodname_dependabot_short %}**] タブに更新された依存関係のリストが表示されます。リポジトリに多くの依存関係がある場合、表示までにさらに時間がかかることがあります。 バージョン更新に関する新しいプルリクエストが表示されることもあります。 詳しい情報については、「[バージョン更新用に設定された依存関係を一覧表示する](/github/administering-a-repository/listing-dependencies-configured-for-version-updates) 」を参照してください。
+リポジトリ内の *dependabot.yml* ファイルを更新すると、{% data variables.product.prodname_dependabot %} は新しい設定で即座にチェックを実行します。 Within minutes you will see an updated list of dependencies on the **{% data variables.product.prodname_dependabot %}** tab, this may take longer if the repository has many dependencies. バージョン更新に関する新しいプルリクエストが表示されることもあります。 詳しい情報については、「[バージョン更新用に設定された依存関係を一覧表示する](/github/administering-a-repository/listing-dependencies-configured-for-version-updates) 」を参照してください。
### 設定変更によるセキュリティアップデートへの影響
diff --git a/translations/ja-JP/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md b/translations/ja-JP/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md
index 622271f543..888c02c1e2 100644
--- a/translations/ja-JP/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md
+++ b/translations/ja-JP/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md
@@ -63,7 +63,7 @@ You can disable all workflows for a repository or set a policy that configures w
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
{% data reusables.repositories.settings-sidebar-actions %}
-1. Under **Actions permissions**, select **Allow specific actions** and add your required actions to the list. 
+1. Under **Actions permissions**, select **Allow select actions** and add your required actions to the list. 
2. [**Save**] をクリックします。
{% endif %}
diff --git a/translations/ja-JP/content/github/administering-a-repository/enabling-and-disabling-version-updates.md b/translations/ja-JP/content/github/administering-a-repository/enabling-and-disabling-version-updates.md
index 154a99bab9..6b2ebc9cab 100644
--- a/translations/ja-JP/content/github/administering-a-repository/enabling-and-disabling-version-updates.md
+++ b/translations/ja-JP/content/github/administering-a-repository/enabling-and-disabling-version-updates.md
@@ -10,7 +10,7 @@ versions:
### 依存関係のバージョン更新について
-{% data variables.product.prodname_dependabot_version_updates %} を有効にするには、リポジトリの `.github` ディレクトリにある *dependabot.yml* 構成ファイルをチェックします。 すると、{% data variables.product.prodname_dependabot_short %} は設定した依存関係を最新の状態に保つためにプルリクエストを発行します。 更新するパッケージマネージャーの依存関係ごとに、パッケージマニフェストファイルの場所と、それらのファイルにリストされている依存関係の更新をチェックする頻度を指定する必要があります。 セキュリティ更新の有効化については、「[{% data variables.product.prodname_dependabot_security_updates %} を設定する](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)」を参照してください。
+{% data variables.product.prodname_dependabot_version_updates %} を有効にするには、リポジトリの `.github` ディレクトリにある *dependabot.yml* 構成ファイルをチェックします。 {% data variables.product.prodname_dependabot %} then raises pull requests to keep the dependencies you configure up-to-date. 更新するパッケージマネージャーの依存関係ごとに、パッケージマニフェストファイルの場所と、それらのファイルにリストされている依存関係の更新をチェックする頻度を指定する必要があります。 For information about enabling security updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)."
{% data reusables.dependabot.initial-updates %} 詳しい情報については、「[依存関係の更新をカスタマイズする](/github/administering-a-repository/customizing-dependency-updates)」をご覧ください。
@@ -72,7 +72,7 @@ updates:
### バージョン更新のステータスを確認する
-バージョン更新を有効にすると、リポジトリの依存関係グラフに新しい **Dependabot** タブが表示されます。 このタブには、{% data variables.product.prodname_dependabot %} が監視するように設定されているパッケージマネージャーと、{% data variables.product.prodname_dependabot_short %} が最後に新しいバージョンをチェックした日時が表示されます。
+バージョン更新を有効にすると、リポジトリの依存関係グラフに新しい **Dependabot** タブが表示されます。 This tab shows which package managers {% data variables.product.prodname_dependabot %} is configured to monitor and when {% data variables.product.prodname_dependabot %} last checked for new versions.
![[Repository Insights] タブ、[Dependency graph]、[Dependabot] タブ](/assets/images/help/dependabot/dependabot-tab-view-beta.png)
diff --git a/translations/ja-JP/content/github/administering-a-repository/index.md b/translations/ja-JP/content/github/administering-a-repository/index.md
index d4d566a769..a2a69f7065 100644
--- a/translations/ja-JP/content/github/administering-a-repository/index.md
+++ b/translations/ja-JP/content/github/administering-a-repository/index.md
@@ -91,11 +91,11 @@ versions:
{% topic_link_in_list /keeping-your-dependencies-updated-automatically %}
- {% link_in_list /about-github-dependabot-version-updates %}
+ {% link_in_list /about-dependabot-version-updates %}
{% link_in_list /enabling-and-disabling-version-updates %}
{% link_in_list /listing-dependencies-configured-for-version-updates %}
{% link_in_list /managing-pull-requests-for-dependency-updates %}
{% link_in_list /customizing-dependency-updates %}
{% link_in_list /configuration-options-for-dependency-updates %}
- {% link_in_list /keeping-your-actions-up-to-date-with-github-dependabot %}
+ {% link_in_list /keeping-your-actions-up-to-date-with-dependabot %}
diff --git a/translations/ja-JP/content/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot.md b/translations/ja-JP/content/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot.md
new file mode 100644
index 0000000000..e68e2a41dd
--- /dev/null
+++ b/translations/ja-JP/content/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot.md
@@ -0,0 +1,49 @@
+---
+title: Keeping your actions up to date with Dependabot
+intro: '{% data variables.product.prodname_dependabot %} を使用して、使用するアクションを最新バージョンに更新しておくことができます。'
+redirect_from:
+ - /github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.dependabot.beta-note %}
+
+### {% data variables.product.prodname_dependabot_version_updates %} のアクションについて
+
+多くの場合、アクションはバグ修正と新機能で更新され、自動プロセスの信頼性、速度、安全性が向上しています。 {% data variables.product.prodname_actions %} に対して {% data variables.product.prodname_dependabot_version_updates %} を有効にすると、{% data variables.product.prodname_dependabot %} は、リポジトリの *workflow.yml* ファイル内のアクションへのリファレンスが最新の状態に保たれるようにします。 {% data variables.product.prodname_dependabot %} は、ファイル内のアクションごとに、アクションのリファレンス(通常、アクションに関連付けられているバージョン番号またはコミット ID)を最新バージョンと照合します。 より新しいバージョンのアクションが使用可能な場合、{% data variables.product.prodname_dependabot %} は、ワークフローファイル内のリファレンスを最新バージョンに更新するプルリクエストを送信します。 {% data variables.product.prodname_dependabot_version_updates %} の詳細については、「[{% data variables.product.prodname_dependabot_version_updates %} について](/github/administering-a-repository/about-dependabot-version-updates)」を参照してください。 For more information about configuring workflows for {% data variables.product.prodname_actions %}, see "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)."
+
+### {% data variables.product.prodname_dependabot_version_updates %} のアクションを有効化する
+
+{% data reusables.dependabot.create-dependabot-yml %} 他のエコシステムまたはパッケージマネージャーですでに {% data variables.product.prodname_dependabot_version_updates %} を有効化している場合は、既存の *dependabot.yml* ファイルを開くだけです。
+1. 監視する `package-ecosystem` として `"github-actions"` を指定します。
+1. `directory` を `"/"` に設定し、`.github/workflows` でワークフローファイルを確認します。
+1. `schedule.interval` を設定して、新しいバージョンをチェックする頻度を指定します。
+{% data reusables.dependabot.check-in-dependabot-yml %} 既存のファイルを編集した場合は、変更を保存します。
+
+フォークで {% data variables.product.prodname_dependabot_version_updates %} を有効化することもできます。 詳しい情報については、「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates#enabling-version-updates-on-forks)」を参照してください。
+
+#### {% data variables.product.prodname_actions %} の *dependabot.yml* ファイルの例
+
+次の *dependabot.yml* ファイルの例は、{% data variables.product.prodname_actions %} のバージョン更新を設定しています。 `.github/workflows` でワークフローファイルを確認するには、`directory` を `"/"` に設定する必要があります。 `schedule.interval` は `"daily"` に設定します。 このファイルがチェックインまたは更新されると、{% data variables.product.prodname_dependabot %} はアクションの新しいバージョンをチェックします。 {% data variables.product.prodname_dependabot %} は、検出した古いアクションに対してバージョン更新のプルリクエストを生成します。 初期バージョンの更新後、{% data variables.product.prodname_dependabot %} は1日1回、古いバージョンのアクションを引き続きチェックします。
+
+```yaml
+# GitHub Actions の更新スケジュールを設定する
+
+version: 2
+updates:
+
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ # GitHub Actions の更新を毎週確認する
+ interval: "daily"
+```
+
+### {% data variables.product.prodname_dependabot_version_updates %} のアクションを設定する
+
+アクションの {% data variables.product.prodname_dependabot_version_updates %} を有効化する場合は、`package-ecosystem`、`directory`、および `schedule.interval` の値を指定する必要があります。 バージョン更新をさらにカスタマイズするための設定オプションのプロパティは他にもたくさんあります。 詳しい情報については、「[依存関係の更新の設定オプション](/github/administering-a-repository/configuration-options-for-dependency-updates) 」を参照してください。
+
+### 参考リンク
+
+- 「[GitHub Actions について](/actions/getting-started-with-github-actions/about-github-actions)」
diff --git a/translations/ja-JP/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md b/translations/ja-JP/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md
index f831a1f2d7..f0ecc190a6 100644
--- a/translations/ja-JP/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md
+++ b/translations/ja-JP/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md
@@ -9,7 +9,7 @@ versions:
### {% data variables.product.prodname_dependabot %} によって監視されている依存関係を表示する
-バージョン更新を有効にした後、リポジトリの依存関係グラフの [**{% data variables.product.prodname_dependabot_short %}**] タブで、設定が正しいかどうかを確認できます。 詳しい情報については、「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates)」を参照してください。
+バージョン更新を有効にした後、リポジトリの依存関係グラフの [**{% data variables.product.prodname_dependabot %}**] タブで、設定が正しいかどうかを確認できます。 詳しい情報については、「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates)」を参照してください。
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.accessing-repository-graphs %}
@@ -21,5 +21,5 @@ versions:
### Viewing {% data variables.product.prodname_dependabot %} のログファイルを表示する
-1. [**{% data variables.product.prodname_dependabot_short %}**] タブで、[**Last checked *TIME* ago**] をクリックして、{% data variables.product.prodname_dependabot %} が最後のバージョン更新チェック時に生成したログファイルを表示します。 
+1. [**{% data variables.product.prodname_dependabot %}**] タブで、[**Last checked *TIME* ago**] をクリックして、{% data variables.product.prodname_dependabot %} が最後のバージョン更新チェック時に生成したログファイルを表示します。 
2. 必要に応じて、バージョンチェックを再実行するには、[**Check for updates**] をクリックします。 
diff --git a/translations/ja-JP/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md b/translations/ja-JP/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md
index e80309195c..54912bc692 100644
--- a/translations/ja-JP/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md
+++ b/translations/ja-JP/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md
@@ -11,7 +11,7 @@ versions:
{% data reusables.dependabot.pull-request-introduction %}
-{% data variables.product.prodname_dependabot %} がプルリクエストを発行すると、リポジトリに対して選択した方法で通知されます。 Each pull request contains detailed information about the proposed change, taken from the package manager. これらのプルリクエストは、リポジトリで定義されている通常のチェックとテストに従います。 また、十分な情報がある場合は、互換性スコアが表示されます。 これは、変更をマージするかどうかを決める際にも役立ちます。 For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."
+{% data variables.product.prodname_dependabot %} がプルリクエストを発行すると、リポジトリに対して選択した方法で通知されます。 Each pull request contains detailed information about the proposed change, taken from the package manager. これらのプルリクエストは、リポジトリで定義されている通常のチェックとテストに従います。 また、十分な情報がある場合は、互換性スコアが表示されます。 これは、変更をマージするかどうかを決める際にも役立ちます。 For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
管理する依存関係が多数ある場合は、各パッケージマネージャーの設定をカスタマイズして、プルリクエストに特定のレビュー担当者、アサインされた人、ラベルを付けることができます。 詳しい情報については、「[依存関係の更新をカスタマイズする](/github/administering-a-repository/customizing-dependency-updates)」をご覧ください。
diff --git a/translations/ja-JP/content/github/authenticating-to-github/connecting-with-third-party-applications.md b/translations/ja-JP/content/github/authenticating-to-github/connecting-with-third-party-applications.md
index 85e4e1584b..4a7187703a 100644
--- a/translations/ja-JP/content/github/authenticating-to-github/connecting-with-third-party-applications.md
+++ b/translations/ja-JP/content/github/authenticating-to-github/connecting-with-third-party-applications.md
@@ -52,17 +52,17 @@ versions:
{% endtip %}
-| データの種類 | 説明 |
-| --------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| コミットのステータス | サードパーティアプリケーションに、コミットのステータスを報告するためのアクセスを許可できます。 コミットステータスのアクセスがあれば、アプリケーションはビルドが特定のコミットに対して成功したかどうかを判定できます。 アプリケーションは、コードにはアクセスできませんが、特定のコミットに対するステータス情報を読み書きできます。 |
-| デプロイメント | デプロイメントのステータスへアクセスできれば、アプリケーションはパブリックおよびプライベートのリポジトリの特定のコミットに対してデプロイメントが成功したかどうかを判定できます。 アプリケーションは、コードにはアクセスできません。 |
-| Gist | [Gist](https://gist.github.com) アクセスがあれば、アプリケーションはあなたのパブリックおよびシークレット Gist の両方を読み書きできます。 |
-| フック | [webhook](/webhooks) アクセスがあれば、アプリケーションはあなたが管理するリポジトリ上のフックの設定を読み書きできます。 |
-| 通知 | 通知アクセスがあれば、アプリケーションは Issue やプルリクエストへのコメントなど、あなたの {% data variables.product.product_name %}通知を読むことができます。 ただし、アプリケーションはリポジトリ内へはアクセスできません。 |
-| Organization および Team | Organization および Team のアクセスがあれば、アプリケーションは Organization および Team のメンバー構成へのアクセスと管理ができます。 |
-| 個人ユーザデータ | ユーザデータには、名前、メールアドレス、所在地など、ユーザプロファイル内の情報が含まれます。 |
-| リポジトリ | リポジトリ情報には、コントリビュータの名前、あなたが作成したブランチ、リポジトリ内の実際のファイルなどが含まれます。 アプリケーションは、ユーザ単位でパブリックまたはプライベートリポジトリへのアクセスをリクエストできます。 |
-| リポジトリの削除 | アプリケーションはあなたが管理するリポジトリの削除をリクエストできますが、コードにアクセスすることはできません。 |
+| データの種類 | 説明 |
+| --------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| コミットのステータス | サードパーティアプリケーションに、コミットのステータスを報告するためのアクセスを許可できます。 コミットステータスのアクセスがあれば、アプリケーションはビルドが特定のコミットに対して成功したかどうかを判定できます。 アプリケーションは、コードにはアクセスできませんが、特定のコミットに対するステータス情報を読み書きできます。 |
+| デプロイメント | Deployment status access allows applications to determine if a deployment is successful against a specific commit for public and private repositories. Applications won't have access to your code. |
+| Gist | [Gist](https://gist.github.com) アクセスがあれば、アプリケーションはあなたのパブリックおよびシークレット Gist の両方を読み書きできます。 |
+| フック | [webhook](/webhooks) アクセスがあれば、アプリケーションはあなたが管理するリポジトリ上のフックの設定を読み書きできます。 |
+| 通知 | Notification access allows applications to read your {% data variables.product.product_name %} notifications, such as comments on issues and pull requests. ただし、アプリケーションはリポジトリ内へはアクセスできません。 |
+| Organization および Team | Organization および Team のアクセスがあれば、アプリケーションは Organization および Team のメンバー構成へのアクセスと管理ができます。 |
+| 個人ユーザデータ | ユーザデータには、名前、メールアドレス、所在地など、ユーザプロファイル内の情報が含まれます。 |
+| リポジトリ | リポジトリ情報には、コントリビュータの名前、あなたが作成したブランチ、リポジトリ内の実際のファイルなどが含まれます。 アプリケーションは、ユーザ単位でパブリックまたはプライベートリポジトリへのアクセスをリクエストできます。 |
+| リポジトリの削除 | アプリケーションはあなたが管理するリポジトリの削除をリクエストできますが、コードにアクセスすることはできません。 |
### 更新された権限のリクエスト
diff --git a/translations/ja-JP/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md b/translations/ja-JP/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
index 8b54e94d79..6c47b9b822 100644
--- a/translations/ja-JP/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
+++ b/translations/ja-JP/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
@@ -20,18 +20,26 @@ SSH キーを使用するたびにパスフレーズを再入力したくない
{% data reusables.command_line.open_the_multi_os_terminal %}
2. 以下のテキストを貼り付けます。メールアドレスは自分の {% data variables.product.product_name %} メールアドレスに置き換えてください。
```shell
- $ ssh-keygen -t rsa -b 4096 -C "your_email@example.com"
+ $ ssh-keygen -t ed25519 -C "your_email@example.com"
```
+ {% note %}
+
+ **Note:** If you are using a legacy system that doesn't support the Ed25519 algorithm, use:
+ ```shell
+ $ ssh-keygen -t rsa -b 4096 -C "your_email@example.com"
+ ```
+
+ {% endnote %}
これにより、入力したメールアドレスをラベルとして使用して新しい SSH キーが作成されます。
```shell
- > Generating public/private rsa key pair.
+ > Generating public/private ed25519 key pair.
```
3. 「Enter a file in which to save the key」というメッセージが表示されたら、Enter キーを押します。 これにより、デフォルトのファイル場所が受け入れられます。
{% mac %}
```shell
- > Enter a file in which to save the key (/Users/you/.ssh/id_rsa): [Press enter]
+ > Enter a file in which to save the key (/Users/you/.ssh/id_ed25519): [Press enter]
```
{% endmac %}
@@ -39,7 +47,7 @@ SSH キーを使用するたびにパスフレーズを再入力したくない
{% windows %}
```shell
- > Enter a file in which to save the key (/c/Users/you/.ssh/id_rsa):[Press enter]
+ > Enter a file in which to save the key (/c/Users/you/.ssh/id_ed25519):[Press enter]
```
{% endwindows %}
@@ -47,7 +55,7 @@ SSH キーを使用するたびにパスフレーズを再入力したくない
{% linux %}
```shell
- > Enter a file in which to save the key (/home/you/.ssh/id_rsa): [Press enter]
+ > Enter a file in which to save the key (/home/you/.ssh/id_ed25519): [Press enter]
```
{% endlinux %}
@@ -81,18 +89,18 @@ SSH キーを使用するたびにパスフレーズを再入力したくない
$ touch ~/.ssh/config
```
- * `~/.ssh/config` ファイルを開いてファイルを変更し、`id_rsa` キーのデフォルトの場所と名前を使用していない場合は `~/.ssh/id_rsa` を置き換えます。
+ * Open your `~/.ssh/config` file, then modify the file, replacing `~/.ssh/id_ed25519` if you are not using the default location and name for your `id_ed25519` key.
```
Host *
AddKeysToAgent yes
UseKeychain yes
- IdentityFile ~/.ssh/id_rsa
+ IdentityFile ~/.ssh/id_ed25519
```
3. SSH 秘密鍵を ssh-agent に追加して、パスフレーズをキーチェーンに保存します。 {% data reusables.ssh.add-ssh-key-to-ssh-agent %}
```shell
- $ ssh-add -K ~/.ssh/id_rsa
+ $ ssh-add -K ~/.ssh/id_ed25519
```
{% note %}
diff --git a/translations/ja-JP/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md b/translations/ja-JP/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md
index 0992bcaf14..191dcbaa30 100644
--- a/translations/ja-JP/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md
+++ b/translations/ja-JP/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md
@@ -20,6 +20,7 @@ versions:
ユーザをブロックすると、以下のようになります:
- そのユーザによるあなたのフォローは止まります
- ユーザがリポジトリの Watch を停止し、リポジトリのピン留めを解除します
+- The user is not able to join any organizations you are an owner of
- そのユーザによる Star 付けや Issue 割り当てはリポジトリから削除されます。
- リポジトリのユーザのフォークが削除されます
- ユーザのリポジトリのフォークを削除します
diff --git a/translations/ja-JP/content/github/building-a-strong-community/index.md b/translations/ja-JP/content/github/building-a-strong-community/index.md
index a186f0dce3..063f25564d 100644
--- a/translations/ja-JP/content/github/building-a-strong-community/index.md
+++ b/translations/ja-JP/content/github/building-a-strong-community/index.md
@@ -37,6 +37,7 @@ versions:
{% link_in_list /managing-disruptive-comments %}
{% link_in_list /locking-conversations %}
{% link_in_list /limiting-interactions-in-your-repository %}
+ {% link_in_list /limiting-interactions-for-your-user-account %}
{% link_in_list /limiting-interactions-in-your-organization %}
{% link_in_list /tracking-changes-in-a-comment %}
{% link_in_list /managing-how-contributors-report-abuse-in-your-organizations-repository %}
diff --git a/translations/ja-JP/content/github/building-a-strong-community/limiting-interactions-for-your-user-account.md b/translations/ja-JP/content/github/building-a-strong-community/limiting-interactions-for-your-user-account.md
new file mode 100644
index 0000000000..8cd6f9a55a
--- /dev/null
+++ b/translations/ja-JP/content/github/building-a-strong-community/limiting-interactions-for-your-user-account.md
@@ -0,0 +1,26 @@
+---
+title: Limiting interactions for your user account
+intro: 'You can temporarily enforce a period of limited activity for certain users in all public repositories owned by your user account.'
+versions:
+ free-pro-team: '*'
+permissions: Anyone can limit interactions for their own user account.
+---
+
+### About temporary interaction limits
+
+Limiting interactions for your user account enables temporary interaction limits for all public repositories owned by your user account. {% data reusables.community.interaction-limits-restrictions %}
+
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your public repositories.
+
+{% data reusables.community.types-of-interaction-limits %}
+
+When you enable user-wide activity limitations, you can't enable or disable interaction limits on individual repositories. For more information on limiting activity for an individual repository, see "[Limiting interactions in your repository](/articles/limiting-interactions-in-your-repository)."
+
+You can also block users. For more information, see "[Blocking a user from your personal account](/github/building-a-strong-community/blocking-a-user-from-your-personal-account)."
+
+### Limiting interactions for your user account
+
+{% data reusables.user_settings.access_settings %}
+1. In your user settings sidebar, under "Moderation settings", click **Interaction limits**. 
+{% data reusables.community.set-interaction-limit %}
+ ![[Temporary interaction limits] のオプション](/assets/images/help/settings/user-account-temporary-interaction-limits-options.png)
\ No newline at end of file
diff --git a/translations/ja-JP/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md b/translations/ja-JP/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md
index b93a702079..14887424dd 100644
--- a/translations/ja-JP/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md
+++ b/translations/ja-JP/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md
@@ -1,29 +1,37 @@
---
title: Organization での操作を制限する
-intro: 'Organization オーナーは、パブリックリポジトリで特定のユーザがコメントする、Issue をオープンする、あるいはプルリクエストを作成するのを一時的に制限することができます。'
+intro: 'You can temporarily enforce a period of limited activity for certain users in all public repositories owned by your organization.'
redirect_from:
- /github/setting-up-and-managing-organizations-and-teams/limiting-interactions-in-your-organization
- /articles/limiting-interactions-in-your-organization
versions:
free-pro-team: '*'
+permissions: Organization owners can limit interactions in an organization.
---
-24 時間経過すると、ユーザは Organization のパブリックリポジトリで通常のアクティビティを再開できます。 Organization 全体でアクティビティ制限を有効にした場合、個々のリポジトリに対して操作制限を有効化または無効化することはできません。 リポジトリのアクティビティ制限に関する詳しい情報については、「[リポジトリでのインタラクションを制限する](/articles/limiting-interactions-in-your-repository)」を参照してください。
+### About temporary interaction limits
-{% tip %}
+Limiting interactions in your organization enables temporary interaction limits for all public repositories owned by the organization. {% data reusables.community.interaction-limits-restrictions %}
-**ヒント:** Organization のオーナーは特定の期間だけユーザをブロックすることもできます。 ブロックの期間が過ぎると、自動的にユーザのブロックは解除されます。 詳細は「[Organization からユーザをブロックする](/articles/blocking-a-user-from-your-organization)」を参照してください。
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your organization's public repositories.
-{% endtip %}
+{% data reusables.community.types-of-interaction-limits %}
+
+Members of the organization are not affected by any of the limit types.
+
+Organization 全体でアクティビティ制限を有効にした場合、個々のリポジトリに対して操作制限を有効化または無効化することはできません。 For more information on limiting activity for an individual repository, see "[Limiting interactions in your repository](/articles/limiting-interactions-in-your-repository)."
+
+Organization owners can also block users for a specific amount of time. ブロックの期間が過ぎると、自動的にユーザのブロックは解除されます。 詳細は「[Organization からユーザをブロックする](/articles/blocking-a-user-from-your-organization)」を参照してください。
+
+### Organization での操作を制限する
{% data reusables.profile.access_profile %}
{% data reusables.profile.access_org %}
{% data reusables.organizations.org_settings %}
-4. Organization の [Settings] サイドバーで、[**Interaction limits**] をクリックします。 ![Organization の設定での [Interaction limits] ](/assets/images/help/organizations/org-settings-interaction-limits.png)
-5. [Temporary interaction limits] で、次から 1 つ以上のオプションをクリックします。 ![[Temporary interaction limits] のオプション](/assets/images/help/organizations/organization-temporary-interaction-limits-options.png)
- - [**Limit to existing users**]: 作成してから 24 時間経過していないアカウントで、以前のコントリビューションがなく、コラボレーターではない Organization ユーザのアクティビティを制限します。
- - [**Limit to prior contributors**]: これまでにコントリビューションがなく、コラボレーターではない Organization ユーザのアクティビティを制限します。
- - **Limit to repository collaborators**: Limits activity for organization users who do not have write access or are not collaborators.
+1. In the organization settings sidebar, click **Moderation settings**. 
+1. Under "Moderation settings", click **Interaction limits**. 
+{% data reusables.community.set-interaction-limit %}
+ ![[Temporary interaction limits] のオプション](/assets/images/help/organizations/organization-temporary-interaction-limits-options.png)
### 参考リンク
- [悪用あるいはスパムのレポート](/articles/reporting-abuse-or-spam)
diff --git a/translations/ja-JP/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md b/translations/ja-JP/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md
index db4545927e..a30d8176e1 100644
--- a/translations/ja-JP/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md
+++ b/translations/ja-JP/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md
@@ -1,28 +1,32 @@
---
title: リポジトリでのインタラクションを制限する
-intro: 'オーナーまたは管理者のアクセス権を持つユーザは、あなたのパブリックリポジトリで特定のユーザがコメントする、Issue をオープンする、あるいはプルリクエストを作成するのを一時的に制限し、一定の期間、アクティビティ制限を適用することができます。'
+intro: 'You can temporarily enforce a period of limited activity for certain users on a public repository.'
redirect_from:
- /articles/limiting-interactions-with-your-repository/
- /articles/limiting-interactions-in-your-repository
versions:
free-pro-team: '*'
+permissions: People with admin permissions to a repository can temporarily limit interactions in that repository.
---
-24 時間経過すると、ユーザはあなたのリポジトリで通常のアクティビティを再開できます。
+### About temporary interaction limits
-{% tip %}
+{% data reusables.community.interaction-limits-restrictions %}
-**ヒント:** Organization のオーナーは Organization 全体のアクティビティ制限を有効化できます。 Organization 全体のアクティビティ制限が有効な場合、個々のリポジトリについてアクティビティを制限することはできません。 詳細は「[Organization での操作を制限する](/articles/limiting-interactions-in-your-organization)」を参照してください。
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your repository.
-{% endtip %}
+{% data reusables.community.types-of-interaction-limits %}
+
+You can also enable activity limitations on all repositories owned by your user account or an organization. If a user-wide or organization-wide limit is enabled, you can't limit activity for individual repositories owned by the account. For more information, see "[Limiting interactions for your user account](/github/building-a-strong-community/limiting-interactions-for-your-user-account)" and "[Limiting interactions in your organization](/github/building-a-strong-community/limiting-interactions-in-your-organization)."
+
+### リポジトリでのインタラクションを制限する
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
-3. リポジトリの [Settings] サイドバーで、[**Interaction limits**] をクリックします。 ![リポジトリの設定での [Interaction limits] ](/assets/images/help/repository/repo-settings-interaction-limits.png)
-4. [Temporary interaction limits] で、次から 1 つ以上のオプションをクリックします。 ![[Temporary interaction limits] のオプション](/assets/images/help/repository/temporary-interaction-limits-options.png)
- - [**Limit to existing users**]: 作成してから 24 時間経過していないアカウントで、以前のコントリビューションがなく、コラボレーターではないユーザのアクティビティを制限します。
- - [**Limit to prior contributors**]: これまでにコントリビューションがなく、コラボレーターではないユーザのアクティビティを制限します。
- - **Limit to repository collaborators**: Limits activity for users who do not have write access or are not collaborators.
+1. In the left sidebar, click **Moderation settings**. 
+1. Under "Moderation settings", click **Interaction limits**. ![リポジトリの設定での [Interaction limits] ](/assets/images/help/repository/repo-settings-interaction-limits.png)
+{% data reusables.community.set-interaction-limit %}
+ ![[Temporary interaction limits] のオプション](/assets/images/help/repository/temporary-interaction-limits-options.png)
### 参考リンク
- [悪用あるいはスパムのレポート](/articles/reporting-abuse-or-spam)
diff --git a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md
index 11d0204e10..79dfc67957 100644
--- a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md
+++ b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md
@@ -38,6 +38,10 @@ versions:
{% data reusables.pull_requests.resolving-conversations %}
+### Re-requesting a review
+
+{% data reusables.pull_requests.re-request-review %}
+
### 必須のレビュー
{% data reusables.pull_requests.required-reviews-for-prs-summary %}
diff --git a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md
index 2476bd93c8..30f5d59fd8 100644
--- a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md
+++ b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md
@@ -25,6 +25,10 @@ versions:
4. コミットメッセージのフィールドに、ファイルに対する変更内容を説明する、短くわかりやすいコミットメッセージを入力します。 
5. [**Commit changes**] をクリックします。 ![[Commit changes] ボタン](/assets/images/help/pull_requests/commit-changes-button.png)
+### Re-requesting a review
+
+{% data reusables.pull_requests.re-request-review %}
+
### スコープ外の提案に対する Issue のオープン
プルリクエストの変更が提案され、その変更がプルリクエストのスコープ外である場合、フィードバックを追跡するために新しい Issue をオープンすることができます。 詳しい情報については「[コメントからIssueを開く](/github/managing-your-work-on-github/opening-an-issue-from-a-comment)」を参照してください。
diff --git a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md
index c000b7a198..bffbded5f3 100644
--- a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md
+++ b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md
@@ -43,6 +43,12 @@ You can't merge a draft pull request. ドラフトのプルリクエストに関
{% data reusables.files.choose-commit-email %}
+ {% note %}
+
+ **Note:** The email selector is not available for rebase merges, which do not create a merge commit, or for squash merges, which credit the user who created the pull request as the author of the squashed commit.
+
+ {% endnote %}
+
6. [**Confirm merge**]、[**Confirm squash and merge**] をクリックするか、[**Confirm rebase and merge**] をクリックします。
6. また、代わりに[ブランチを削除](/articles/deleting-unused-branches)することもできます。 こうすることで、リポジトリにあるブランチのリストが整理された状態を保てます。
diff --git a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
index 8f4b99f2a7..a8005de239 100644
--- a/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
+++ b/translations/ja-JP/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
@@ -13,7 +13,7 @@ versions:
{% data reusables.command_line.open_the_multi_os_terminal %}
2. ワーキングディレクトリをローカルプロジェクトに変更します。
-3. 上流リポジトリから、ブランチと各ブランチのコミットをフェッチします。 Commits to `main` will be stored in a local branch, `upstream/main`.
+3. 上流リポジトリから、ブランチと各ブランチのコミットをフェッチします。 Commits to `BRANCHNAME` will be stored in the local branch `upstream/BRANCHNAME`.
```shell
$ git fetch upstream
> remote: Counting objects: 75, done.
@@ -23,12 +23,12 @@ versions:
> From https://{% data variables.command_line.codeblock %}/ORIGINAL_OWNER/ORIGINAL_REPOSITORY
> * [new branch] main -> upstream/main
```
-4. Check out your fork's local `main` branch.
+4. Check out your fork's local default branch - in this case, we use `main`.
```shell
$ git checkout main
> Switched to branch 'main'
```
-5. Merge the changes from `upstream/main` into your local `main` branch. This brings your fork's `main` branch into sync with the upstream repository, without losing your local changes.
+5. Merge the changes from the upstream default branch - in this case, `upstream/main` - into your local default branch. This brings your fork's default branch into sync with the upstream repository, without losing your local changes.
```shell
$ git merge upstream/main
> Updating a422352..5fdff0f
diff --git a/translations/ja-JP/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md b/translations/ja-JP/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md
index 2294327fb5..bee23a000d 100644
--- a/translations/ja-JP/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md
+++ b/translations/ja-JP/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md
@@ -61,7 +61,6 @@ If none of the pre-built configurations meet your needs, you can create a custom
- `settings`
- `extensions`
- `forwardPorts`
-- `devPort`
- `postCreateCommand`
#### Docker、Dockerfile、またはイメージ設定
@@ -73,13 +72,9 @@ If none of the pre-built configurations meet your needs, you can create a custom
- `remoteEnv`
- `containerUser`
- `remoteUser`
-- `updateRemoteUserUID`
- `mounts`
-- `workspaceMount`
-- `workspaceFolder`
- `runArgs`
- `overrideCommand`
-- `shutdownAction`
- `dockerComposeFile`
`devcontainer.json` で使用可能な設定の詳細については、{% data variables.product.prodname_vscode %} ドキュメントの「[devcontainer.json の参照](https://aka.ms/vscode-remote/devcontainer.json)」をご覧ください。
diff --git a/translations/ja-JP/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md b/translations/ja-JP/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md
index ff200b39e3..a9d2938c2b 100644
--- a/translations/ja-JP/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md
+++ b/translations/ja-JP/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md
@@ -32,7 +32,7 @@ versions:
`dotfiles` リポジトリへの変更は、新しい codespace ごとにのみ適用され、既存の codespace には影響しません。
-詳しい情報については、{% data variables.product.prodname_vscode %} ドキュメントの「[パーソナライズする](https://docs.microsoft.com/en-us/visualstudio/online/reference/personalizing)」を参照してください。
+詳しい情報については、{% data variables.product.prodname_vscode %} ドキュメントの「[パーソナライズする](https://docs.microsoft.com/visualstudio/online/reference/personalizing)」を参照してください。
{% note %}
diff --git a/translations/ja-JP/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md b/translations/ja-JP/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md
index 764b1dc92a..7ba18b75ad 100644
--- a/translations/ja-JP/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md
+++ b/translations/ja-JP/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md
@@ -32,14 +32,14 @@ versions:
{% data variables.product.prodname_dotcom_the_website %} にミラーされている有名なリポジトリを以下に挙げます:
-- [android](https://github.com/android)
+- [Android Open Source Project](https://github.com/aosp-mirror)
- [The Apache Software Foundation](https://github.com/apache)
- [The Chromium Project](https://github.com/chromium)
-- [The Eclipse Foundation](https://github.com/eclipse)
+- [Eclipse Foundation](https://github.com/eclipse)
- [The FreeBSD Project](https://github.com/freebsd)
-- [The Glasgow Haskell Compiler](https://github.com/ghc)
+- [Glasgow Haskell Compiler](https://github.com/ghc)
- [GNOME](https://github.com/GNOME)
-- [The Linux kernel source tree](https://github.com/torvalds/linux)
+- [Linux kernel source tree](https://github.com/torvalds/linux)
- [Qt](https://github.com/qt)
独自のミラーを設定するために、公式のプロジェクトリポジトリに [post-receive フック](https://git-scm.com/book/en/Customizing-Git-Git-Hooks)を設定して、コミットを {% data variables.product.product_name %} 上にミラーされたリポジトリに自動的にプッシュするようにできます。
diff --git a/translations/ja-JP/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md b/translations/ja-JP/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md
index effb43cd48..4a6f8c2485 100644
--- a/translations/ja-JP/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md
+++ b/translations/ja-JP/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md
@@ -13,7 +13,7 @@ versions:
{% data variables.product.prodname_ghe_server %} を評価するための 45 日間トライアルをリクエストできます。 トライアルは仮想アプライアンスとしてインストールされ、オンプレミスまたはクラウドでのデプロイメントのオプションがあります。 サポートされている仮想化プラットフォームの一覧については「[GitHub Enterprise Server インスタンスをセットアップする](/enterprise/admin/installation/setting-up-a-github-enterprise-server-instance)」を参照してください。
-{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}Security{% endif %} alerts and {% data variables.product.prodname_github_connect %} are not currently available in trials of {% data variables.product.prodname_ghe_server %}. これらの機能のデモについては、{% data variables.contact.contact_enterprise_sales %} にお問い合わせください。 これらの機能の詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」 および「[{% data variables.product.prodname_ghe_server %} を {% data variables.product.prodname_dotcom_the_website %} に接続する](/enterprise/admin/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)」を参照してください。
+{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}Security{% endif %} alerts and {% data variables.product.prodname_github_connect %} are not currently available in trials of {% data variables.product.prodname_ghe_server %}. これらの機能のデモについては、{% data variables.contact.contact_enterprise_sales %} にお問い合わせください。 これらの機能の詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」 および「[{% data variables.product.prodname_ghe_server %} を {% data variables.product.prodname_dotcom_the_website %} に接続する](/enterprise/admin/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)」を参照してください。
{% data variables.product.prodname_ghe_cloud %} のトライアルも利用できます。 詳しい情報については、「[{% data variables.product.prodname_ghe_cloud %} のトライアルを設定する](/articles/setting-up-a-trial-of-github-enterprise-cloud)」を参照してください。
diff --git a/translations/ja-JP/content/github/managing-large-files/removing-files-from-a-repositorys-history.md b/translations/ja-JP/content/github/managing-large-files/removing-files-from-a-repositorys-history.md
index a7404fdecd..8a2fca0ff1 100644
--- a/translations/ja-JP/content/github/managing-large-files/removing-files-from-a-repositorys-history.md
+++ b/translations/ja-JP/content/github/managing-large-files/removing-files-from-a-repositorys-history.md
@@ -16,10 +16,6 @@ versions:
{% endwarning %}
-### 以前のコミットで追加されたファイルを削除する
-
-以前のコミットでファイルを追加した場合は、リポジトリの履歴から削除する必要があります。 リポジトリの履歴からファイルを削除するには、BFG Repo-Cleaner または `git filter-branch` コマンドを使用できます。 詳細は「[機密データをリポジトリから削除する](/github/authenticating-to-github/removing-sensitive-data-from-a-repository)」を参照してください。
-
### プッシュされていない直近のコミットで追加されたファイルを削除する
ファイルが直近のコミットで追加され、{% data variables.product.product_location %} にプッシュしていない場合は、ファイルを削除してコミットを修正することができます。
@@ -43,3 +39,7 @@ versions:
$ git push
# 書き換えられサイズが小さくなったコミットをプッシュする
```
+
+### 以前のコミットで追加されたファイルを削除する
+
+以前のコミットでファイルを追加した場合は、リポジトリの履歴から削除する必要があります。 リポジトリの履歴からファイルを削除するには、BFG Repo-Cleaner または `git filter-branch` コマンドを使用できます。 詳細は「[機密データをリポジトリから削除する](/github/authenticating-to-github/removing-sensitive-data-from-a-repository)」を参照してください。
diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md
index 2056d1ac51..c0f46c3657 100644
--- a/translations/ja-JP/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md
+++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md
@@ -17,7 +17,7 @@ When your code depends on a package that has a security vulnerability, this vuln
### Detection of vulnerable dependencies
- {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %} detects vulnerable dependencies and sends {% data variables.product.prodname_dependabot_short %} alerts{% else %}{% data variables.product.product_name %} detects vulnerable dependencies and sends security alerts{% endif %} when:
+ {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %} detects vulnerable dependencies and sends {% data variables.product.prodname_dependabot_alerts %}{% else %}{% data variables.product.product_name %} detects vulnerable dependencies and sends security alerts{% endif %} when:
{% if currentVersion == "free-pro-team@latest" %}
- A new vulnerability is added to the {% data variables.product.prodname_advisory_database %}. For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)."
@@ -49,11 +49,11 @@ You can also enable or disable {% data variables.product.prodname_dependabot_ale
{% endif %}
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
-When {% data variables.product.product_name %} identifies a vulnerable dependency, we generate a {% data variables.product.prodname_dependabot_short %} alert and display it on the Security tab for the repository. The alert includes a link to the affected file in the project, and information about a fixed version. {% data variables.product.product_name %} also notifies the maintainers of affected repositories about the new alert according to their notification preferences. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."
+When {% data variables.product.product_name %} identifies a vulnerable dependency, we generate a {% data variables.product.prodname_dependabot %} alert and display it on the Security tab for the repository. The alert includes a link to the affected file in the project, and information about a fixed version. {% data variables.product.product_name %} also notifies the maintainers of affected repositories about the new alert according to their notification preferences. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."
{% endif %}
{% if currentVersion == "free-pro-team@latest" %}
-For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, the alert may also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."
+For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, the alert may also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
{% endif %}
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %}
@@ -66,12 +66,12 @@ When {% data variables.product.product_name %} identifies a vulnerable dependenc
{% endwarning %}
-### Access to {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts
+### Access to {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts
You can see all of the alerts that affect a particular project{% if currentVersion == "free-pro-team@latest" %} on the repository's Security tab or{% endif %} in the repository's dependency graph.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)."{% endif %}
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
-By default, we notify people with admin permissions in the affected repositories about new {% data variables.product.prodname_dependabot_short %} alerts.{% endif %} {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. You can also make {% data variables.product.prodname_dependabot_short %} alerts visible to additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)."
+By default, we notify people with admin permissions in the affected repositories about new {% data variables.product.prodname_dependabot_alerts %}.{% endif %} {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. You can also make {% data variables.product.prodname_dependabot_alerts %} visible to additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-dependabot-alerts)."
{% endif %}
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %}
@@ -83,6 +83,6 @@ We send security alerts to people with admin permissions in the affected reposit
{% if currentVersion == "free-pro-team@latest" %}
### Further reading
-- "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)"
+- "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)"
- "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)"
- "[Understanding how {% data variables.product.product_name %} uses and protects your data](/categories/understanding-how-github-uses-and-protects-your-data)"{% endif %}
diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/about-dependabot-security-updates.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/about-dependabot-security-updates.md
new file mode 100644
index 0000000000..a9d9d757dd
--- /dev/null
+++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/about-dependabot-security-updates.md
@@ -0,0 +1,35 @@
+---
+title: About Dependabot security updates
+intro: '{% data variables.product.prodname_dependabot %} can fix vulnerable dependencies for you by raising pull requests with security updates.'
+shortTitle: About Dependabot security updates
+redirect_from:
+ - /github/managing-security-vulnerabilities/about-github-dependabot-security-updates
+versions:
+ free-pro-team: '*'
+---
+
+### {% data variables.product.prodname_dependabot_security_updates %} について
+
+{% data variables.product.prodname_dependabot_security_updates %} make it easier for you to fix vulnerable dependencies in your repository. If you enable this feature, when a {% data variables.product.prodname_dependabot %} alert is raised for a vulnerable dependency in the dependency graph of your repository, {% data variables.product.prodname_dependabot %} automatically tries to fix it. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)."
+
+{% data variables.product.prodname_dependabot %} checks whether it's possible to upgrade the vulnerable dependency to a fixed version without disrupting the dependency graph for the repository. Then {% data variables.product.prodname_dependabot %} raises a pull request to update the dependency to the minimum version that includes the patch and links the pull request to the {% data variables.product.prodname_dependabot %} alert, or reports an error on the alert. For more information, see "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)."
+
+{% note %}
+
+**注釈**
+
+The {% data variables.product.prodname_dependabot_security_updates %} feature is available for repositories where you have enabled the dependency graph and {% data variables.product.prodname_dependabot_alerts %}. You will see a {% data variables.product.prodname_dependabot %} alert for every vulnerable dependency identified in your full dependency graph. However, security updates are triggered only for dependencies that are specified in a manifest or lock file. {% data variables.product.prodname_dependabot %} is unable to update an indirect or transitive dependency that is not explicitly defined. 詳しい情報については、「[依存関係グラフについて](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#dependencies-included)」を参照してください。
+
+{% endnote %}
+
+### About pull requests for security updates
+
+Each pull request contains everything you need to quickly and safely review and merge a proposed fix into your project. これには、リリースノート、変更ログエントリ、コミットの詳細などの脆弱性に関する情報が含まれます。 Details of which vulnerability a pull request resolves are hidden from anyone who does not have access to {% data variables.product.prodname_dependabot_alerts %} for the repository.
+
+When you merge a pull request that contains a security update, the corresponding {% data variables.product.prodname_dependabot %} alert is marked as resolved for your repository. For more information about {% data variables.product.prodname_dependabot %} pull requests, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates)."
+
+{% data reusables.dependabot.automated-tests-note %}
+
+### 互換性スコアについて
+
+{% data variables.product.prodname_dependabot_security_updates %} may include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. These are calculated from CI tests in other public repositories where the same security update has been generated. An update's compatibility score is the percentage of CI runs that passed when updating between specific versions of the dependency.
diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-dependabot-security-updates.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-dependabot-security-updates.md
new file mode 100644
index 0000000000..7c3f8d2977
--- /dev/null
+++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-dependabot-security-updates.md
@@ -0,0 +1,60 @@
+---
+title: Configuring Dependabot security updates
+intro: '{% data variables.product.prodname_dependabot_security_updates %} または手動のプルリクエストを使用して、脆弱性のある依存関係を簡単に更新できます。'
+shortTitle: Configuring Dependabot security updates
+redirect_from:
+ - /articles/configuring-automated-security-fixes
+ - /github/managing-security-vulnerabilities/configuring-automated-security-fixes
+ - /github/managing-security-vulnerabilities/configuring-automated-security-updates
+ - /github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates
+versions:
+ free-pro-team: '*'
+---
+
+### About configuring {% data variables.product.prodname_dependabot_security_updates %}
+
+You can enable {% data variables.product.prodname_dependabot_security_updates %} for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
+
+個々のリポジトリ、またはユーザアカウントまたは Organization が所有するすべてのリポジトリに対して {% data variables.product.prodname_dependabot_security_updates %} を無効にすることができます。 詳しい情報については、以下の「[リポジトリの {% data variables.product.prodname_dependabot_security_updates %} を管理する](#managing-dependabot-security-updates-for-your-repositories)」を参照してください。
+
+{% data reusables.dependabot.dependabot-tos %}
+
+### サポートされているリポジトリ
+
+{% data variables.product.prodname_dotcom %} は、これらの前提条件を満たすすべてのリポジトリに対して {% data variables.product.prodname_dependabot_security_updates %} を自動的に有効にします。
+
+{% note %}
+
+**Note**: You can manually enable {% data variables.product.prodname_dependabot_security_updates %}, even if the repository doesn't meet some of the prerequisites below. For example, you can enable {% data variables.product.prodname_dependabot_security_updates %} on a fork, or for a package manager that isn't directly supported by following the instructions in "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories](#managing-dependabot-security-updates-for-your-repositories)."
+
+{% endnote %}
+
+| 自動有効化の前提条件 | 詳細情報 |
+| ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- |
+| リポジトリがフォークではない | 「[フォークについて](/github/collaborating-with-issues-and-pull-requests/about-forks)」 |
+| リポジトリがアーカイブされていない | 「[リポジトリをアーカイブする](/github/creating-cloning-and-archiving-repositories/archiving-repositories)」 |
+| リポジトリがパブリックである、またはリポジトリがプライベートであり、リポジトリの設定で {% data variables.product.prodname_dotcom %}、依存関係グラフ、および脆弱性アラートによる読み取り専用分析が有効化されている | 「[プライベートリポジトリのデータ使用設定を管理する](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)」 |
+| リポジトリに {% data variables.product.prodname_dotcom %} がサポートするパッケージエコシステムの依存関係マニフェストファイルが含まれている | 「[サポートされているパッケージエコシステム](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)」 |
+| {% data variables.product.prodname_dependabot_security_updates %} がリポジトリに対して無効になっていない | 「[リポジトリの {% data variables.product.prodname_dependabot_security_updates %} を管理する](#managing-dependabot-security-updates-for-your-repositories)」 |
+| リポジトリが依存関係管理の統合をまだ使用していない | "[インテグレーションについて](/github/customizing-your-github-workflow/about-integrations)" |
+
+リポジトリでセキュリティアップデートが有効になっておらず、理由が不明の場合は、まず以下の手順のセクションに記載されている指示に従って有効にしてみてください。 それでもセキュリティアップデートが機能しない場合は、[サポートにお問い合わせください](https://support.github.com/contact)。
+
+### リポジトリの {% data variables.product.prodname_dependabot_security_updates %} を管理する
+
+個別のリポジトリに対して {% data variables.product.prodname_dependabot_security_updates %} を有効または無効にできます。
+
+ユーザアカウントまたは Organization が所有するすべてのリポジトリの {% data variables.product.prodname_dependabot_security_updates %} を有効または無効にすることもできます。 詳しい情報については、「[ユーザーアカウントのセキュリティおよび分析設定を管理する](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)」または「[Organization のセキュリティおよび分析設定を管理する](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)」を参照してください。
+
+{% data variables.product.prodname_dependabot_security_updates %} には特定のリポジトリ設定が必要です。 詳しい情報については、「[サポートされているリポジトリについて](#supported-repositories)」を参照してください。
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-security %}
+{% data reusables.repositories.sidebar-dependabot-alerts %}
+1. アラート一覧の上にあるドロップダウンメニューで [**{% data variables.product.prodname_dependabot %} security updates**] を選択または選択解除します。 
+
+### 参考リンク
+
+- 「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」
+- 「[プライベートリポジトリのデータ使用設定を管理する](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)」
+- 「[サポートされているパッケージエコシステム](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)」
diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md
index 3baa928812..ee448d5896 100644
--- a/translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md
+++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md
@@ -1,7 +1,7 @@
---
title: Configuring notifications for vulnerable dependencies
shortTitle: 通知を設定する
-intro: 'Optimize how you receive notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts.'
+intro: 'Optimize how you receive notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts.'
versions:
free-pro-team: '*'
enterprise-server: '>=2.21'
@@ -9,10 +9,10 @@ versions:
### About notifications for vulnerable dependencies
-{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we generate a {% data variables.product.prodname_dependabot_short %} alert and display it on the Security tab for the repository. {% data variables.product.product_name %} notifies the maintainers of affected repositories about the new alert according to their notification preferences.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot_short %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability.
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we generate a {% data variables.product.prodname_dependabot %} alert and display it on the Security tab for the repository. {% data variables.product.product_name %} notifies the maintainers of affected repositories about the new alert according to their notification preferences.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability.
{% endif %}
-{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_short %} alerts for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)."
+{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)."
{% endif %}
{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.21" %}
@@ -23,7 +23,7 @@ Your site administrator needs to enable security alerts for vulnerable dependenc
By default, if your site administrator has configured email for notifications on your enterprise, you will receive
{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} by email.{% endif %}
-{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
+{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. 詳しい情報については、「[{% data variables.product.prodname_ghe_server %}の脆弱性のある依存関係に関するセキュリティアラートの有効化](/enterprise/{{ currentVersion }}/admin/installation/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server)」を参照してください。 {% endif %}
@@ -35,14 +35,14 @@ You can configure notification settings for yourself or your organization from t
{% data reusables.notifications.vulnerable-dependency-notification-options %}
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
- 
+ 
{% else %}

{% endif %}
{% note %}
-**Note:** You can filter your {% data variables.product.company_short %} inbox notifications to show {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. 詳しい情報については「[インボックスからの通知の管理](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)」を参照してください。
+**Note:** You can filter your {% data variables.product.company_short %} inbox notifications to show {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %} security{% endif %} alerts. 詳しい情報については「[インボックスからの通知の管理](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)」を参照してください。
{% endnote %}
diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/index.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/index.md
index 73b4a8ea29..655eb0db33 100644
--- a/translations/ja-JP/content/github/managing-security-vulnerabilities/index.md
+++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/index.md
@@ -30,9 +30,9 @@ versions:
{% link_in_list /about-alerts-for-vulnerable-dependencies %}
{% link_in_list /configuring-notifications-for-vulnerable-dependencies %}
- {% link_in_list /about-github-dependabot-security-updates %}
- {% link_in_list /configuring-github-dependabot-security-updates %}
+ {% link_in_list /about-dependabot-security-updates %}
+ {% link_in_list /configuring-dependabot-security-updates %}
{% link_in_list /viewing-and-updating-vulnerable-dependencies-in-your-repository %}
{% link_in_list /troubleshooting-the-detection-of-vulnerable-dependencies %}
- {% link_in_list /troubleshooting-github-dependabot-errors %}
+ {% link_in_list /troubleshooting-dependabot-errors %}
diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors.md
new file mode 100644
index 0000000000..6bd20667d0
--- /dev/null
+++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors.md
@@ -0,0 +1,84 @@
+---
+title: Troubleshooting Dependabot errors
+intro: 'Sometimes {% data variables.product.prodname_dependabot %} is unable to raise a pull request to update your dependencies. You can review the error and unblock {% data variables.product.prodname_dependabot %}.'
+shortTitle: エラーのトラブルシューティング
+redirect_from:
+ - /github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.dependabot.beta-note %}
+
+### About {% data variables.product.prodname_dependabot %} errors
+
+{% data reusables.dependabot.pull-request-introduction %}
+
+If anything prevents {% data variables.product.prodname_dependabot %} from raising a pull request, this is reported as an error.
+
+### Investigating errors with {% data variables.product.prodname_dependabot_security_updates %}
+
+When {% data variables.product.prodname_dependabot %} is blocked from creating a pull request to fix a {% data variables.product.prodname_dependabot %} alert, it posts the error message on the alert. The {% data variables.product.prodname_dependabot_alerts %} view shows a list of any alerts that have not been resolved yet. To access the alerts view, click **{% data variables.product.prodname_dependabot_alerts %}** on the **Security** tab for the repository. Where a pull request that will fix the vulnerable dependency has been generated, the alert includes a link to that pull request.
+
+
+
+There are three reasons why an alert may have no pull request link:
+
+1. {% data variables.product.prodname_dependabot_security_updates %} are not enabled for the repository.
+1. The alert is for an indirect or transitive dependency that is not explicitly defined in a lock file.
+1. An error blocked {% data variables.product.prodname_dependabot %} from creating a pull request.
+
+If an error blocked {% data variables.product.prodname_dependabot %} from creating a pull request, you can display details of the error by clicking the alert.
+
+
+
+### Investigating errors with {% data variables.product.prodname_dependabot_version_updates %}
+
+When {% data variables.product.prodname_dependabot %} is blocked from creating a pull request to update a dependency in an ecosystem, it posts the error icon on the manifest file. The manifest files that are managed by {% data variables.product.prodname_dependabot %} are listed on the {% data variables.product.prodname_dependabot %} tab. To access this tab, on the **Insights** tab for the repository click **Dependency graph**, and then click the **{% data variables.product.prodname_dependabot %}** tab.
+
+
+
+To see the log file for any manifest file, click the **Last checked TIME ago** link. When you display the log file for a manifest that's shown with an error symbol (for example, Maven in the screenshot above), any errors are also displayed.
+
+
+
+### Understanding {% data variables.product.prodname_dependabot %} errors
+
+Pull requests for security updates act to upgrade a vulnerable dependency to the minimum version that includes a fix for the vulnerability. In contrast, pull requests for version updates act to upgrade a dependency to the latest version allowed by the package manifest and {% data variables.product.prodname_dependabot %} configuration files. Consequently, some errors are specific to one type of update.
+
+#### {% data variables.product.prodname_dependabot %} cannot update DEPENDENCY to a non-vulnerable version
+
+**Security updates only.** {% data variables.product.prodname_dependabot %} cannot create a pull request to update the vulnerable dependency to a secure version without breaking other dependencies in the dependency graph for this repository.
+
+Every application that has dependencies has a dependency graph, that is, a directed acyclic graph of every package version that the application directly or indirectly depends on. Every time a dependency is updated, this graph must resolve otherwise the application won't build. When an ecosystem has a deep and complex dependency graph, for example, npm and RubyGems, it is often impossible to upgrade a single dependency without upgrading the whole ecosystem.
+
+The best way to avoid this problem is to stay up to date with the most recently released versions, for example, by enabling version updates. This increases the likelihood that a vulnerability in one dependency can be resolved by a simple upgrade that doesn't break the dependency graph. 詳しい情報については、「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates)」を参照してください。
+
+#### {% data variables.product.prodname_dependabot %} cannot update to the required version as there is already an open pull request for the latest version
+
+**Security updates only.** {% data variables.product.prodname_dependabot %} will not create a pull request to update the vulnerable dependency to a secure version because there is already an open pull request to update this dependency. You will see this error when a vulnerability is detected in a single dependency and there's already an open pull request to update the dependency to the latest version.
+
+There are two options: you can review the open pull request and merge it as soon as you are confident that the change is safe, or close that pull request and trigger a new security update pull request. For more information, see "[Triggering a {% data variables.product.prodname_dependabot %} pull request manually](#triggering-a-dependabot-pull-request-manually)."
+
+#### {% data variables.product.prodname_dependabot %} timed out during its update
+
+{% data variables.product.prodname_dependabot %} took longer than the maximum time allowed to assess the update required and prepare a pull request. This error is usually seen only for large repositories with many manifest files, for example, npm or yarn monorepo projects with hundreds of *package.json* files. Updates to the Composer ecosystem also take longer to assess and may time out.
+
+This error is difficult to address. If a version update times out, you could specify the most important dependencies to update using the `allow` parameter or, alternatively, use the `ignore` parameter to exclude some dependencies from updates. Updating your configuration might allow {% data variables.product.prodname_dependabot %} to review the version update and generate the pull request in the time available.
+
+If a security update times out, you can reduce the chances of this happening by keeping the dependencies updated, for example, by enabling version updates. 詳しい情報については、「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates)」を参照してください。
+
+#### {% data variables.product.prodname_dependabot %} cannot open any more pull requests
+
+There's a limit on the number of open pull requests {% data variables.product.prodname_dependabot %} will generate. When this limit is reached, no new pull requests are opened and this error is reported. The best way to resolve this error is to review and merge some of the open pull requests.
+
+There are separate limits for security and version update pull requests, so that open version update pull requests cannot block the creation of a security update pull request. The limit for security update pull requests is 10. By default, the limit for version updates is 5 but you can change this using the `open-pull-requests-limit` parameter in the configuration file. 詳しい情報については、「[依存関係の更新の設定オプション](/github/administering-a-repository/configuration-options-for-dependency-updates#open-pull-requests-limit) 」を参照してください。
+
+The best way to resolve this error is to merge or close some of the existing pull requests and trigger a new pull request manually. For more information, see "[Triggering a {% data variables.product.prodname_dependabot %} pull request manually](#triggering-a-dependabot-pull-request-manually)."
+
+### Triggering a {% data variables.product.prodname_dependabot %} pull request manually
+
+If you unblock {% data variables.product.prodname_dependabot %}, you can manually trigger a fresh attempt to create a pull request.
+
+- **Security updates**—display the {% data variables.product.prodname_dependabot %} alert that shows the error you have fixed and click **Create {% data variables.product.prodname_dependabot %} security update**.
+- **Version updates**—display the log file for the manifest that shows the error that you have fixed and click **Check for updates**.
diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md
index be6f18eeb9..73e7d03487 100644
--- a/translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md
+++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md
@@ -14,14 +14,14 @@ The results of dependency detection reported by {% data variables.product.produc
* {% data variables.product.prodname_advisory_database %} is one of the data sources that {% data variables.product.prodname_dotcom %} uses to identify vulnerable dependencies. It's a free, curated database of vulnerability information for common package ecosystems on {% data variables.product.prodname_dotcom %}. It includes both data reported directly to {% data variables.product.prodname_dotcom %} from {% data variables.product.prodname_security_advisories %}, as well as official feeds and community sources. This data is reviewed and curated by {% data variables.product.prodname_dotcom %} to ensure that false or unactionable information is not shared with the development community. For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)" and "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)."
* The dependency graph parses all known package manifest files in a user’s repository. For example, for npm it will parse the _package-lock.json_ file. It constructs a graph of all of the repository’s dependencies and public dependents. This happens when you enable the dependency graph and when anyone pushes to the default branch, and it includes commits that makes changes to a supported manifest format. 詳しい情報については、「[依存関係グラフについて](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)」を参照してください。
-* {% data variables.product.prodname_dependabot_short %} scans any push, to the default branch, that contains a manifest file. When a new vulnerability record is added, it scans all existing repositories and generates an alert for each vulnerable repository. {% data variables.product.prodname_dependabot_short %} alerts are aggregated at the repository level, rather than creating one alert per vulnerability. 詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」を参照してください。
-* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot_short %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)."
+* {% data variables.product.prodname_dependabot %} scans any push, to the default branch, that contains a manifest file. When a new vulnerability record is added, it scans all existing repositories and generates an alert for each vulnerable repository. {% data variables.product.prodname_dependabot_alerts %} are aggregated at the repository level, rather than creating one alert per vulnerability. 詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」を参照してください。
+* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)."
- {% data variables.product.prodname_dependabot_short %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database.
+ {% data variables.product.prodname_dependabot %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database.
### Why don't I get vulnerability alerts for some ecosystems?
-{% data variables.product.prodname_dotcom %} limits its support for vulnerability alerts to a set of ecosystems where we can provide high-quality, actionable data. Curated vulnerabilities in the {% data variables.product.prodname_advisory_database %}, the dependency graph, {% data variables.product.prodname_dependabot_short %} alerts, and {% data variables.product.prodname_dependabot_short %} security updates are provided for several ecosystems, including Java’s Maven, JavaScript’s npm and Yarn, .NET’s NuGet, Python’s pip, Ruby's RubyGems, and PHP’s Composer. We'll continue to add support for more ecosystems over time. For an overview of the package ecosystems that we support, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)."
+{% data variables.product.prodname_dotcom %} limits its support for vulnerability alerts to a set of ecosystems where we can provide high-quality, actionable data. Curated vulnerabilities in the {% data variables.product.prodname_advisory_database %}, the dependency graph, {% data variables.product.prodname_dependabot_alerts %}, and {% data variables.product.prodname_dependabot %} security updates are provided for several ecosystems, including Java’s Maven, JavaScript’s npm and Yarn, .NET’s NuGet, Python’s pip, Ruby's RubyGems, and PHP’s Composer. We'll continue to add support for more ecosystems over time. For an overview of the package ecosystems that we support, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)."
It's worth noting that [{% data variables.product.prodname_dotcom %} Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories) may exist for other ecosystems. The information in a security advisory is provided by the maintainers of a particular repository. This data is not curated in the same way as information for the supported ecosystems.
@@ -31,7 +31,7 @@ It's worth noting that [{% data variables.product.prodname_dotcom %} Security Ad
The dependency graph includes information on dependencies that are explicitly declared in your environment. That is, dependencies that are specified in a manifest or a lockfile. The dependency graph generally also includes transitive dependencies, even when they aren't specified in a lockfile, by looking at the dependencies of the dependencies in a manifest file.
-{% data variables.product.prodname_dependabot_short %} alerts advise you about dependencies you should update, including transitive dependencies, where the version can be determined from a manifest or a lockfile. {% data variables.product.prodname_dependabot_short %} security updates only suggests a change where it can directly "fix" the dependency, that is, when these are:
+{% data variables.product.prodname_dependabot_alerts %} advise you about dependencies you should update, including transitive dependencies, where the version can be determined from a manifest or a lockfile. {% data variables.product.prodname_dependabot %} security updates only suggests a change where it can directly "fix" the dependency, that is, when these are:
* Direct dependencies explicitly declared in a manifest or lockfile
* Transitive dependencies declared in a lockfile
@@ -51,21 +51,21 @@ Yes, the dependency graph has two categories of limits:
1. **Processing limits**
- These affect the dependency graph displayed within {% data variables.product.prodname_dotcom %} and also prevent {% data variables.product.prodname_dependabot_short %} alerts being created.
+ These affect the dependency graph displayed within {% data variables.product.prodname_dotcom %} and also prevent {% data variables.product.prodname_dependabot_alerts %} being created.
- Manifests over 0.5 MB in size are only processed for enterprise accounts. For other accounts, manifests over 0.5 MB are ignored and will not create {% data variables.product.prodname_dependabot_short %} alerts.
+ Manifests over 0.5 MB in size are only processed for enterprise accounts. For other accounts, manifests over 0.5 MB are ignored and will not create {% data variables.product.prodname_dependabot_alerts %}.
- By default, {% data variables.product.prodname_dotcom %} will not process more than 20 manifests per repository. {% data variables.product.prodname_dependabot_short %} alerts are not be created for manifests beyond this limit. If you need to increase the limit, contact {% data variables.contact.contact_support %}.
+ By default, {% data variables.product.prodname_dotcom %} will not process more than 20 manifests per repository. {% data variables.product.prodname_dependabot_alerts %} are not be created for manifests beyond this limit. If you need to increase the limit, contact {% data variables.contact.contact_support %}.
2. **Visualization limits**
- These affect what's displayed in the dependency graph within {% data variables.product.prodname_dotcom %}. However, they don't affect the {% data variables.product.prodname_dependabot_short %} alerts that are created.
+ These affect what's displayed in the dependency graph within {% data variables.product.prodname_dotcom %}. However, they don't affect the {% data variables.product.prodname_dependabot_alerts %} that are created.
- The Dependencies view of the dependency graph for a repository only displays 100 manifests. Typically this is adequate as it is significantly higher than the processing limit described above. In situations where the processing limit is over 100, {% data variables.product.prodname_dependabot_short %} alerts are still created for any manifests that are not shown within {% data variables.product.prodname_dotcom %}.
+ The Dependencies view of the dependency graph for a repository only displays 100 manifests. Typically this is adequate as it is significantly higher than the processing limit described above. In situations where the processing limit is over 100, {% data variables.product.prodname_dependabot_alerts %} are still created for any manifests that are not shown within {% data variables.product.prodname_dotcom %}.
**Check**: Is the missing dependency in a manifest file that's over 0.5 MB, or in a repository with a large number of manifests?
-### Does {% data variables.product.prodname_dependabot_short %} generate alerts for vulnerabilities that have been known for many years?
+### Does {% data variables.product.prodname_dependabot %} generate alerts for vulnerabilities that have been known for many years?
The {% data variables.product.prodname_advisory_database %} was launched in November 2019, and initially back-filled to include vulnerability information for the supported ecosystems, starting from 2017. When adding CVEs to the database, we prioritize curating newer CVEs, and CVEs affecting newer versions of software.
@@ -77,19 +77,19 @@ Some information on older vulnerabilities is available, especially where these C
Some third-party tools use uncurated CVE data that isn't checked or filtered by a human. This means that CVEs with tagging or severity errors, or other quality issues, will cause more frequent, more noisy, and less useful alerts.
-Since {% data variables.product.prodname_dependabot_short %} uses curated data in the {% data variables.product.prodname_advisory_database %}, the volume of alerts may be lower, but the alerts you do receive will be accurate and relevant.
+Since {% data variables.product.prodname_dependabot %} uses curated data in the {% data variables.product.prodname_advisory_database %}, the volume of alerts may be lower, but the alerts you do receive will be accurate and relevant.
### Does each dependency vulnerability generate a separate alert?
When a dependency has multiple vulnerabilities, only one aggregated alert is generated for that dependency, instead of one alert per vulnerability.
-The {% data variables.product.prodname_dependabot_short %} alerts count in {% data variables.product.prodname_dotcom %} shows a total for the number of alerts, that is, the number of dependencies with vulnerabilities, not the number of vulnerabilities.
+The {% data variables.product.prodname_dependabot_alerts %} count in {% data variables.product.prodname_dotcom %} shows a total for the number of alerts, that is, the number of dependencies with vulnerabilities, not the number of vulnerabilities.
-
+
When you click to display the alert details, you can see how many vulnerabilities are included in the alert.
-
+
**Check**: If there is a discrepancy in the totals you are seeing, check that you are not comparing alert numbers with vulnerability numbers.
@@ -98,4 +98,4 @@ When you click to display the alert details, you can see how many vulnerabilitie
- 「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」
- [リポジトリ内の脆弱な依存関係を表示・更新する](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)
- "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)"
-- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)"
+- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)"
diff --git a/translations/ja-JP/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/translations/ja-JP/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
index 53aae6cd4a..a91201887f 100644
--- a/translations/ja-JP/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
+++ b/translations/ja-JP/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
@@ -11,11 +11,11 @@ versions:
リポジトリの {% data variables.product.prodname_dependabot %} アラートタブには、オープンおよびクローズしている {% data variables.product.prodname_dependabot_alerts %}、および対応する {% data variables.product.prodname_dependabot_security_updates %} がすべて一覧表示されます。 ドロップダウンメニューを使用してアラートのリストを並べ替えることができます。また、特定のアラートをクリックしてその詳細を表示することもできます。 詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」を参照してください。
-{% data variables.product.prodname_dependabot_alerts %} と依存関係グラフを使用するリポジトリの自動セキュリティ更新を有効にすることができます。 詳しい情報については、「[{% data variables.product.prodname_dependabot_security_updates %} について](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)」を参照してください。
+{% data variables.product.prodname_dependabot_alerts %} と依存関係グラフを使用するリポジトリの自動セキュリティ更新を有効にすることができます。 For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
### リポジトリ内の脆弱性のある依存関係の更新について
-{% data variables.product.product_name %} generates {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. {% data variables.product.prodname_dependabot_security_updates %} が有効になっているリポジトリで {% data variables.product.product_name %} が脆弱性のある依存関係を検出すると、{% data variables.product.prodname_dependabot_short %} はプルリクエストを作成して修正します。 プルリクエストは、脆弱性を回避するために必要最低限の安全なバージョンに依存関係をアップグレードします。
+{% data variables.product.product_name %} generates {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. {% data variables.product.prodname_dependabot_security_updates %} が有効になっているリポジトリで {% data variables.product.product_name %} が脆弱性のある依存関係を検出すると、{% data variables.product.prodname_dependabot %} はプルリクエストを作成して修正します。 プルリクエストは、脆弱性を回避するために必要最低限の安全なバージョンに依存関係をアップグレードします。
### 脆弱性のある依存関係を表示して更新する
@@ -24,14 +24,14 @@ versions:
{% data reusables.repositories.sidebar-dependabot-alerts %}
1. 表示したいアラートをクリックします。 
1. 脆弱性の詳細を確認し、可能な場合は、自動セキュリティアップデートを含むプルリクエストを確認します。
-1. 必要に応じて、アラートに対する {% data variables.product.prodname_dependabot_security_updates %} アップデートがまだ入手できない場合、脆弱性を解決するプルリクエストを作成するには、[**Create {% data variables.product.prodname_dependabot_short %} security update**] をクリックします。 
-1. 依存関係を更新して脆弱性を解決する準備ができたら、プルリクエストをマージしてください。 {% data variables.product.prodname_dependabot_short %} によって発行される各プルリクエストには、{% data variables.product.prodname_dependabot_short %} の制御に使用できるコマンドの情報が含まれています。 詳しい情報については、「[依存関係の更新に関するプルリクエストを管理する](/github/administering-a-repository/managing-pull-requests-for-dependency-updates#managing-github-dependabot-pull-requests-with-comment-commands) 」を参照してください。
+1. 必要に応じて、アラートに対する {% data variables.product.prodname_dependabot_security_updates %} アップデートがまだ入手できない場合、脆弱性を解決するプルリクエストを作成するには、[**Create {% data variables.product.prodname_dependabot %} security update**] をクリックします。 
+1. 依存関係を更新して脆弱性を解決する準備ができたら、プルリクエストをマージしてください。 {% data variables.product.prodname_dependabot %} によって発行される各プルリクエストには、{% data variables.product.prodname_dependabot %} の制御に使用できるコマンドの情報が含まれています。 詳しい情報については、「[依存関係の更新に関するプルリクエストを管理する](/github/administering-a-repository/managing-pull-requests-for-dependency-updates#managing-dependabot-pull-requests-with-comment-commands) 」を参照してください。
1. 必要に応じて、アラートが正しく修正されていない場合や、未使用のコード内に含まれている場合は、[Dismiss] ドロップダウンを使用して、アラートを却下する理由をクリックします。 ![[Dismiss] ドロップダウンでアラートを却下する理由を選択する](/assets/images/help/repository/dependabot-alert-dismiss-drop-down.png)
### 参考リンク
- 「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)」
-- 「[{% data variables.product.prodname_dependabot_security_updates %} を設定する](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)」
+- 「[{% data variables.product.prodname_dependabot_security_updates %} を設定する](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)」
- "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)"
- "[Troubleshooting the detection of vulnerable dependencies](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)"
-- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)"
+- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)"
diff --git a/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md b/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md
index cce7631cae..f9f96cfcf1 100644
--- a/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md
+++ b/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md
@@ -122,7 +122,7 @@ If you believe you're receiving notifications that don't belong to you, examine
3. 通知設定ページで、次の場合の通知の受信方法を選択します。
- Watch しているリポジトリや Team ディスカッション、または参加している会話に更新がある場合。 詳しい情報については、「[参加と Watch 対象の通知について](#about-participating-and-watching-notifications)」を参照してください。
- 新しいリポジトリにアクセスするか、新しい Team に参加した場合。 For more information, see "[Automatic watching](#automatic-watching)."{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
- - リポジトリに新しい{% if page.version == 'dotcom' %} {% data variables.product.prodname_dependabot_alerts %} {% else %}セキュリティアラート{% endif %}があります。 詳しい情報については、「[{% data variables.product.prodname_dependabot_alerts %} 通知オプション](#github-dependabot-alerts-notification-options)」を参照してください。 {% endif %}{% if currentVersion == "enterprise-server@2.21" %}
+ - リポジトリに新しい{% if page.version == 'dotcom' %} {% data variables.product.prodname_dependabot_alerts %} {% else %}セキュリティアラート{% endif %}があります。 詳しい情報については、「[{% data variables.product.prodname_dependabot_alerts %} 通知オプション](#dependabot-alerts-notification-options)」を参照してください。 {% endif %}{% if currentVersion == "enterprise-server@2.21" %}
- リポジトリに新しいセキュリティアラートがある場合。 There are new security alerts in your repository. {% endif %} {% if currentVersion == "free-pro-team@latest" %}
- {% data variables.product.prodname_actions %} で設定されたリポジトリにワークフロー実行の更新がある場合。 詳しい情報については、「[{% data variables.product.prodname_actions %} 通知オプション](#github-actions-notification-options)」を参照してください。{% endif %}
diff --git a/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md b/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
index 2cf138eb62..95344d744c 100644
--- a/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
+++ b/translations/ja-JP/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
@@ -82,6 +82,7 @@ Custom filters do not currently support:
- `is:issue`、`is:pr`、および `is:pull-request` クエリフィルタの区別。 これらのクエリは、Issue とプルリクエストの両方を検索結果として表示します。
- 15 個以上のカスタムフィルタの作成。
- デフォルトのフィルタまたはその順序の変更。
+ - Search [exclusion](/github/searching-for-information-on-github/understanding-the-search-syntax#exclude-certain-results) using `NOT` or `-QUALIFIER`.
### カスタムフィルタでサポートされているクエリ
@@ -113,7 +114,7 @@ To filter notifications by why you've received an update, you can use the `reaso
#### サポートされている `is:` クエリ
-{% data variables.product.product_name %} での特定のアクティビティの通知をフィルタするには、`is` クエリを使用できます。 For example, to only see repository invitation updates, use `is:repository-invitation`{% if currentVersion != "github-ae@latest" %}, and to only see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts, use `is:repository-vulnerability-alert`.{% endif %}
+{% data variables.product.product_name %} での特定のアクティビティの通知をフィルタするには、`is` クエリを使用できます。 For example, to only see repository invitation updates, use `is:repository-invitation`{% if currentVersion != "github-ae@latest" %}, and to only see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %} security{% endif %} alerts, use `is:repository-vulnerability-alert`.{% endif %}
- `is:check-suite`
- `is:commit`
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md
index add302f106..750ef4b2fb 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md
@@ -59,7 +59,7 @@ Organization のワークフローをすべて無効にすることも、Organiz
{% data reusables.profile.access_org %}
{% data reusables.organizations.org_settings %}
{% data reusables.organizations.settings-sidebar-actions %}
-1. [**Policies**] で [**Allow specific actions**] を選択し、必要なアクションをリストに追加します。 
+1. Under **Policies**, select **Allow select actions** and add your required actions to the list. 
1. [**Save**] をクリックします。
{% endif %}
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md
index 17719749e1..c922dce350 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md
@@ -18,7 +18,7 @@ versions:
### ルーティングアルゴリズム
-コードレビューの割り当ては、2 つのアルゴリズム候補のいずれかに基づいて自動的にレビュー担当者を選択して割り当てます。
+Code review assignments automatically choose and assign reviewers based on one of two possible algorithms.
ラウンドロビンアルゴリズムは、現在未処理のレビューの数とは関係なく、Team のすべてのメンバー間で交互に、最も新しいレビューリクエストを誰が受け取ったかに基づいてレビュー担当者を選択します。
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md
index 7a4485d19b..3796766a48 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md
@@ -64,7 +64,7 @@ Organization のメンバーは、*owner (オーナー)*{% if currentVersion ==
| {% data variables.product.prodname_marketplace %} アプリケーションを購入、インストール、支払い管理、キャンセルする | **X** | | |
| {% data variables.product.prodname_marketplace %} のアプリケーションをリストする | **X** | | |{% if currentVersion != "github-ae@latest" %}
| Organization のリポジトリすべてについて、脆弱な依存関係についての [{% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) アラートを受け取る | **X** | | |
-| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)") | **X** | | |{% endif %}
+| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)") | **X** | | |{% endif %}
| [フォークポリシーの管理](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization) | **X** | | |
| [Organization のパブリックリポジトリでのアクティビティを制限する](/articles/limiting-interactions-in-your-organization) | **X** | | |
| Organization にある*すべてのリポジトリ*のプル (読み取り)、プッシュ (書き込み)、クローン作成 (コピー) | **X** | | |
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
index 887eaccfbf..0192cef238 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
@@ -26,31 +26,31 @@ Audit log には、過去 90 日間に行われた行動が一覧表示されま
特定のイベントを検索するには、クエリで `action` 修飾子を使用します。 Audit log に一覧表示されるアクションは以下のカテゴリに分類されます。
-| カテゴリー名 | 説明 |
-| ------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest" %}
+| カテゴリー名 | 説明 |
+| ------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |{% if currentVersion == "free-pro-team@latest" %}
| `アカウント` | Organization アカウントに関連するすべてのアクティビティが対象です。{% endif %}{% if currentVersion == "free-pro-team@latest" %}
| `支払い` | Organization の支払いに関連するすべてのアクティビティが対象です。{% endif %}
-| `discussion_post` | Team ページに投稿されたディスカッションに関連するすべてのアクティビティが対象です。 |
-| `discussion_post_reply` | Team ページに投稿されたディスカッションへの返答に関連するすべてのアクティビティが対象です。 |
-| `フック` | webhookに関連するすべてのアクティビティを含みます。 |
+| `discussion_post` | Team ページに投稿されたディスカッションに関連するすべてのアクティビティが対象です。 |
+| `discussion_post_reply` | Team ページに投稿されたディスカッションへの返答に関連するすべてのアクティビティが対象です。 |
+| `フック` | webhookに関連するすべてのアクティビティを含みます。 |
| `integration_installation_request` | Organization 内で使用するインテグレーションをオーナーが承認するよう求める、 Organization メンバーからのリクエストに関連するすべてのアクティビティが対象です。 |{% if currentVersion == "free-pro-team@latest" %}
-| `marketplace_agreement_signature` | {% data variables.product.prodname_marketplace %} Developer Agreement の署名に関連するすべての活動が対象です。 |
+| `marketplace_agreement_signature` | {% data variables.product.prodname_marketplace %} Developer Agreement の署名に関連するすべての活動が対象です。 |
| `marketplace_listing` | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %}
-| `members_can_create_pages` | Organization のリポジトリについて {% data variables.product.prodname_pages %} サイトの公開を無効化することに関連するすべてのアクティビティが対象です。 詳細については、「[Organization について {% data variables.product.prodname_pages %} サイトの公開を制限する](/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization)」を参照してください。 |{% endif %}
+| `members_can_create_pages` | Organization のリポジトリについて {% data variables.product.prodname_pages %} サイトの公開を無効化することに関連するすべてのアクティビティが対象です。 詳細については、「[Organization について {% data variables.product.prodname_pages %} サイトの公開を制限する](/github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization)」を参照してください。 |{% endif %}
| `org` | Organization メンバーシップに関連するすべてのアクティビティが対象です。{% if currentVersion == "free-pro-team@latest" %}
| `org_credential_authorization` | Contains all activities related to authorizing credentials for use with SAML single sign-on.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %}
| `organization_label` | Organization のリポジトリのデフォルトラベルに関連するすべてのアクティビティが対象です。{% endif %}{% if currentVersion == "free-pro-team@latest" %}
| `payment_method` | Organization の GitHub への支払い方法に関連するすべてのアクティビティが対象です。{% endif %}
-| `profile_picture` | Organization のプロフィール画像に関連するすべてのアクティビティが対象です。 |
-| `project` | プロジェクト ボードに関連するすべての活動が対象です。 |
-| `protected_branch` | 保護されたブランチ関連するすべてのアクティビティが対象です。 |
+| `profile_picture` | Organization のプロフィール画像に関連するすべてのアクティビティが対象です。 |
+| `project` | プロジェクト ボードに関連するすべての活動が対象です。 |
+| `protected_branch` | 保護されたブランチ関連するすべてのアクティビティが対象です。 |
| `repo` | Organization によって所有されていリポジトリに関連するすべてのアクティビティが対象です。{% if currentVersion == "free-pro-team@latest" %}
-| `repository_content_analysis` | [プライベート リポジトリに対するデータの使用を有効または無効にする](/articles/about-github-s-use-of-your-data)に関連するすべての活動が対象です。 |
+| `repository_content_analysis` | [プライベート リポジトリに対するデータの使用を有効または無効にする](/articles/about-github-s-use-of-your-data)に関連するすべての活動が対象です。 |
| `repository_dependency_graph` | Contains all activities related to [enabling or disabling the dependency graph for a private repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository).{% endif %}{% if currentVersion != "github-ae@latest" %}
-| `repository_vulnerability_alert` | Contains all activities related to [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% endif %}{% if currentVersion == "free-pro-team@latest" %}
+| `repository_vulnerability_alert` | Contains all activities related to [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% endif %}{% if currentVersion == "free-pro-team@latest" %}
| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %}
| `Team` | Organization の Team に関連するすべてのアクティビティが対処です。{% endif %}
-| `team_discussions` | Organization の Team ディスカッションに関連するすべてのアクティビティが対象です。 |
+| `team_discussions` | Organization の Team ディスカッションに関連するすべてのアクティビティが対象です。 |
次の用語を使用すれば、特定の一連の行動を検索できます。 例:
@@ -352,13 +352,13 @@ Audit log には、過去 90 日間に行われた行動が一覧表示されま
{% if currentVersion != "github-ae@latest" %}
##### `repository_vulnerability_alert` カテゴリ
-| アクション | 説明 |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `create` | {% data variables.product.product_name %} が特定のリポジトリで[脆弱な依存性に対する{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}セキュリティ{% endif %}アラート](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)を作成するときにトリガーされます。 |
-| `解決` | リポジトリへの書き込みアクセス権を所有する人が、プロジェクトの依存関係で、[脆弱性を更新して解決するために変更をプッシュする](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)ときにトリガーされます。 |
-| `却下` | Organization のオーナーまたはリポジトリへの管理者アクセス権を所有する人は |
-| 脆弱な依存関係についての {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}セキュリティ{% endif %}アラートを却下するときにトリガーされます。{% if currentVersion == "free-pro-team@latest" %} | |
-| `authorized_users_teams` | Organization のオーナーまたはリポジトリへの管理者権限を所有するメンバーが、リポジトリ内の脆弱な依存関係に対する[{% data variables.product.prodname_dependabot_short %}{% endif %}アラートを受信する権限が与えられた人または Team のリストを更新する](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)ときにトリガーされます。 |
+| アクション | 説明 |
+| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `create` | {% data variables.product.product_name %} が特定のリポジトリで[脆弱な依存性に対する{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}セキュリティ{% endif %}アラート](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)を作成するときにトリガーされます。 |
+| `解決` | リポジトリへの書き込みアクセス権を所有する人が、プロジェクトの依存関係で、[脆弱性を更新して解決するために変更をプッシュする](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)ときにトリガーされます。 |
+| `却下` | Organization のオーナーまたはリポジトリへの管理者アクセス権を所有する人は |
+| 脆弱な依存関係についての {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}セキュリティ{% endif %}アラートを却下するときにトリガーされます。{% if currentVersion == "free-pro-team@latest" %} | |
+| `authorized_users_teams` | Triggered when an organization owner or a member with admin permissions to the repository [updates the list of people or teams authorized to receive {% data variables.product.prodname_dependabot_alerts %}](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-dependabot-alerts) for vulnerable dependencies in the repository.{% endif %}
{% endif %}
{% if currentVersion == "free-pro-team@latest" %}
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md
index d1a2286e27..98206f8e07 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md
@@ -36,7 +36,7 @@ dependency insights を使えば、あなたの Organization が頼るオープ
3. Organization 名の下にある {% octicon "graph" aria-label="The bar graph icon" %} [**Insights**] をクリックします。 ![メイン Organization ナビゲーションバーの [Insights] タブ](/assets/images/help/organizations/org-nav-insights-tab.png)
4. この Organization への依存関係を表示するには、[**Dependencies**] をクリックします。 ![メイン Organization ナビゲーションバーの下にある [Dependencies] タブ](/assets/images/help/organizations/org-insights-dependencies-tab.png)
5. あなたの {% data variables.product.prodname_ghe_cloud %} Organization の dependency insights をすべて表示するには、[**My organizations**] をクリックします。 ![[Dependencies] タブの下にある [My organizations] ボタン](/assets/images/help/organizations/org-insights-dependencies-my-orgs-button.png)
-6. [**Open security advisories**] および [**Licenses**] グラフの結果をクリックすることで、脆弱性ステータス、ライセンスまたはその 2 つを組み合わせてフィルタリングできます。 
+6. [**Open security advisories**] および [**Licenses**] グラフの結果をクリックすることで、脆弱性ステータス、ライセンスまたはその 2 つを組み合わせてフィルタリングできます。 
7. 各脆弱性の隣にある [{% octicon "package" aria-label="The package icon" %} **dependents**] をクリックして、Organization でどの依存関係が各ライブラリを使っているかを表示できます。 
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md
index 401a2f1265..22b31cae12 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/about-github-business-accounts/
- /articles/about-enterprise-accounts
+ - /github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts
versions:
free-pro-team: '*'
enterprise-server: '*'
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md
index a7b6a5b8b0..9a125fd99d 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md
@@ -4,6 +4,7 @@ intro: Enterprise アカウント内に、新しい Organization を作成して
product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/adding-organizations-to-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/adding-organizations-to-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md
index 8b011c4d8c..5222817603 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md
@@ -4,6 +4,7 @@ intro: 'Okta を使う Security Assertion Markup Language (SAML) シングルサ
product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /github/setting-up-and-managing-your-enterprise/configuring-single-sign-on-and-scim-for-your-enterprise-account-using-okta
+ - /github/setting-up-and-managing-your-enterprise-account/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta
versions:
free-pro-team: '*'
---
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md
index 7a75d8c7a3..2bd1d3b766 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md
@@ -2,6 +2,8 @@
title: Configuring the retention period for GitHub Actions artifacts and logs in your enterprise account
intro: 'Enterprise owners can configure the retention period for {% data variables.product.prodname_actions %} artifacts and logs in an enterprise account.'
product: '{% data reusables.gated-features.enterprise-accounts %}'
+redirect_from:
+ - /github/setting-up-and-managing-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account
miniTocMaxHeadingLevel: 4
versions:
free-pro-team: '*'
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md
index f499a3201f..79bd314ac5 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/configuring-webhooks-for-organization-events-in-your-business-account/
- /articles/configuring-webhooks-for-organization-events-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/configuring-webhooks-for-organization-events-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md
index a51cc35432..d335b3ba29 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/enforcing-a-policy-on-dependency-insights/
- /articles/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md
index 6de29a397a..863bbf3c7b 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md
@@ -2,6 +2,8 @@
title: Enterprise アカウントで GitHub Actions のポリシーを施行する
intro: 'Enterprise のオーナーは、Enterprise アカウントについて {% data variables.product.prodname_actions %} の無効化、有効化、および制限ができます。'
product: '{% data reusables.gated-features.enterprise-accounts %}'
+redirect_from:
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-github-actions-policies-in-your-enterprise-account
miniTocMaxHeadingLevel: 4
versions:
free-pro-team: '*'
@@ -32,7 +34,7 @@ You can disable all workflows for an enterprise or set a policy that configures
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.policies-tab %}
{% data reusables.enterprise-accounts.actions-tab %}
-1. [**Policies**] で [**Allow specific actions**] を選択し、必要なアクションをリストに追加します。 
+1. Under **Policies**, select **Allow select actions** and add your required actions to the list. 
### プライベートリポジトリのフォークのワークフローを有効にする
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md
index 3ba2a5c91b..2cea980d18 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md
@@ -6,6 +6,7 @@ redirect_from:
- /articles/enforcing-project-board-settings-for-organizations-in-your-business-account/
- /articles/enforcing-project-board-policies-for-organizations-in-your-enterprise-account/
- /articles/enforcing-project-board-policies-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-project-board-policies-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md
index baee7146f8..141c9e5d78 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md
@@ -6,6 +6,7 @@ redirect_from:
- /articles/enforcing-repository-management-settings-for-organizations-in-your-business-account/
- /articles/enforcing-repository-management-policies-for-organizations-in-your-enterprise-account/
- /articles/enforcing-repository-management-policies-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-repository-management-policies-in-your-enterprise-account
versions:
free-pro-team: '*'
---
@@ -48,8 +49,7 @@ versions:
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.policies-tab %}
3. [**Repository policies**] タブの [Repository invitations] で、設定変更についての情報を確認します。 {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
-4. [Repository invitations] で、ドロップダウンメニューを使用してポリシーを選択します。
- 
+4. Under "Repository invitations", use the drop-down menu and choose a policy. 
### リポジトリの表示の変更に関するポリシーを施行する
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md
index afabc2af9a..9972b33de7 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md
@@ -8,6 +8,7 @@ redirect_from:
- /articles/enforcing-security-settings-for-organizations-in-your-enterprise-account/
- /articles/enforcing-security-settings-in-your-enterprise-account
- /github/articles/managing-allowed-ip-addresses-for-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-security-settings-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md
index a5ef387c6d..782ae8df74 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md
@@ -6,6 +6,7 @@ redirect_from:
- /articles/enforcing-team-settings-for-organizations-in-your-business-account/
- /articles/enforcing-team-policies-for-organizations-in-your-enterprise-account/
- /articles/enforcing-team-policies-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-team-policies-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md
index aa898932f5..5d8cba741b 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md
@@ -5,6 +5,7 @@ redirect_from:
- /github/setting-up-and-managing-your-enterprise/managing-licenses-for-the-github-enterprise-and-visual-studio-bundle
- /github/articles/about-the-github-and-visual-studio-bundle
- /articles/about-the-github-and-visual-studio-bundle
+ - /github/setting-up-and-managing-your-enterprise-account/managing-licenses-for-visual-studio-subscription-with-github-enterprise
versions:
free-pro-team: '*'
---
@@ -21,7 +22,7 @@ After you assign a license for {% data variables.product.prodname_vss_ghe %} to
1. After you buy {% data variables.product.prodname_vss_ghe %}, contact {% data variables.contact.contact_enterprise_sales %} and mention "{% data variables.product.prodname_vss_ghe %}." You'll work with the Sales team to create an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. If you already have an enterprise account on {% data variables.product.prodname_dotcom_the_website %}, or if you're not sure, please tell our Sales team.
-2. Assign licenses for {% data variables.product.prodname_vss_ghe %} to subscribers in {% data variables.product.prodname_vss_admin_portal_with_url %}. For more information about assigning licenses, see [Manage {% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/en-us/visualstudio/subscriptions/assign-github) in the Microsoft Docs.
+2. Assign licenses for {% data variables.product.prodname_vss_ghe %} to subscribers in {% data variables.product.prodname_vss_admin_portal_with_url %}. For more information about assigning licenses, see [Manage {% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/visualstudio/subscriptions/assign-github) in the Microsoft Docs.
3. On {% data variables.product.prodname_dotcom_the_website %}, create at least one organization owned by your enterprise account. For more information, see "[Adding organizations to your enterprise account](/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account)."
@@ -39,4 +40,4 @@ You can also see pending {% data variables.product.prodname_enterprise %} invita
### 参考リンク
-- [Introducing Visual Studio subscriptions with GitHub Enterprise](https://docs.microsoft.com/en-us/visualstudio/subscriptions/access-github) in the Microsoft Docs
+- [Introducing Visual Studio subscriptions with GitHub Enterprise](https://docs.microsoft.com/visualstudio/subscriptions/access-github) in the Microsoft Docs
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md
index 9cf197f078..d1f3de3034 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md
@@ -4,6 +4,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
mapTopic: true
redirect_from:
- /articles/managing-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md
index 69f399bbd4..1196ad42c2 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md
@@ -3,6 +3,8 @@ title: Enterprise アカウントでオーナーのいない Organization を管
intro: Enterprise アカウントで現在オーナーがいない Organization のオーナーになることができます。
product: '{% data reusables.gated-features.enterprise-accounts %}'
permissions: Enterprise オーナーは、Enterprise アカウントでオーナーのいない Organization を管理できます。
+redirect_from:
+ - /github/setting-up-and-managing-your-enterprise-account/managing-unowned-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md
index 97c906ecd0..fa870c537f 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md
@@ -4,6 +4,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
mapTopic: true
redirect_from:
- /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/managing-users-in-your-enterprise-account
- /articles/managing-users-in-your-enterprise-account
- /articles/managing-users-in-your-enterprise
versions:
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md
index 75b5828289..e8fd3e14ca 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md
@@ -4,6 +4,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
mapTopic: true
redirect_from:
- /articles/setting-policies-for-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
index 0519ea9318..b110ca0516 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
@@ -5,6 +5,7 @@ permissions: Enterprise オーナーは、組織へのメンバーの SAML ア
product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/viewing-and-managing-a-users-saml-access-to-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md
index 2b4e8c79d8..ed78221a73 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/viewing-the-audit-logs-for-organizations-in-your-business-account/
- /articles/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md b/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md
index 596e14c283..3f43666a09 100644
--- a/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md
+++ b/translations/ja-JP/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md
@@ -29,6 +29,8 @@ versions:

+The list of top repositories is automatically generated, and can include any repository you have interacted with, whether it's owned directly by your account or not. Interactions include making commits and opening or commenting on issues and pull requests. The list of top repositories cannot be edited, but repositories will drop off the list 4 months after you last interacted with them.
+
{% data variables.product.product_name %} 上の任意のページの上部にある検索バーをクリックすれば、最近アクセスしたリポジトリ、Team、プロジェクトボードのリストを見つけることもできます。
### コミュニティからのアクティビティの更新を受ける
diff --git a/translations/ja-JP/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md b/translations/ja-JP/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
index 8dcf3992b8..05af74762a 100644
--- a/translations/ja-JP/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
+++ b/translations/ja-JP/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
@@ -5,9 +5,7 @@ product: '{% data reusables.gated-features.github-insights %}'
redirect_from:
- /github/installing-and-configuring-github-insights/github-insights-and-data-protection-for-your-organization
versions:
- free-pro-team: '*'
enterprise-server: '*'
- github-ae: '*'
---
For more information about the terms that govern {% data variables.product.prodname_insights %}, see your {% data variables.product.prodname_ghe_one %} subscription agreement.
diff --git a/translations/ja-JP/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md b/translations/ja-JP/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
index a85c697623..04f6c6b3af 100644
--- a/translations/ja-JP/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
+++ b/translations/ja-JP/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
@@ -141,7 +141,8 @@ Organization アカウントの場合、当社はアカウントオーナーの
- プライベートリポジトリのコミュニケーションまたはドキュメント(Issue や Wiki など)
- 認証または暗号化に使用されるセキュリティキー
-- **緊急事態** — 特定の緊急事態において情報の要求を受け取った場合(人の死亡または重傷の危険を伴う緊急事態を防ぐために開示が必要であると考える場合)、当社は、法執行機関が緊急事態に対処するために必要だと当社が判断する限られた情報を開示する場合があります。 その範囲を超える情報については、上記のとおり、当社は召喚状、捜査令状、または裁判所命令を求めます。 たとえば、私たちは、捜査令状なしにプライベートリポジトリのコンテンツを開示しません。 当社は、情報を開示する前に、要求が法執行機関からのものであること、当局が緊急事態を要約した公式通知を送付したこと、および要求された情報が緊急事態の対応にどのように役立つかを確認します。
+-
+**緊急事態** — 特定の緊急事態において情報の要求を受け取った場合(人の死亡または重傷の危険を伴う緊急事態を防ぐために開示が必要であると考える場合)、当社は、法執行機関が緊急事態に対処するために必要だと当社が判断する限られた情報を開示する場合があります。 その範囲を超える情報については、上記のとおり、当社は召喚状、捜査令状、または裁判所命令を求めます。 たとえば、私たちは、捜査令状なしにプライベートリポジトリのコンテンツを開示しません。 当社は、情報を開示する前に、要求が法執行機関からのものであること、当局が緊急事態を要約した公式通知を送付したこと、および要求された情報が緊急事態の対応にどのように役立つかを確認します。
### 費用の払い戻し
diff --git a/translations/ja-JP/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md b/translations/ja-JP/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md
index d747dcbcfd..9ac3d3f7ad 100644
--- a/translations/ja-JP/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md
+++ b/translations/ja-JP/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md
@@ -10,7 +10,7 @@ versions:
### プライベートリポジトリ用のデータ利用について
-When you enable data use for your private repository, you'll be able to access the dependency graph, where you can track your repository's dependencies and receive {% data variables.product.prodname_dependabot_short %} alerts when {% data variables.product.product_name %} detects vulnerable dependencies. 詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies#github-dependabot-alerts-for-vulnerable-dependencies)」を参照してください。
+When you enable data use for your private repository, you'll be able to access the dependency graph, where you can track your repository's dependencies and receive {% data variables.product.prodname_dependabot_alerts %} when {% data variables.product.product_name %} detects vulnerable dependencies. 詳しい情報については、「[脆弱性のある依存関係に対するアラートについて](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies#dependabot-alerts-for-vulnerable-dependencies)」を参照してください。
### データ利用機能の有効化と無効化
diff --git a/translations/ja-JP/content/github/using-git/about-git-subtree-merges.md b/translations/ja-JP/content/github/using-git/about-git-subtree-merges.md
index 419123b433..8f4b5057be 100644
--- a/translations/ja-JP/content/github/using-git/about-git-subtree-merges.md
+++ b/translations/ja-JP/content/github/using-git/about-git-subtree-merges.md
@@ -105,5 +105,5 @@ $ git pull -s subtree spoon-knife main
### 参考リンク
-- [_Pro Git_の"Subtree Merging"の章](https://git-scm.com/book/en/Git-Tools-Subtree-Merging)
+- [The "Advanced Merging" chapter from the _Pro Git_ book](https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging)
- [サブツリーマージの戦略の使い方](https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html)
diff --git a/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md b/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md
index e674add356..ee6e10f5bc 100644
--- a/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md
+++ b/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md
@@ -47,7 +47,7 @@ You can use the dependency graph to:
{% if currentVersion == "free-pro-team@latest" %}To generate a dependency graph, {% data variables.product.product_name %} needs read-only access to the dependency manifest and lock files for a repository. The dependency graph is automatically generated for all public repositories and you can choose to enable it for private repositories. For information about enabling or disabling it for private repositories, see "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)."{% endif %}
-{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
+{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_alerts %}. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."
diff --git a/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md b/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md
index 86f97e1e9b..5c7b22cdf5 100644
--- a/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md
+++ b/translations/ja-JP/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md
@@ -37,7 +37,7 @@ If vulnerabilities have been detected in the repository, these are shown at the
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}
Any direct and indirect dependencies that are specified in the repository's manifest or lock files are listed, grouped by ecosystem. If vulnerabilities have been detected in the repository, these are shown at the top of the view for users with access to
-{% data variables.product.prodname_dependabot_short %} アラート.
+{% data variables.product.prodname_dependabot_alerts %}.
{% note %}
diff --git a/translations/ja-JP/content/github/working-with-github-pages/about-github-pages.md b/translations/ja-JP/content/github/working-with-github-pages/about-github-pages.md
index e9f8eae217..370fa517e2 100644
--- a/translations/ja-JP/content/github/working-with-github-pages/about-github-pages.md
+++ b/translations/ja-JP/content/github/working-with-github-pages/about-github-pages.md
@@ -36,9 +36,9 @@ Organization owners can disable the publication of
{% data variables.product.prodname_pages %} サイトには、3 つの種類があります。プロジェクト、ユーザ、そして Organization です。 プロジェクトサイトは、JavaScript ライブラリやレシピ集など、{% data variables.product.product_name %} の特定のプロジェクトに関するものです。 ユーザおよび Organization サイトは、特定の {% data variables.product.product_name %} に関するものです。
-To publish a user site, you must create a repository owned by your user account that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. To publish an organization site, you must create a repository owned by an organization that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, user and organization sites are available at `http(s)://.github.io` or `http(s)://.github.io`.{% elsif currentVersion == "github-ae@latest" %}User and organization sites are available at `http(s)://pages./` or `http(s)://pages./`.{% endif %}
+To publish a user site, you must create a repository owned by your user account that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. To publish an organization site, you must create a repository owned by an organization that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, user and organization sites are available at `http(s)://.github.io` or `http(s)://.github.io`.{% elsif currentVersion == "github-ae@latest" %}User and organization sites are available at `http(s)://pages./` or `http(s)://pages./`.{% endif %}
-プロジェクトサイトのソースファイルは、プロジェクトと同じリポジトリに保存されます。 {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, project sites are available at `http(s)://.github.io/` or `http(s)://.github.io/`.{% elsif currentVersion == "github-ae@latest" %}Project sites are available at `http(s)://pages.///` or `http(s)://pages.///`.{% endif %}
+プロジェクトサイトのソースファイルは、プロジェクトと同じリポジトリに保存されます。 {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, project sites are available at `http(s)://.github.io/` or `http(s)://.github.io/`.{% elsif currentVersion == "github-ae@latest" %}Project sites are available at `http(s)://pages.///` or `http(s)://pages.///`.{% endif %}
{% if currentVersion == "free-pro-team@latest" %}
カスタムドメインがサイトの URL に与える影響に関する詳しい情報については、「[カスタムドメインと {% data variables.product.prodname_pages %} について](/articles/about-custom-domains-and-github-pages)」を参照してください。
@@ -63,7 +63,7 @@ The URL where your site is available depends on whether subdomain isolation is e
{% if currentVersion == "free-pro-team@latest" %}
{% note %}
-**注釈:** Repositories using theレガシーの `.github.com` 命名規則を使用しているリポジトリも公開されますが、訪問者は `http(s)://.github.com` から`http(s)://.github.io` にリダイレクトされます。 `.github.com` と `.github.io` の両方のリポジトリが存在する場合、 `.github.io` のリポジトリのみが公開されます。
+**Note:** Repositories using the legacy `.github.com` naming scheme will still be published, but visitors will be redirected from `http(s)://.github.com` to `http(s)://.github.io`. If both a `.github.com` and `.github.io` repository exist, only the `.github.io` repository will be published.
{% endnote %}
{% endif %}
diff --git a/translations/ja-JP/content/github/working-with-github-pages/creating-a-github-pages-site.md b/translations/ja-JP/content/github/working-with-github-pages/creating-a-github-pages-site.md
index 08c7be1e84..2b21c26538 100644
--- a/translations/ja-JP/content/github/working-with-github-pages/creating-a-github-pages-site.md
+++ b/translations/ja-JP/content/github/working-with-github-pages/creating-a-github-pages-site.md
@@ -2,6 +2,9 @@
title: GitHub Pages サイトを作成する
intro: '新規または既存のリポジトリ内に、{% data variables.product.prodname_pages %} サイトを作成できます。'
redirect_from:
+ - /articles/creating-pages-manually/
+ - /articles/creating-project-pages-manually/
+ - /articles/creating-project-pages-from-the-command-line/
- /articles/creating-project-pages-using-the-command-line/
- /articles/creating-a-github-pages-site
product: '{% data reusables.gated-features.pages %}'
diff --git a/translations/ja-JP/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md b/translations/ja-JP/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md
index 444a340c9e..bfd48f0336 100644
--- a/translations/ja-JP/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md
+++ b/translations/ja-JP/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md
@@ -41,7 +41,7 @@ DNS レコードの設定が正しいかどうかを検証するために利用
{% data reusables.repositories.sidebar-settings %}
{% data reusables.pages.save-custom-domain %}
5. お使いの DNS プロバイダにアクセスし、サブドメインがサイトのデフォルトドメインを指す `CNAME` レコードを作成します。 たとえば、サイトで `www.example.com` というサブドメインを使いたい場合、`www.example.com` が `.github.io` を指す`CNAME` レコードを作成します。 If you want to use the subdomain `www.anotherexample.com` for your organization site, create a `CNAME` record that points `www.anotherexample.com` to `.github.io`. The `CNAME` file should always point to `.github.io` or `.github.io`, excluding the repository name.
-{% data reusables.pages.contact-dns-provider %}{% data reusables.pages.default-domain-information %}
+{% data reusables.pages.contact-dns-provider %} {% data reusables.pages.default-domain-information %}
{% data reusables.command_line.open_the_multi_os_terminal %}
6. DNS レコードが正しくセットアップされたことを確認するには、 `dig` コマンドを使います。_WWW.EXAMPLE.COM_ は、お使いのサブドメインに置き換えてください。
```shell
diff --git a/translations/ja-JP/content/github/working-with-github-pages/troubleshooting-jekyll-build-errors-for-github-pages-sites.md b/translations/ja-JP/content/github/working-with-github-pages/troubleshooting-jekyll-build-errors-for-github-pages-sites.md
index c338517dbc..34b33f05fe 100644
--- a/translations/ja-JP/content/github/working-with-github-pages/troubleshooting-jekyll-build-errors-for-github-pages-sites.md
+++ b/translations/ja-JP/content/github/working-with-github-pages/troubleshooting-jekyll-build-errors-for-github-pages-sites.md
@@ -183,6 +183,6 @@ To troubleshoot, if your `docs` folder was accidentally moved, try moving the `d
このエラーは、コードに認識されない Liquid タグが含まれていることを意味します。
-トラブルシューティングするには、エラーメッセージで示されているファイルの Liquid タグがすべて Jekyll のデフォルトの変数に一致し、タグ名に誤入力がないことを確認します。 デフォルトの変数のリストは、Jekyll のドキュメンテーションで「[変数](https://jekyllrb.com/docs/variables/)」を参照してください。
+トラブルシューティングするには、エラーメッセージで示されているファイルの Liquid タグがすべて Jekyll のデフォルトの変数に一致し、タグ名に誤入力がないことを確認します。 For a list of default variables, see "[Variables](https://jekyllrb.com/docs/variables/)" in the Jekyll documentation.
認識されないタグの主な原因は、サポート対象外のプラグインです。 サイトをローカルで生成し、静的なファイルを {% data variables.product.product_name %} にプッシュすることで、サポート対象外のプラグインを使用している場合は、そのプラグインで Jekyll のデフォルトの変数と異なるタグが使われていないかどうか確認してください。 サポート対象のプラグインについては、「[{% data variables.product.prodname_pages %} と Jekyll について](/articles/about-github-pages-and-jekyll#plugins)」を参照してください。
diff --git a/translations/ja-JP/content/graphql/guides/managing-enterprise-accounts.md b/translations/ja-JP/content/graphql/guides/managing-enterprise-accounts.md
index 4be5a2b09b..5ca8c91065 100644
--- a/translations/ja-JP/content/graphql/guides/managing-enterprise-accounts.md
+++ b/translations/ja-JP/content/graphql/guides/managing-enterprise-accounts.md
@@ -193,6 +193,6 @@ GraphQLの使い始め方に関する詳しい情報については「[GraphQL
Enterprise Accounts APIで利用できる新しいクエリ、ミューテーション、スキーマ定義された型の概要を以下に示します。
-Enterprise APIで利用できる新しいクエリ、ミューテーション、スキーマ定義された型に関する詳しい情報については、任意の[GraphQLリファレンスページ](/v4/)の詳細なGraphQLの定義があるサイドバーを見てください。
+For more details about the new queries, mutations, and schema defined types available for use with the Enterprise Accounts API, see the sidebar with detailed GraphQL definitions from any [GraphQL reference page](/v4/).
GitHub上のGraphQL Explorer内からリファレンスドキュメントにアクセスできます。 詳しい情報については「[Explorerの利用](/v4/guides/using-the-explorer#accessing-the-sidebar-docs)」を参照してください。 認証やレート制限の詳細など その他の情報については[ガイド](/v4/guides)を参照してください。
diff --git a/translations/ja-JP/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md b/translations/ja-JP/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md
index d173052a31..025f4d1e4f 100644
--- a/translations/ja-JP/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md
+++ b/translations/ja-JP/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md
@@ -90,7 +90,7 @@ Organizationが{% data variables.product.prodname_insights %}に追加される
{% data reusables.github-insights.settings-tab %}
{% data reusables.github-insights.teams-tab %}
{% data reusables.github-insights.edit-team %}
-3. "Contributors(コントリビューター)"の下で、ドロップダウンメニューを使い、コントリビューターを選択してください。 
+3. "Contributors(コントリビューター)"の下で、ドロップダウンメニューを使い、コントリビューターを選択してください。 
4. [**Done**] をクリックします。
#### カスタムTeamからのコントリビューターの削除
diff --git a/translations/ja-JP/content/packages/publishing-and-managing-packages/about-github-packages.md b/translations/ja-JP/content/packages/publishing-and-managing-packages/about-github-packages.md
index 3e4d43a22f..55642784fb 100644
--- a/translations/ja-JP/content/packages/publishing-and-managing-packages/about-github-packages.md
+++ b/translations/ja-JP/content/packages/publishing-and-managing-packages/about-github-packages.md
@@ -83,7 +83,7 @@ versions:
#### パッケージレジストリのサポート
{% if currentVersion == "free-pro-team@latest" %}
-パッケージレジストリは、`PACKAGE-TYPE.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` をパッケージのホスト URL として使用します。`PACKAGE-TYPE` は、パッケージの名前空間に置き換えます。 たとえば、Gemfile は `rubygem.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` にホストされます。
+パッケージレジストリは、`PACKAGE-TYPE.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` をパッケージのホスト URL として使用します。`PACKAGE-TYPE` は、パッケージの名前空間に置き換えます。 たとえば、Gemfile は `rubygems.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` にホストされます。
{% else %}
@@ -98,8 +98,8 @@ versions:
| ---------- | ----------------------------- | ------------------------------------- | ------------ | ----------------------------------------------------- |
| JavaScript | Nodeのパッケージマネージャー | `package.json` | `npm` | `npm.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
| Ruby | RubyGemsパッケージマネージャー | `Gemfile` | `gem` | `rubygems.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
-| Java | Apache Mavenのプロジェクト管理及び包括的ツール | `pom.xml` | `mvn` | `maven.HOSTNAME/OWNER/REPOSITORY/IMAGE-NAME` |
-| Java | Java用のGradleビルド自動化ツール | `build.gradle` または `build.gradle.kts` | `gradle` | `maven.HOSTNAME/OWNER/REPOSITORY/IMAGE-NAME` |
+| Java | Apache Mavenのプロジェクト管理及び包括的ツール | `pom.xml` | `mvn` | `maven.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
+| Java | Java用のGradleビルド自動化ツール | `build.gradle` または `build.gradle.kts` | `gradle` | `maven.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
| .NET | .NET用のNuGetパッケージ管理 | `nupkg` | `dotnet` CLI | `nuget.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
{% else %}
@@ -161,15 +161,15 @@ Subdomain Isolation の詳しい情報については、「[Subdomain Isolation
パッケージをインストールあるいは公開するには、適切なスコープを持つトークンを使い、ユーザアカウントがそのリポジトリに対する適切な権限を持っていなければなりません。
例:
-- リポジトリからパッケージをダウンロードしてインストールするには、トークンは`read:packages`スコープを持っていなければならず、ユーザアカウントはそのリポジトリの読み取り権限を持っていなければなりません。 リポジトリがプライベートの場合は、トークンは`repo`スコープも持っていなければなりません。
+- リポジトリからパッケージをダウンロードしてインストールするには、トークンは`read:packages`スコープを持っていなければならず、ユーザアカウントはそのリポジトリの読み取り権限を持っていなければなりません。
- {% data variables.product.product_name %}上の特定バージョンのプライベートパッケージを削除するには、トークンは`delete:packages`及び`repo`スコープを持っていなければなりません。 パブリックなパッケージは削除できません。 詳しい情報については「[パッケージの削除](/packages/publishing-and-managing-packages/deleting-a-package)」を参照してください。
-| スコープ | 説明 | リポジトリの権限 |
-| ----------------- | ------------------------------------------------------------------------------------------------ | ---------------- |
-| `read:packages` | {% data variables.product.prodname_registry %}からのパッケージのダウンロードとインストール | 読み取り |
-| `write:packages` | {% data variables.product.prodname_registry %}へのパッケージのアップロードと公開 | 書き込み |
-| `delete:packages` | {% data variables.product.prodname_registry %}からの特定バージョンのプライベートパッケージの削除 | 管理 |
-| `repo` | プライベートリポジトリ内の特定パッケージのインストール、アップロード、削除(`read:packages`、`write:packages`あるいは`delete:packages`と併せて) | 読み取り、書き込み、あるいは管理 |
+| スコープ | 説明 | リポジトリの権限 |
+| ----------------- | ------------------------------------------------------------------------------ | --------------- |
+| `read:packages` | {% data variables.product.prodname_registry %}からのパッケージのダウンロードとインストール | 読み取り |
+| `write:packages` | {% data variables.product.prodname_registry %}へのパッケージのアップロードと公開 | 書き込み |
+| `delete:packages` | {% data variables.product.prodname_registry %}からの特定バージョンのプライベートパッケージの削除 | 管理 |
+| `repo` | Upload and delete packages (along with `write:packages`, or `delete:packages`) | write, or admin |
{% data variables.product.prodname_actions %}ワークフローを作成する際には、`GITHUB_TOKEN`を使って{% data variables.product.prodname_registry %}にパッケージを公開してインストールでき、個人アクセストークンを保存して管理する必要はありません。
diff --git a/translations/ja-JP/content/packages/publishing-and-managing-packages/publishing-a-package.md b/translations/ja-JP/content/packages/publishing-and-managing-packages/publishing-a-package.md
index 341cceaf2d..31c6a58a95 100644
--- a/translations/ja-JP/content/packages/publishing-and-managing-packages/publishing-a-package.md
+++ b/translations/ja-JP/content/packages/publishing-and-managing-packages/publishing-a-package.md
@@ -22,7 +22,7 @@ versions:
{% if currentVersion == "free-pro-team@latest" %}
新しいバージョンのパッケージでセキュリティの脆弱性が解決される場合は、リポジトリでセキュリティアドバイザリを公開する必要があります。
-{% data variables.product.prodname_dotcom %} は公開された各セキュリティアドバイザリを確認し、それを使用して、影響を受けるリポジトリに {% data variables.product.prodname_dependabot_short %} アラートを送信できます。 詳しい情報については、「[GitHub セキュリティアドバイザリについて](/github/managing-security-vulnerabilities/about-github-security-advisories)」 を参照してください。
+{% data variables.product.prodname_dotcom %} reviews each published security advisory and may use it to send {% data variables.product.prodname_dependabot_alerts %} to affected repositories. 詳しい情報については、「[GitHub セキュリティアドバイザリについて](/github/managing-security-vulnerabilities/about-github-security-advisories)」 を参照してください。
{% endif %}
### パッケージを公開する
diff --git a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md
index db90d6c8d0..6874bf7221 100644
--- a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md
+++ b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md
@@ -27,7 +27,7 @@ versions:
`servers`タグの中に、子として`server`タグを`id`付きで追加し、*USERNAME*を{% data variables.product.prodname_dotcom %}のユーザ名で、*TOKEN*を個人アクセストークンで置き換えてください。
-`repositories`の中で、リポジトリの`id`をクレデンシャルを含む`server`タグに追加した`id`にマッピングして、リポジトリを設定してください。 Replace {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}*REPOSITORY* with the name of the repository you'd like to publish a package to or install a package from, and *OWNER* with the name of the user or organization account that owns the repository. {% data reusables.package_registry.lowercase-name-field %}
+`repositories`の中で、リポジトリの`id`をクレデンシャルを含む`server`タグに追加した`id`にマッピングして、リポジトリを設定してください。 Replace {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}*REPOSITORY* with the name of the repository you'd like to publish a package to or install a package from, and *OWNER* with the name of the user or organization account that owns the repository. Because uppercase letters aren't supported, you must use lowercase letters for the repository owner even if the {% data variables.product.prodname_dotcom %} user or organization name contains uppercase letters.
複数のリポジトリとやりとりをしたい場合には、それぞれのリポジトリを`repositories`タグの子の個別の`repository`に追加し、それぞれの`id`を`servers` タグのクレデンシャルにマッピングできます。
diff --git a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md
index a5275650d9..7b76549bfb 100644
--- a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md
+++ b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md
@@ -23,7 +23,7 @@ versions:
{% if enterpriseServerVersions contains currentVersion %}
-Before you can use the Docker registry on {% data variables.product.prodname_registry %}, the site administrator for {% data variables.product.product_location %} must enable Docker support and subdomain isolation for your instance. 詳しい情報については、「[Enterprise 向けの GitHub Packages を管理する](/enterprise/admin/packages)」を参照してください。
+Docker レジストリを {% data variables.product.prodname_registry %} で使用する前に、{% data variables.product.product_location %} のサイト管理者がインスタンスに対し Docker のサポートとand Subdomain Isolation を有効化する必要があります。 詳しい情報については、「[Enterprise 向けの GitHub Packages を管理する](/enterprise/admin/packages)」を参照してください。
{% endif %}
@@ -74,13 +74,17 @@ To use this example login command, replace `USERNAME` with your {% data variable
{% data reusables.package_registry.package-registry-with-github-tokens %}
-### パッケージを公開する
+### Publishing an image
{% data reusables.package_registry.docker_registry_deprecation_status %}
-{% data variables.product.prodname_registry %} は、リポジトリごとに複数の最上位 Docker イメージをサポートしています。 リポジトリは任意の数のイメージタグを持つことができます。 10GB以上のDockerイメージの公開やインストールの際には、サービスのパフォーマンスが低下するかもしれず、各レイヤーは5GBが上限です。 詳しい情報については、Dockerのドキュメンテーションの「[Docker tag](https://docs.docker.com/engine/reference/commandline/tag/)」を参照してください。
+{% note %}
-{% data reusables.package_registry.lowercase-name-field %}
+**Note:** Image names must only use lowercase letters.
+
+{% endnote %}
+
+{% data variables.product.prodname_registry %} は、リポジトリごとに複数の最上位 Docker イメージをサポートしています。 リポジトリは任意の数のイメージタグを持つことができます。 10GB以上のDockerイメージの公開やインストールの際には、サービスのパフォーマンスが低下するかもしれず、各レイヤーは5GBが上限です。 詳しい情報については、Dockerのドキュメンテーションの「[Docker tag](https://docs.docker.com/engine/reference/commandline/tag/)」を参照してください。
{% data reusables.package_registry.viewing-packages %}
@@ -191,11 +195,11 @@ $ docker push docker.HOSTNAME/octocat/octo-app/monalisa:1.0
```
{% endif %}
-### パッケージをインストールする
+### Downloading an image
{% data reusables.package_registry.docker_registry_deprecation_status %}
-You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %}
+You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install.
{% if currentVersion == "free-pro-team@latest" %}
```shell
diff --git a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md
index 0bd602f9a3..570cb2c7e0 100644
--- a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md
+++ b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md
@@ -78,7 +78,7 @@ versions:
### パッケージを公開する
-*nuget.config*で認証を受けることによって、パッケージを{% data variables.product.prodname_registry %}に公開できます。 公開の際には、*nuget.config*認証ファイルで使用する*csproj*ファイル中で、`OWNER`に同じ値を使わなければなりません。 *.csproj*ファイル中でバージョン番号を指定もしくはインクリメントし、`dotnet pack`コマンドを使ってそのバージョンのための*.nuspec*ファイルを作成してください。 パッケージの作成に関する詳しい情報については、Microsoftのドキュメンテーション中の「[クイック スタート: パッケージの作成と公開 (dotnet CLI)](https://docs.microsoft.com/ja-jp/nuget/quickstart/create-and-publish-a-package-using-the-dotnet-cli)」を参照してください。
+*nuget.config*で認証を受けることによって、パッケージを{% data variables.product.prodname_registry %}に公開できます。 公開の際には、*nuget.config*認証ファイルで使用する*csproj*ファイル中で、`OWNER`に同じ値を使わなければなりません。 *.csproj*ファイル中でバージョン番号を指定もしくはインクリメントし、`dotnet pack`コマンドを使ってそのバージョンのための*.nuspec*ファイルを作成してください。 For more information on creating your package, see "[Create and publish a package](https://docs.microsoft.com/nuget/quickstart/create-and-publish-a-package-using-the-dotnet-cli)" in the Microsoft documentation.
{% data reusables.package_registry.viewing-packages %}
@@ -160,7 +160,7 @@ versions:
### パッケージをインストールする
-プロジェクトで{% data variables.product.prodname_dotcom %}からパッケージを利用するのは、*nuget.org*からパッケージを使用するのに似ています。 パッケージの依存関係を*.csproj*ファイルに追加し、パッケージ名とバージョンを指定してください。 プロジェクトでの*.csproj*ファイルの利用に関する詳しい情報については、Microsoftのドキュメンテーションの「[パッケージ利用のワークフロー](https://docs.microsoft.com/ja-jp/nuget/consume-packages/overview-and-workflow)」を参照してください。
+プロジェクトで{% data variables.product.prodname_dotcom %}からパッケージを利用するのは、*nuget.org*からパッケージを使用するのに似ています。 パッケージの依存関係を*.csproj*ファイルに追加し、パッケージ名とバージョンを指定してください。 For more information on using a *.csproj* file in your project, see "[Working with NuGet packages](https://docs.microsoft.com/nuget/consume-packages/overview-and-workflow)" in the Microsoft documentation.
{% data reusables.package_registry.authenticate-step %}
diff --git a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md
index 8f2b8d9af9..a9ec03c514 100644
--- a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md
+++ b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md
@@ -30,7 +30,7 @@ Gradle GroovyもしくはKotlin DSLを使って、Gradleで{% data variables.pro
{% data variables.product.prodname_ghe_server %} インスタンスのホスト名に置き換えてください。
{% endif %}
-*USERNAME*を{% data variables.product.prodname_dotcom %}のユーザ名で、*TOKEN*を個人アクセストークンで、*REPOSITORY*を公開したいパッケージを含むリポジトリの名前で、*OWNER*をリポジトリを所有する{% data variables.product.prodname_dotcom %}のユーザもしくはOrganizationアカウント名で置き換えてください。 {% data reusables.package_registry.lowercase-name-field %}
+*USERNAME*を{% data variables.product.prodname_dotcom %}のユーザ名で、*TOKEN*を個人アクセストークンで、*REPOSITORY*を公開したいパッケージを含むリポジトリの名前で、*OWNER*をリポジトリを所有する{% data variables.product.prodname_dotcom %}のユーザもしくはOrganizationアカウント名で置き換えてください。 Because uppercase letters aren't supported, you must use lowercase letters for the repository owner even if the {% data variables.product.prodname_dotcom %} user or organization name contains uppercase letters.
{% note %}
diff --git a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md
index 2fe0d525a4..7503988f82 100644
--- a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md
+++ b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md
@@ -75,22 +75,28 @@ registry=https://npm.pkg.github.com/OWNER
### パッケージを公開する
+{% note %}
+
+**Note:** Package names and scopes must only use lowercase letters.
+
+{% endnote %}
+
デフォルトでは、{% data variables.product.prodname_registry %}は*package.json*ファイルのnameフィールドで指定された{% data variables.product.prodname_dotcom %}のリポジトリにパッケージを公開します。 たとえば`@my-org/test`という名前のパッケージを{% data variables.product.prodname_dotcom %}リポジトリの`my-org/test`に公開します。 パッケージディレクトリに*README.md*ファイルを置くことで、パッケージリスティングページのためのまとめを追加できます。 詳しい情報については、npmのドキュメンテーション中の「[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)」及び「[How to create Node.js Modules](https://docs.npmjs.com/getting-started/creating-node-modules)」を参照してください。
`URL`フィールドを*package.json*ファイルに含めることで、同じ{% data variables.product.prodname_dotcom %}のリポジトリに複数のパッケージを公開できます。 詳しい情報については「[同じリポジトリへの複数パッケージの公開](#publishing-multiple-packages-to-the-same-repository)」を参照してください。
-プロジェクト内にあるローカルの *.npmrc* ファイルか、*package.json* の `publishConfig` オプションを使って、スコープのマッピングを設定できます。 {% data variables.product.prodname_registry %}はスコープ付きのnpmパッケージのみをサポートしています。 スコープ付きパッケージには、`@owner/name` というフォーマットの名前が付いています。 スコープ付きパッケージの先頭には常に `@` 記号が付いています。 スコープ付きの名前を使うには、*package.json* の名前を更新する必要がある場合があります。 たとえば、`"name": "@codertocat/hello-world-npm"` のようになります。
+プロジェクト内にあるローカルの *.npmrc* ファイルか、*package.json* の `publishConfig` オプションを使って、スコープのマッピングを設定できます。 {% data variables.product.prodname_registry %}はスコープ付きのnpmパッケージのみをサポートしています。 スコープ付きパッケージには、`@owner/name` というフォーマットの名前が付いています。 スコープ付きパッケージの先頭には常に `@` 記号が付いています。 You may need to update the name in your *package.json* to use the scoped name. たとえば、`"name": "@codertocat/hello-world-npm"` のようになります。
{% data reusables.package_registry.viewing-packages %}
#### ローカルの*.npmrc*ファイルを使ったパッケージの公開
-*.npmrc*ファイルを使って、プロジェクトのスコープのマッピングを設定できます。 *.npmrc*ファイル中で{% data variables.product.prodname_registry %} URLとアカウントオーナーを使い、{% data variables.product.prodname_registry %}がどこへパッケージリクエストをまわせばいいか把握できるようにしてください。 *.npmrc*を使う事で、他の開発者が{% data variables.product.prodname_registry %}の代わりにうっかりパッケージをnpmjs.orgに公開してしまうのを避けることができます。 {% data reusables.package_registry.lowercase-name-field %}
+*.npmrc*ファイルを使って、プロジェクトのスコープのマッピングを設定できます。 *.npmrc*ファイル中で{% data variables.product.prodname_registry %} URLとアカウントオーナーを使い、{% data variables.product.prodname_registry %}がどこへパッケージリクエストをまわせばいいか把握できるようにしてください。 *.npmrc*を使う事で、他の開発者が{% data variables.product.prodname_registry %}の代わりにうっかりパッケージをnpmjs.orgに公開してしまうのを避けることができます。
{% data reusables.package_registry.authenticate-step %}
{% data reusables.package_registry.create-npmrc-owner-step %}
{% data reusables.package_registry.add-npmrc-to-repo-step %}
-4. プロジェクトの*package.json*中のパッケージ名を確認してください。 `name`フィールドは、スコープとパッケージの名前を含まなければなりません。 たとえば、パッケージの名前が "test" で、それを "My-org" という
+1. プロジェクトの*package.json*中のパッケージ名を確認してください。 `name`フィールドは、スコープとパッケージの名前を含まなければなりません。 たとえば、パッケージの名前が "test" で、それを "My-org" という
{% data variables.product.prodname_dotcom %} Organizationに公開する場合、*package.json*の`name`フィールドは `@my-org/test`とする必要があります。
{% data reusables.package_registry.verify_repository_field %}
{% data reusables.package_registry.publish_package %}
@@ -137,7 +143,7 @@ registry=https://npm.pkg.github.com/OWNER
### パッケージをインストールする
-プロジェクトの*package.json*ファイルに依存関係としてパッケージを追加することで、{% data variables.product.prodname_registry %}からパッケージをインストールできます。 プロジェクトにおける *package.json* の利用に関する詳しい情報については、npm ドキュメンテーションの「[package.json を使って作業する](https://docs.npmjs.com/getting-started/using-a-package.json)」を参照してください。
+プロジェクトの*package.json*ファイルに依存関係としてパッケージを追加することで、{% data variables.product.prodname_registry %}からパッケージをインストールできます。 For more information on using a *package.json* in your project, see "[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)" in the npm documentation.
デフォルトでは、パッケージは1つのOrganizationから追加できます。 For more information, see "[Installing packages from other organizations](#installing-packages-from-other-organizations)."
@@ -169,7 +175,7 @@ registry=https://npm.pkg.github.com/OWNER
#### 他のOrganizationからのパッケージのインストール
-デフォルトでは、1つのOrganizationからのみ{% data variables.product.prodname_registry %}パッケージを利用できます。 If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %}
+デフォルトでは、1つのOrganizationからのみ{% data variables.product.prodname_registry %}パッケージを利用できます。 If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project.
{% if enterpriseServerVersions contains currentVersion %}
パッケージの作成に関する詳しい情報については[maven.apache.orgのドキュメンテーション](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)を参照してください。
@@ -177,8 +183,8 @@ registry=https://npm.pkg.github.com/OWNER
```shell
registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME{% endif %}/OWNER
-@OWNER:registry={% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}
-@OWNER:registry={% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}
+@OWNER:registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}
+@OWNER:registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}
```
{% if enterpriseServerVersions contains currentVersion %}
@@ -186,8 +192,8 @@ registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github
```shell
registry=https://HOSTNAME/_registry/npm/OWNER
-@OWNER:registry=HOSTNAME/_registry/npm/
-@OWNER:registry=HOSTNAME/_registry/npm/
+@OWNER:registry=https://HOSTNAME/_registry/npm/
+@OWNER:registry=https://HOSTNAME/_registry/npm/
```
{% endif %}
diff --git a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md
index 5a700026bd..8390f18cab 100644
--- a/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md
+++ b/translations/ja-JP/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md
@@ -75,8 +75,6 @@ gemをインストールするには、プロジェクトの*~/.gemrc*ファイ
To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. インスタンスで Subdomain Isolation が有効になっている場合は、`rubygems.HOSTNAME` を使用します。 インスタンスで Subdomain Isolation が無効になっている場合は、`HOSTNAME/_registry/rubygems` を使用します。 いずれの場合でも、 *HOSTNAME* を {% data variables.product.prodname_ghe_server %} インスタンスのホスト名に置き換えてください。{% endif %}
-{% data reusables.package_registry.lowercase-name-field %}
-
```shell
$ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER USERNAME:TOKEN
```
diff --git a/translations/ja-JP/content/rest/overview/api-previews.md b/translations/ja-JP/content/rest/overview/api-previews.md
index 93d46d2017..294244da49 100644
--- a/translations/ja-JP/content/rest/overview/api-previews.md
+++ b/translations/ja-JP/content/rest/overview/api-previews.md
@@ -70,14 +70,6 @@ API を介して[インテグレーション](/early-access/integrations/)を管
**カスタムメディアタイプ:** `cloak-preview` **発表日:** [2017-01-05](https://developer.github.com/changes/2017-01-05-commit-search-api/)
-{% if currentVersion == "free-pro-team@latest" %}
-### コミュニティプロフィールメトリクス
-
-パブリックリポジトリの[コミュニティプロフィールメトリック](/v3/repos/community/)(コミュニティ健全性とも呼ばれる)を取得します。
-
-**カスタムメディアタイプ:** `black-panther-preview` **発表日:** [2017-02-09](https://developer.github.com/changes/2017-02-09-community-health/)
-{% endif %}
-
{% if currentVersion == "free-pro-team@latest" %}
### ユーザブロック
@@ -206,16 +198,6 @@ Organization メンバーによるリポジトリの作成可否、および作
**カスタムメディアタイプ:** `corsair-preview` **発表日:** [2018-12-10](https://developer.github.com/changes/2018-12-10-content-attachments-api/)
-{% if currentVersion == "free-pro-team@latest" %}
-
-### リポジトリと Organization に対するインタラクションの制限
-
-{% data variables.product.product_name %} リポジトリまたは Organization に対して、コメント、Issue のオープン、プルリクエスト作成などのインタラクションを一時的に制限できます。 有効にすると、指定した {% data variables.product.product_name %} ユーザのグループのみがこれらの操作に参加できます。インタラクション 詳細については、 [リポジトリインタラクション](/v3/interactions/repos/)と [Organization インタラクション](/v3/interactions/orgs/) API を参照してください。
-
-**カスタムメディアタイプ:** `sombra-preview` **発表日:** [2018-12-18](https://developer.github.com/changes/2018-12-18-interactions-preview/)
-
-{% endif %}
-
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %}
### ドラフトプルリクエスト
diff --git a/translations/ja-JP/content/rest/overview/libraries.md b/translations/ja-JP/content/rest/overview/libraries.md
index f57579145b..fbdaca7569 100644
--- a/translations/ja-JP/content/rest/overview/libraries.md
+++ b/translations/ja-JP/content/rest/overview/libraries.md
@@ -11,13 +11,12 @@ versions:
- Octokit には
- いくつかの種類があります
+ Octokit comes in many flavors
公式の Octokit ライブラリを使用するか、利用可能なサードパーティライブラリのいずれかを選択します。
-
@@ -25,138 +24,64 @@ versions:
### Clojure
-* [Tentacles][tentacles]
+Library name | Repository |---|---| **Tentacles**| [Raynes/tentacles](https://github.com/Raynes/tentacles)
### Dart
-* [github.dart][github.dart]
+Library name | Repository |---|---| **github.dart** | [DirectMyFile/github.dart](https://github.com/DirectMyFile/github.dart)
### Emacs Lisp
-* [gh.el][gh.el]
+Library name | Repository |---|---| **gh.el** | [sigma/gh.el](https://github.com/sigma/gh.el)
### Erlang
-* [octo.erl][octo-erl]
+Library name | Repository |---|---| **octo-erl** | [sdepold/octo.erl](https://github.com/sdepold/octo.erl)
### Go
-* [go-github][]
+Library name | Repository |---|---| **go-github**| [google/go-github](https://github.com/google/go-github)
### Haskell
-* [github][haskell-github]
+Library name | Repository |---|---| **haskell-github** | [fpco/Github](https://github.com/fpco/GitHub)
### Java
-* [GitHub Java API (org.eclipse.egit.github.core)](https://github.com/eclipse/egit-github/tree/master/org.eclipse.egit.github.core) ライブラリは、[GitHub Mylyn Connector](https://github.com/eclipse/egit-github) の一部であり、GitHub v3 API 全体をサポートすることを目的としています。 ビルドは [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22org.eclipse.egit.github.core%22) で利用できます。
-* [GitHub API for Java (org.kohsuke.github)](http://github-api.kohsuke.org/) は、GitHub API のオブジェクト指向の表現を定義します。
-* [JCabi GitHub API](http://github.jcabi.com) は Java7 JSON API (JSR-353) に基づいており、ランタイム GitHub スタブを使用してテストを簡素化し、API 全体をカバーします。
+Library name | Repository | More information |---|---|---| **GitHub Java API**| [org.eclipse.egit.github.core](https://github.com/eclipse/egit-github/tree/master/org.eclipse.egit.github.core) | Is part of the [GitHub Mylyn Connector](https://github.com/eclipse/egit-github) and aims to support the entire GitHub v3 API. ビルドは [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22org.eclipse.egit.github.core%22) で利用できます。 **GitHub API for Java**| [org.kohsuke.github (From github-api)](http://github-api.kohsuke.org/)|defines an object oriented representation of the GitHub API. **JCabi GitHub API**|[github.jcabi.com (Personal Website)](http://github.jcabi.com)|is based on Java7 JSON API (JSR-353), simplifies tests with a runtime GitHub stub, and covers the entire API.
### JavaScript
-* [NodeJS GitHub library][octonode]
-* [gh3 client-side API v3 wrapper][gh3]
-* [GitHub.js wrapper around the GitHub API][github]
-* [Promise-Based CoffeeScript library for the browser or NodeJS][github-client]
+Library name | Repository | |---|---| **NodeJS GitHub library**| [pksunkara/octonode](https://github.com/pksunkara/octonode) **gh3 client-side API v3 wrapper**| [k33g/gh3](https://github.com/k33g/gh3) **Github.js wrapper around the GitHub API**|[michael/github](https://github.com/michael/github) **Promise-Based CoffeeScript library for the Browser or NodeJS**|[philschatz/github-client](https://github.com/philschatz/github-client)
### Julia
-* [GitHub.jl][github.jl]
+Library name | Repository | |---|---| **Github.jl**|[WestleyArgentum/Github.jl](https://github.com/WestleyArgentum/GitHub.jl)
### OCaml
-* [ocaml-github][ocaml-github]
+Library name | Repository | |---|---| **ocaml-github**|[mirage/ocaml-github](https://github.com/mirage/ocaml-github)
### Perl
-* [Pithub][pithub-github] ([CPAN][pithub-cpan])
-* [Net::GitHub][net-github-github] ([CPAN][net-github-cpan])
+Library name | Repository | metacpan Website for the Library |---|---|---| **Pithub**|[plu/Pithub](https://github.com/plu/Pithub)|[Pithub CPAN](http://metacpan.org/module/Pithub) **Net::Github**|[fayland/perl-net-github](https://github.com/fayland/perl-net-github)|[Net:Github CPAN](https://metacpan.org/pod/Net::GitHub)
### PHP
-* [GitHub PHP Client][github-php-client]
-* [PHP GitHub API][php-github-api]
-* [GitHub API][github-api]
-* [GitHub Joomla! Package][joomla]
-* [Github Nette Extension][kdyby-github]
-* [GitHub API Easy Access][milo-github-api]
-* [GitHub bridge for Laravel][github-laravel]
-* [PHP5.6|PHP7 Client & WebHook wrapper][flexyproject-githubapi]
+Library name | Repository |---|---| **GitHub PHP Client**|[tan-tan-kanarek/github-php-client](https://github.com/tan-tan-kanarek/github-php-client) **PHP GitHub API**|[KnpLabs/php-github-api](https://github.com/KnpLabs/php-github-api) **GitHub API**|[yiiext/github-api](https://github.com/yiiext/github-api) **GitHub Joomla! Package**|[joomla-framework/github-api](https://github.com/joomla-framework/github-api) **GitHub Nette Extension**|[kdyby/github](https://github.com/kdyby/github) **GitHub API Easy Access**|[milo/github-api](https://github.com/milo/github-api) **GitHub bridge for Laravel**|[GrahamCampbell/Laravel-Github](https://github.com/GrahamCampbell/Laravel-GitHub) **PHP7 Client & WebHook wrapper**|[FlexyProject/GithubAPI](https://github.com/FlexyProject/GitHubAPI)
### Python
-* [PyGithub][jacquev6_pygithub]
-* [libsaas][libsaas]
-* [github3.py][github3py]
-* [sanction][sanction]
-* [agithub][agithub]
-* [octohub][octohub]
-* [Github-Flask][github-flask]
-* [torngithub][torngithub]
+Library name | Repository |---|---| **PyGithub**|[PyGithub/PyGithub](https://github.com/PyGithub/PyGithub) **libsaas**|[duckboard/libsaas](https://github.com/ducksboard/libsaas) **github3.py**|[sigmavirus24/github3.py](https://github.com/sigmavirus24/github3.py) **sanction**|[demianbrecht/sanction](https://github.com/demianbrecht/sanction) **agithub**|[jpaugh/agithub](https://github.com/jpaugh/agithub) **octohub**|[turnkeylinux/octohub](https://github.com/turnkeylinux/octohub) **github-flask**|[github-flask (Oficial Website)](http://github-flask.readthedocs.org) **torngithub**|[jkeylu/torngithub](https://github.com/jkeylu/torngithub)
### Ruby
-* [GitHub API Gem][ghapi]
-* [Ghee][ghee]
+Library name | Repository |---|---| **GitHub API Gem**|[peter-murach/github](https://github.com/peter-murach/github) **Ghee**|[rauhryan/ghee](https://github.com/rauhryan/ghee)
### Scala
-* [Hubcat][hubcat]
-* [Github4s][github4s]
+Library name | Repository |---|---| **Hubcat**|[softprops/hubcat](https://github.com/softprops/hubcat) **Github4s**|[47deg/github4s](https://github.com/47deg/github4s)
### Shell
-* [ok.sh][ok.sh]
-
-[tentacles]: https://github.com/Raynes/tentacles
-
-[github.dart]: https://github.com/DirectMyFile/github.dart
-
-[gh.el]: https://github.com/sigma/gh.el
-
-[octo-erl]: https://github.com/sdepold/octo.erl
-
-[go-github]: https://github.com/google/go-github
-
-[haskell-github]: https://github.com/fpco/GitHub
-
-[octonode]: https://github.com/pksunkara/octonode
-[gh3]: https://github.com/k33g/gh3
-[github]: https://github.com/michael/github
-[github-client]: https://github.com/philschatz/github-client
-
-[github.jl]: https://github.com/WestleyArgentum/GitHub.jl
-
-[ocaml-github]: https://github.com/mirage/ocaml-github
-
-[net-github-github]: https://github.com/fayland/perl-net-github
-[net-github-cpan]: https://metacpan.org/pod/Net::GitHub
-[pithub-github]: https://github.com/plu/Pithub
-[pithub-cpan]: http://metacpan.org/module/Pithub
-
-[github-php-client]: https://github.com/tan-tan-kanarek/github-php-client
-[php-github-api]: https://github.com/KnpLabs/php-github-api
-[github-api]: https://github.com/yiiext/github-api
-[joomla]: https://github.com/joomla-framework/github-api
-[kdyby-github]: https://github.com/kdyby/github
-[milo-github-api]: https://github.com/milo/github-api
-[github-laravel]: https://github.com/GrahamCampbell/Laravel-GitHub
-[flexyproject-githubapi]: https://github.com/FlexyProject/GitHubAPI
-
-[jacquev6_pygithub]: https://github.com/PyGithub/PyGithub
-[libsaas]: https://github.com/ducksboard/libsaas
-[github3py]: https://github.com/sigmavirus24/github3.py
-[sanction]: https://github.com/demianbrecht/sanction
-[agithub]: https://github.com/jpaugh/agithub "Agnostic GitHub"
-[octohub]: https://github.com/turnkeylinux/octohub
-[github-flask]: http://github-flask.readthedocs.org
-[torngithub]: https://github.com/jkeylu/torngithub
-
-[ghapi]: https://github.com/peter-murach/github
-[ghee]: https://github.com/rauhryan/ghee
-
-[hubcat]: https://github.com/softprops/hubcat
-[github4s]: https://github.com/47deg/github4s
-
-[ok.sh]: https://github.com/whiteinge/ok.sh
+Library name | Repository |---|---| **ok.sh**|[whiteinge/ok.sh](https://github.com/whiteinge/ok.sh)
diff --git a/translations/ja-JP/content/rest/reference/actions.md b/translations/ja-JP/content/rest/reference/actions.md
index 060eafd319..f3eb50251a 100644
--- a/translations/ja-JP/content/rest/reference/actions.md
+++ b/translations/ja-JP/content/rest/reference/actions.md
@@ -24,6 +24,7 @@ versions:
{% if operation.subcategory == 'artifacts' %}{% include rest_operation %}{% endif %}
{% endfor %}
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}
## 権限
The Permissions API allows you to set permissions for what organizations and repositories are allowed to run {% data variables.product.prodname_actions %}, and what actions are allowed to run. 詳しい情報については、「[使用制限、支払い、および管理](/actions/reference/usage-limits-billing-and-administration#disabling-or-limiting-github-actions-for-your-repository-or-organization)」を参照してください。
@@ -33,6 +34,7 @@ You can also set permissions for an enterprise. 詳しい情報については
{% for operation in currentRestOperations %}
{% if operation.subcategory == 'permissions' %}{% include rest_operation %}{% endif %}
{% endfor %}
+{% endif %}
## シークレット
diff --git a/translations/ja-JP/content/rest/reference/permissions-required-for-github-apps.md b/translations/ja-JP/content/rest/reference/permissions-required-for-github-apps.md
index 0b2c013137..05341be0ad 100644
--- a/translations/ja-JP/content/rest/reference/permissions-required-for-github-apps.md
+++ b/translations/ja-JP/content/rest/reference/permissions-required-for-github-apps.md
@@ -186,7 +186,7 @@ _ブランチ_
- [`POST /repos/:owner/:repo/branches/:branch/protection/required_signatures`](/v3/repos/branches/#create-commit-signature-protection) (:write)
- [`DELETE /repos/:owner/:repo/branches/:branch/protection/required_signatures`](/v3/repos/branches/#delete-commit-signature-protection) (:write)
- [`GET /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/v3/repos/branches/#get-status-checks-protection) (:read)
-- [`PATCH /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/v3/repos/branches/#update-status-check-potection) (:write)
+- [`PATCH /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/v3/repos/branches/#update-status-check-protection) (:write)
- [`DELETE /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/v3/repos/branches/#remove-status-check-protection) (:write)
- [`GET /repos/:owner/:repo/branches/:branch/protection/required_status_checks/contexts`](/v3/repos/branches/#get-all-status-check-contexts) (:read)
- [`POST /repos/:owner/:repo/branches/:branch/protection/required_status_checks/contexts`](/v3/repos/branches/#add-status-check-contexts) (:write)
diff --git a/translations/ja-JP/data/glossaries/external.yml b/translations/ja-JP/data/glossaries/external.yml
index 5714ff03ff..f7d2d1791e 100644
--- a/translations/ja-JP/data/glossaries/external.yml
+++ b/translations/ja-JP/data/glossaries/external.yml
@@ -61,7 +61,7 @@
-
term: ブランチ
description: >-
- ブランチとは、リポジトリの並列バージョンです。リポジトリの中に含まれますが、プライマリブランチや master ブランチには影響を与えず、「本番」のバージョンを乱すことなく自由に作業できるようにします。意図して変更を加えた場合、そのブランチを master ブランチにマージすると、変更内容を公開することができます。
+ A branch is a parallel version of a repository. It is contained within the repository, but does not affect the primary or main branch allowing you to work freely without disrupting the "live" version. When you've made the changes you want to make, you can merge your branch back into the main branch to publish your changes.
-
term: ブランチ制限
description: >-
@@ -140,7 +140,8 @@
コミットに付随し、コミットで導入されてくる変更について伝達する、手短な説明のテキスト。
-
term: 比較ブランチ
- description: プルリクエストを作成するのに使うブランチ。このブランチは、プルリクエストについて選択したベースブランチと比較され、変更分が特定されます。プルリクエストがマージされる際には、ベースブランチは比較ブランチからの変更分で更新されます。プルリクエストの「headブランチ」とも呼ばれます。
+ description: >-
+ プルリクエストを作成するのに使うブランチ。このブランチは、プルリクエストについて選択したベースブランチと比較され、変更分が特定されます。プルリクエストがマージされる際には、ベースブランチは比較ブランチからの変更分で更新されます。プルリクエストの「headブランチ」とも呼ばれます。
-
term: 継続的インテグレーション
description: >-
@@ -386,10 +387,14 @@
-
term: マークアップ
description: ドキュメントのアノテーションおよびフォーマットのためのシステム。
+-
+ term: main
+ description: >-
+ The default development branch. Whenever you create a Git repository, a branch named "main" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required.
-
term: master
description: >-
- デフォルトの開発ブランチ。Git リポジトリを作成するたびに、「master」という名前のブランチが作成され、アクティブブランチとなります。ほとんどの場合、これにはローカル開発が含まれますが、単に慣習によるものであり、必須ではありません。
+ The default branch in many Git repositories. By default, when you create a new Git repository on the command line a branch called `master` is created. Many tools now use an alternative name for the default branch. For example, when you create a new repository on GitHub the default branch is called `main`.
-
term: メンバーグラフ
description: リポジトリのすべてのフォークを表示するリポジトリグラフ。
diff --git a/translations/ja-JP/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml b/translations/ja-JP/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
index 19d881fe99..e37f1e71df 100644
--- a/translations/ja-JP/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
+++ b/translations/ja-JP/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
@@ -70,20 +70,6 @@ upcoming_changes:
date: '2020-10-01T00:00:00+00:00'
criticality: 破壊的
owner: mikesea
- -
- location: RepositoryCollaboratorEdge.permission
- description: '`Permission`の型は、`RepositoryPermission!`から`String` に変更されます。'
- reason: このフィールドは、追加の値を返す場合があります。
- date: '2020-10-01T00:00:00+00:00'
- criticality: 破壊的
- owner: oneill38
- -
- location: RepositoryInvitation.permission
- description: '`Permission`の型は、`RepositoryPermission!`から`String` に変更されます。'
- reason: このフィールドは、追加の値を返す場合があります。
- date: '2020-10-01T00:00:00+00:00'
- criticality: 破壊的
- owner: oneill38
-
location: RepositoryInvitationOrderField.INVITEE_LOGIN
description: "`INVITEE_LOGIN`は削除されます。"
@@ -98,13 +84,6 @@ upcoming_changes:
date: '2020-10-01T00:00:00+00:00'
criticality: 破壊的
owner: nholden
- -
- location: TeamRepositoryEdge.permission
- description: '`Permission`の型は、`RepositoryPermission!`から`String` に変更されます。'
- reason: このフィールドは、追加の値を返す場合があります。
- date: '2020-10-01T00:00:00+00:00'
- criticality: 破壊的
- owner: oneill38
-
location: EnterpriseMemberEdge.isUnlicensed
description: "`isUnlicensed` will be removed."
diff --git a/translations/ja-JP/data/graphql/graphql_upcoming_changes.public.yml b/translations/ja-JP/data/graphql/graphql_upcoming_changes.public.yml
index 1c1ac5b6ce..3bd2d3df4d 100644
--- a/translations/ja-JP/data/graphql/graphql_upcoming_changes.public.yml
+++ b/translations/ja-JP/data/graphql/graphql_upcoming_changes.public.yml
@@ -77,20 +77,6 @@ upcoming_changes:
date: '2020-10-01T00:00:00+00:00'
criticality: 破壊的
owner: mikesea
- -
- location: RepositoryCollaboratorEdge.permission
- description: '`Permission`の型は、`RepositoryPermission!`から`String` に変更されます。'
- reason: このフィールドは、追加の値を返す場合があります。
- date: '2020-10-01T00:00:00+00:00'
- criticality: 破壊的
- owner: oneill38
- -
- location: RepositoryInvitation.permission
- description: '`Permission`の型は、`RepositoryPermission!`から`String` に変更されます。'
- reason: このフィールドは、追加の値を返す場合があります。
- date: '2020-10-01T00:00:00+00:00'
- criticality: 破壊的
- owner: oneill38
-
location: RepositoryInvitationOrderField.INVITEE_LOGIN
description: "`INVITEE_LOGIN`は削除されます。"
@@ -105,13 +91,6 @@ upcoming_changes:
date: '2020-10-01T00:00:00+00:00'
criticality: 破壊的
owner: nholden
- -
- location: TeamRepositoryEdge.permission
- description: '`Permission`の型は、`RepositoryPermission!`から`String` に変更されます。'
- reason: このフィールドは、追加の値を返す場合があります。
- date: '2020-10-01T00:00:00+00:00'
- criticality: 破壊的
- owner: oneill38
-
location: EnterpriseMemberEdge.isUnlicensed
description: "`isUnlicensed` will be removed."
diff --git a/translations/ja-JP/data/reusables/actions/actions-use-policy-settings.md b/translations/ja-JP/data/reusables/actions/actions-use-policy-settings.md
index b25cd5eb26..02de83e2ef 100644
--- a/translations/ja-JP/data/reusables/actions/actions-use-policy-settings.md
+++ b/translations/ja-JP/data/reusables/actions/actions-use-policy-settings.md
@@ -1,3 +1,3 @@
-If you choose the option to **Allow specific actions**, there are additional options that you can configure. For more information, see "[Allowing specific actions to run](#allowing-specific-actions-to-run)."
+If you choose **Allow select actions**, local actions are allowed, and there are additional options for allowing other specific actions. For more information, see "[Allowing specific actions to run](#allowing-specific-actions-to-run)."
When you allow local actions only, the policy blocks all access to actions authored by {% data variables.product.prodname_dotcom %}. For example, the [`actions/checkout`](https://github.com/actions/checkout) would not be accessible.
\ No newline at end of file
diff --git a/translations/ja-JP/data/reusables/actions/allow-specific-actions-intro.md b/translations/ja-JP/data/reusables/actions/allow-specific-actions-intro.md
index 248668d773..d94816467d 100644
--- a/translations/ja-JP/data/reusables/actions/allow-specific-actions-intro.md
+++ b/translations/ja-JP/data/reusables/actions/allow-specific-actions-intro.md
@@ -1,4 +1,4 @@
-When you select the **Allow select actions**, there are additional options that you need to choose to configure the allowed actions:
+When you choose **Allow select actions**, local actions are allowed, and there are additional options for allowing other specific actions:
- **Allow actions created by {% data variables.product.prodname_dotcom %}:** You can allow all actions created by {% data variables.product.prodname_dotcom %} to be used by workflows. Actions created by {% data variables.product.prodname_dotcom %} are located in the `actions` and `github` organization. For more information, see the [`actions`](https://github.com/actions) and [`github`](https://github.com/github) organizations.
- **Allow Marketplace actions by verified creators:** You can allow all {% data variables.product.prodname_marketplace %} actions created by verified creators to be used by workflows. When GitHub has verified the creator of the action as a partner organization, the {% octicon "verified" aria-label="The verified badge" %} badge is displayed next to the action in {% data variables.product.prodname_marketplace %}.
diff --git a/translations/ja-JP/data/reusables/community/interaction-limits-duration.md b/translations/ja-JP/data/reusables/community/interaction-limits-duration.md
new file mode 100644
index 0000000000..fb858accd8
--- /dev/null
+++ b/translations/ja-JP/data/reusables/community/interaction-limits-duration.md
@@ -0,0 +1 @@
+When you enable an interaction limit, you can choose a duration for the limit: 24 hours, 3 days, 1 week, 1 month, or 6 months.
\ No newline at end of file
diff --git a/translations/ja-JP/data/reusables/community/interaction-limits-restrictions.md b/translations/ja-JP/data/reusables/community/interaction-limits-restrictions.md
new file mode 100644
index 0000000000..1be2648d16
--- /dev/null
+++ b/translations/ja-JP/data/reusables/community/interaction-limits-restrictions.md
@@ -0,0 +1 @@
+Enabling an interaction limit for a repository restricts certain users from commenting, opening issues, creating pull requests, reacting with emojis, editing existing comments, and editing titles of issues and pull requests.
\ No newline at end of file
diff --git a/translations/ja-JP/data/reusables/community/set-interaction-limit.md b/translations/ja-JP/data/reusables/community/set-interaction-limit.md
new file mode 100644
index 0000000000..468a068f70
--- /dev/null
+++ b/translations/ja-JP/data/reusables/community/set-interaction-limit.md
@@ -0,0 +1 @@
+5. Under "Temporary interaction limits", to the right of the type of interaction limit you want to set, use the **Enable** drop-down menu, then click the duration you want for your interaction limit.
\ No newline at end of file
diff --git a/translations/ja-JP/data/reusables/community/types-of-interaction-limits.md b/translations/ja-JP/data/reusables/community/types-of-interaction-limits.md
new file mode 100644
index 0000000000..38b80047f9
--- /dev/null
+++ b/translations/ja-JP/data/reusables/community/types-of-interaction-limits.md
@@ -0,0 +1,4 @@
+There are three types of interaction limits.
+ - [**Limit to existing users**]: 作成してから 24 時間経過していないアカウントで、以前のコントリビューションがなく、コラボレーターではないユーザのアクティビティを制限します。
+ - **Limit to prior contributors**: Limits activity for users who have not previously contributed to the default branch of the repository and are not collaborators.
+ - **Limit to repository collaborators**: Limits activity for users who do not have write access to the repository.
\ No newline at end of file
diff --git a/translations/ja-JP/data/reusables/dependabot/click-dependabot-tab.md b/translations/ja-JP/data/reusables/dependabot/click-dependabot-tab.md
index 2708240be3..90cff3fc19 100644
--- a/translations/ja-JP/data/reusables/dependabot/click-dependabot-tab.md
+++ b/translations/ja-JP/data/reusables/dependabot/click-dependabot-tab.md
@@ -1 +1 @@
-4. Under "Dependency graph", click **{% data variables.product.prodname_dependabot_short %}**. 
+4. Under "Dependency graph", click **{% data variables.product.prodname_dependabot %}**. 
diff --git a/translations/ja-JP/data/reusables/dependabot/default-labels.md b/translations/ja-JP/data/reusables/dependabot/default-labels.md
index e8f5505c62..b63ca794d2 100644
--- a/translations/ja-JP/data/reusables/dependabot/default-labels.md
+++ b/translations/ja-JP/data/reusables/dependabot/default-labels.md
@@ -1 +1 @@
-デフォルトでは、{% data variables.product.prodname_dependabot %}はすべてのプルリクエストを`dependencies`ラベルを付けて発行します。 If more than one package manager is defined, {% data variables.product.prodname_dependabot_short %} includes an additional label on each pull request. これは、そのプルリクエストがどの言語あるいはエコシステムを更新するするのかを示します。たとえばGradleの更新には`java`、Gitサブモジュールの更新には`submodules`というようになります。 {% data variables.product.prodname_dependabot %}は、リポジトリ中の必要に応じて自動的にこれらのデフォルトラベルを作成します。
+デフォルトでは、{% data variables.product.prodname_dependabot %}はすべてのプルリクエストを`dependencies`ラベルを付けて発行します。 If more than one package manager is defined, {% data variables.product.prodname_dependabot %} includes an additional label on each pull request. これは、そのプルリクエストがどの言語あるいはエコシステムを更新するするのかを示します。たとえばGradleの更新には`java`、Gitサブモジュールの更新には`submodules`というようになります。 {% data variables.product.prodname_dependabot %}は、リポジトリ中の必要に応じて自動的にこれらのデフォルトラベルを作成します。
diff --git a/translations/ja-JP/data/reusables/dependabot/initial-updates.md b/translations/ja-JP/data/reusables/dependabot/initial-updates.md
index ea26d58d21..b04cf10fb8 100644
--- a/translations/ja-JP/data/reusables/dependabot/initial-updates.md
+++ b/translations/ja-JP/data/reusables/dependabot/initial-updates.md
@@ -1,3 +1,3 @@
最初にバージョンアップデートを有効にすると、古くなった依存関係が大量にあり、中には最新バージョンまでにいくつものバージョンが存在しているものもあるかもしれません。 {% data variables.product.prodname_dependabot %} checks for outdated dependencies as soon as it's enabled. 設定が更新するマニフェストファイルの数に応じて、設定ファイルの追加後数分のうちに、バージョンアップデートの新しいプルリクエストが発行されるかもしれません。
-To keep pull requests manageable and easy to review, {% data variables.product.prodname_dependabot_short %} raises a maximum of five pull requests to start bringing dependencies up to the latest version. 次にスケジュールされているアップデートの前にこれらの最初のプルリクエストをいくつかマージしたなら、それ以降のプルリクエストは最大で5つ(この上限は変更できます)オープンされます。
+To keep pull requests manageable and easy to review, {% data variables.product.prodname_dependabot %} raises a maximum of five pull requests to start bringing dependencies up to the latest version. 次にスケジュールされているアップデートの前にこれらの最初のプルリクエストをいくつかマージしたなら、それ以降のプルリクエストは最大で5つ(この上限は変更できます)オープンされます。
diff --git a/translations/ja-JP/data/reusables/dependabot/private-dependencies.md b/translations/ja-JP/data/reusables/dependabot/private-dependencies.md
index dfcbae9c73..717f1dbb97 100644
--- a/translations/ja-JP/data/reusables/dependabot/private-dependencies.md
+++ b/translations/ja-JP/data/reusables/dependabot/private-dependencies.md
@@ -1 +1 @@
-Currently, {% data variables.product.prodname_dependabot_version_updates %} doesn't support manifest or lock files that contain any private git dependencies or private git registries. This is because, when running version updates, {% data variables.product.prodname_dependabot_short %} must be able to resolve all dependencies from their source to verify that version updates have been successful.
+Currently, {% data variables.product.prodname_dependabot_version_updates %} doesn't support manifest or lock files that contain any private git dependencies or private git registries. This is because, when running version updates, {% data variables.product.prodname_dependabot %} must be able to resolve all dependencies from their source to verify that version updates have been successful.
diff --git a/translations/ja-JP/data/reusables/dependabot/pull-request-introduction.md b/translations/ja-JP/data/reusables/dependabot/pull-request-introduction.md
index 8fabb1f455..c2e1dedf17 100644
--- a/translations/ja-JP/data/reusables/dependabot/pull-request-introduction.md
+++ b/translations/ja-JP/data/reusables/dependabot/pull-request-introduction.md
@@ -1 +1 @@
-{% data variables.product.prodname_dependabot %} は、依存関係を更新するプルリクエストを生成します。 リポジトリの設定によっては、{% data variables.product.prodname_dependabot_short %} がバージョン更新やセキュリティアップデートのプルリクエストを発行する場合があります。 これらのプルリクエストは、他のプルリクエストと同じ方法で管理しますが、追加のコマンドもいくつか用意されています。 {% data variables.product.prodname_dependabot %} 依存関係の更新を有効にする方法については、「[{% data variables.product.prodname_dependabot_security_updates %} を構成する](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)」および「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates)」を参照してください。
\ No newline at end of file
+{% data variables.product.prodname_dependabot %} は、依存関係を更新するプルリクエストを生成します。 リポジトリの設定によっては、{% data variables.product.prodname_dependabot %} がバージョン更新やセキュリティアップデートのプルリクエストを発行する場合があります。 これらのプルリクエストは、他のプルリクエストと同じ方法で管理しますが、追加のコマンドもいくつか用意されています。 {% data variables.product.prodname_dependabot %} 依存関係の更新を有効にする方法については、「[{% data variables.product.prodname_dependabot_security_updates %} を構成する](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)」および「[バージョン更新の有効化と無効化](/github/administering-a-repository/enabling-and-disabling-version-updates)」を参照してください。
\ No newline at end of file
diff --git a/translations/ja-JP/data/reusables/dependabot/supported-package-managers.md b/translations/ja-JP/data/reusables/dependabot/supported-package-managers.md
index b8ed930cec..3bb2a8366f 100644
--- a/translations/ja-JP/data/reusables/dependabot/supported-package-managers.md
+++ b/translations/ja-JP/data/reusables/dependabot/supported-package-managers.md
@@ -18,12 +18,12 @@
{% note %}
-**Note**: {% data variables.product.prodname_dependabot_short %} also supports the following package managers:
+**Note**: {% data variables.product.prodname_dependabot %} also supports the following package managers:
-`yarn` (v1 only) (specify `npm`)
-`pipenv`, `pip-compile`, and `poetry` (specify `pip`)
-For example, if you use `poetry` to manage your Python dependencies and want {% data variables.product.prodname_dependabot_short %} to monitor your dependency manifest file for new versions, use `package-ecosystem: "pip"` in your *dependabot.yml* file.
+For example, if you use `poetry` to manage your Python dependencies and want {% data variables.product.prodname_dependabot %} to monitor your dependency manifest file for new versions, use `package-ecosystem: "pip"` in your *dependabot.yml* file.
{% endnote %}
diff --git a/translations/ja-JP/data/reusables/dependabot/version-updates-for-actions.md b/translations/ja-JP/data/reusables/dependabot/version-updates-for-actions.md
index 51f34d8d04..3ed9e4ae9f 100644
--- a/translations/ja-JP/data/reusables/dependabot/version-updates-for-actions.md
+++ b/translations/ja-JP/data/reusables/dependabot/version-updates-for-actions.md
@@ -1 +1 @@
-ワークフローに追加したアクションに対して{% data variables.product.prodname_dependabot_version_updates %}を有効化することもできます。 For more information, see "[Keeping your actions up to date with {% data variables.product.prodname_dependabot %}](/github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot)."
+ワークフローに追加したアクションに対して{% data variables.product.prodname_dependabot_version_updates %}を有効化することもできます。 For more information, see "[Keeping your actions up to date with {% data variables.product.prodname_dependabot %}](/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot)."
diff --git a/translations/ja-JP/data/reusables/github-actions/enabled-local-github-actions.md b/translations/ja-JP/data/reusables/github-actions/enabled-local-github-actions.md
index c86966ea58..0043c8e960 100644
--- a/translations/ja-JP/data/reusables/github-actions/enabled-local-github-actions.md
+++ b/translations/ja-JP/data/reusables/github-actions/enabled-local-github-actions.md
@@ -1 +1 @@
-ローカルアクションのみを有効化した場合、ワークフローはリポジトリあるいはOrganization内のアクションだけを実行できるようになります。
+When you enable local actions only, workflows can only run actions located in your repository, organization, or enterprise.
diff --git a/translations/ja-JP/data/reusables/github-insights/contributors-tab.md b/translations/ja-JP/data/reusables/github-insights/contributors-tab.md
index 9315000248..e408ebd8f8 100644
--- a/translations/ja-JP/data/reusables/github-insights/contributors-tab.md
+++ b/translations/ja-JP/data/reusables/github-insights/contributors-tab.md
@@ -1 +1 @@
-1. **{% octicon "gear" aria-label="The gear icon" %} Settings({{ octicon-gear The gear icon }}設定)**の下で**Contributors(コントリビュータ)**をクリックしてください。 
+1. Under **{% octicon "gear" aria-label="The gear icon" %} Settings**, click **Contributors**. 
diff --git a/translations/ja-JP/data/reusables/marketplace/downgrade-marketplace-only.md b/translations/ja-JP/data/reusables/marketplace/downgrade-marketplace-only.md
index 5e433050fb..f7575c4d1a 100644
--- a/translations/ja-JP/data/reusables/marketplace/downgrade-marketplace-only.md
+++ b/translations/ja-JP/data/reusables/marketplace/downgrade-marketplace-only.md
@@ -1 +1 @@
-アプリケーションのキャンセルもしくは無料へのアプリケーションのダウングレードは、{% data variables.product.prodname_dotcom %}上の[other paid subcriptions(その他の有料プラン)](/articles/about-billing-on-github)には影響しません。 {% data variables.product.prodname_dotcom %} の有料プランをすべて停止したい場合は、それぞれの有料プランを 1 つずつダウングレードする必要があります。
+Canceling an app or downgrading an app to free does not affect your [other paid subscriptions](/articles/about-billing-on-github) on {% data variables.product.prodname_dotcom %}. {% data variables.product.prodname_dotcom %} の有料プランをすべて停止したい場合は、それぞれの有料プランを 1 つずつダウングレードする必要があります。
diff --git a/translations/ja-JP/data/reusables/marketplace/free-apps-encouraged.md b/translations/ja-JP/data/reusables/marketplace/free-apps-encouraged.md
index 8f8d89fc42..d343a1f53f 100644
--- a/translations/ja-JP/data/reusables/marketplace/free-apps-encouraged.md
+++ b/translations/ja-JP/data/reusables/marketplace/free-apps-encouraged.md
@@ -1 +1 @@
-Free apps are encouraged in {% data variables.product.prodname_marketplace %} and are a great way to offer open source services. If you list a paid version of your app outside of {% data variables.product.prodname_marketplace %}, you must offer at least one paid plan when listing the app in {% data variables.product.prodname_marketplace %}.
+無料アプリケーションは{% data variables.product.prodname_marketplace %}で推奨されており、オープンソースサービスを提供するための素晴らしい方法です。 アプリケーションの有料バージョンを{% data variables.product.prodname_marketplace %}外でリストしているなら、アプリケーションを{% data variables.product.prodname_marketplace %}でリストする際には最低でも1つの有料プランを提供しなければなりません。
diff --git a/translations/ja-JP/data/reusables/pull_requests/re-request-review.md b/translations/ja-JP/data/reusables/pull_requests/re-request-review.md
new file mode 100644
index 0000000000..b04a7a46ce
--- /dev/null
+++ b/translations/ja-JP/data/reusables/pull_requests/re-request-review.md
@@ -0,0 +1 @@
+You can re-request a review, for example, after you've made substantial changes to your pull request. To request a fresh review from a reviewer, in the sidebar of the **Conversation** tab, click the {% octicon "sync" aria-label="The sync icon" %} icon.
diff --git a/translations/ja-JP/data/reusables/repositories/enable-security-alerts.md b/translations/ja-JP/data/reusables/repositories/enable-security-alerts.md
index 0a180f73ee..5381a8c1d1 100644
--- a/translations/ja-JP/data/reusables/repositories/enable-security-alerts.md
+++ b/translations/ja-JP/data/reusables/repositories/enable-security-alerts.md
@@ -1,4 +1,4 @@
{% if enterpriseServerVersions contains currentVersion %}
Your site administrator must enable
-{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies for {% data variables.product.product_location %} before you can use this feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."
+{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies for {% data variables.product.product_location %} before you can use this feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."
{% endif %}
diff --git a/translations/ja-JP/data/reusables/repositories/sidebar-dependabot-alerts.md b/translations/ja-JP/data/reusables/repositories/sidebar-dependabot-alerts.md
index b7eadd335c..7fe612c019 100644
--- a/translations/ja-JP/data/reusables/repositories/sidebar-dependabot-alerts.md
+++ b/translations/ja-JP/data/reusables/repositories/sidebar-dependabot-alerts.md
@@ -1 +1 @@
-1. In the security sidebar, click **{% data variables.product.prodname_dependabot_short %} alerts**. 
+1. In the security sidebar, click **{% data variables.product.prodname_dependabot_alerts %}**. 
diff --git a/translations/ja-JP/data/reusables/support/ghae-priorities.md b/translations/ja-JP/data/reusables/support/ghae-priorities.md
index 106c631dce..9069a8701e 100644
--- a/translations/ja-JP/data/reusables/support/ghae-priorities.md
+++ b/translations/ja-JP/data/reusables/support/ghae-priorities.md
@@ -1,6 +1,6 @@
-| 優先度 | 説明 | サンプル |
-|:---------------------------------------------------------------------:| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| {% data variables.product.support_ticket_priority_urgent %} - Sev A | {% data variables.product.product_name %} is inaccessible or failing entirely, and the failure directly impacts the operation of your business.
_After you file a support ticket, reach out to {% data variables.contact.github_support %} via phone._ | - すべてのユーザーについて、中核的なGitあるいはWebアプリケーションの機能に影響するエラーもしくは中断
- Severe network or performance degradation for majority of users
- ストレージがフル、もしくは急速に埋まりつつある
- Known security incidents or a breach of access
|
-| {% data variables.product.support_ticket_priority_high %} - Sev B | {% data variables.product.product_name %} is failing in a production environment, with limited impact to your business processes, or only affecting certain customers. | - 多くのユーザの生産性を引き下げるパフォーマンスの低下
- Reduced redundancy concerns from failures or service degradation
- Production-impacting bugs or errors
- {% data variables.product.product_name %} configuraton security concerns
|
-| {% data variables.product.support_ticket_priority_normal %} - Sev C | {% data variables.product.product_name %} is experiencing limited or moderate issues and errors with {% data variables.product.product_name %}, or you have general concerns or questions about the operation of {% data variables.product.product_name %}. | - テストあるいはステージング環境での問題
- Advice on using {% data variables.product.prodname_dotcom %} APIs and features, or questions about integrating business workflows
- Issues with user tools and data collection methods
- アップグレード
- Bug reports, general security questions, or other feature related questions
|
-| {% data variables.product.support_ticket_priority_low %} - Sev D | {% data variables.product.product_name %} is functioning as expected, however, you have a question or suggestion about {% data variables.product.product_name %} that is not time-sensitive, or does not otherwise block the productivity of your team. | - Feature requests and product feedback
- General questions on overall configuration or use of {% data variables.product.product_name %}
- Notifying {% data variables.contact.github_support %} of any planned changes
|
+| 優先度 | 説明 | サンプル |
+|:---------------------------------------------------------------------:| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| {% data variables.product.support_ticket_priority_urgent %} - Sev A | {% data variables.product.product_name %} is inaccessible or failing entirely, and the failure directly impacts the operation of your business.
_After you file a support ticket, reach out to {% data variables.contact.github_support %} via phone._ | - すべてのユーザーについて、中核的なGitあるいはWebアプリケーションの機能に影響するエラーもしくは中断
- Severe network or performance degradation for majority of users
- ストレージがフル、もしくは急速に埋まりつつある
- Known security incidents or a breach of access
|
+| {% data variables.product.support_ticket_priority_high %} - Sev B | {% data variables.product.product_name %} is failing in a production environment, with limited impact to your business processes, or only affecting certain customers. | - 多くのユーザの生産性を引き下げるパフォーマンスの低下
- Reduced redundancy concerns from failures or service degradation
- Production-impacting bugs or errors
- {% data variables.product.product_name %} configuraton security concerns
|
+| {% data variables.product.support_ticket_priority_normal %} - Sev C | {% data variables.product.product_name %} is experiencing limited or moderate issues and errors with {% data variables.product.product_name %}, or you have general concerns or questions about the operation of {% data variables.product.product_name %}. | - Advice on using {% data variables.product.prodname_dotcom %} APIs and features, or questions about integrating business workflows
- Issues with user tools and data collection methods
- アップグレード
- Bug reports, general security questions, or other feature related questions
|
+| {% data variables.product.support_ticket_priority_low %} - Sev D | {% data variables.product.product_name %} is functioning as expected, however, you have a question or suggestion about {% data variables.product.product_name %} that is not time-sensitive, or does not otherwise block the productivity of your team. | - Feature requests and product feedback
- General questions on overall configuration or use of {% data variables.product.product_name %}
- Notifying {% data variables.contact.github_support %} of any planned changes
|
diff --git a/translations/ja-JP/data/reusables/user-settings/modify_github_app.md b/translations/ja-JP/data/reusables/user-settings/modify_github_app.md
index 7144b8501f..b92bf8f05f 100644
--- a/translations/ja-JP/data/reusables/user-settings/modify_github_app.md
+++ b/translations/ja-JP/data/reusables/user-settings/modify_github_app.md
@@ -1 +1 @@
-1. Select the GitHub App you want to modify. 
+1. Select the GitHub App you want to modify. 
diff --git a/translations/ja-JP/data/reusables/user-settings/modify_oauth_app.md b/translations/ja-JP/data/reusables/user-settings/modify_oauth_app.md
index 0d8071a37a..ae98a90869 100644
--- a/translations/ja-JP/data/reusables/user-settings/modify_oauth_app.md
+++ b/translations/ja-JP/data/reusables/user-settings/modify_oauth_app.md
@@ -1 +1 @@
-1. Select the {% data variables.product.prodname_oauth_app %} you want to modify. 
+1. 変更する {% data variables.product.prodname_oauth_app %} を選択します。 
diff --git a/translations/ja-JP/data/reusables/webhooks/installation_properties.md b/translations/ja-JP/data/reusables/webhooks/installation_properties.md
index 877de36a11..eecb054088 100644
--- a/translations/ja-JP/data/reusables/webhooks/installation_properties.md
+++ b/translations/ja-JP/data/reusables/webhooks/installation_properties.md
@@ -1,4 +1,4 @@
| キー | 種類 | 説明 |
| -------------- | -------- | ---------------------------------------------------------------- |
| `action` | `string` | 実行されたアクション. Can be one of:- `created` - Someone installs a {% data variables.product.prodname_github_app %}.
- `deleted` - Someone uninstalls a {% data variables.product.prodname_github_app %}
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" or currentVersion == "github-ae@latest" %}- `suspend` - Someone suspends a {% data variables.product.prodname_github_app %} installation.
- `unsuspend` - Someone unsuspends a {% data variables.product.prodname_github_app %} installation.
{% endif %}- `new_permissions_accepted` - Someone accepts new permissions for a {% data variables.product.prodname_github_app %} installation. When a {% data variables.product.prodname_github_app %} owner requests new permissions, the person who installed the {% data variables.product.prodname_github_app %} must accept the new permissions request.
|
-| `repositories` | `array` | An array of repository objects that the insatllation can access. |
+| `repositories` | `array` | An array of repository objects that the installation can access. |
diff --git a/translations/ja-JP/data/reusables/webhooks/member_webhook_properties.md b/translations/ja-JP/data/reusables/webhooks/member_webhook_properties.md
index 6e75ac2794..bf2681e0c1 100644
--- a/translations/ja-JP/data/reusables/webhooks/member_webhook_properties.md
+++ b/translations/ja-JP/data/reusables/webhooks/member_webhook_properties.md
@@ -1,3 +1,3 @@
| キー | 種類 | 説明 |
| -------- | -------- | --------------------------------------------------- |
-| `action` | `string` | 実行されたアクション. Can be one of:- `added` - A user accepts an invitation to a repository.
- `removed` - A user is removed as a collaborator in a repository.
- `edited` - A user's collaborator permissios have changed.
|
+| `action` | `string` | 実行されたアクション. Can be one of:- `added` - A user accepts an invitation to a repository.
- `removed` - A user is removed as a collaborator in a repository.
- `edited` - A user's collaborator permissions have changed.
|
diff --git a/translations/ja-JP/data/reusables/webhooks/ping_short_desc.md b/translations/ja-JP/data/reusables/webhooks/ping_short_desc.md
index 862ace3a6c..32c9de4bdd 100644
--- a/translations/ja-JP/data/reusables/webhooks/ping_short_desc.md
+++ b/translations/ja-JP/data/reusables/webhooks/ping_short_desc.md
@@ -1 +1 @@
-新しいwebhookが作成されると、シンプルな`ping`イベントが送信され、webhookが正しくセットアップされたことを知らせます。 This event isnt stored so it isn't retrievable via the [Events API](/rest/reference/activity#ping-a-repository-webhook) endpoint.
+新しいwebhookが作成されると、シンプルな`ping`イベントが送信され、webhookが正しくセットアップされたことを知らせます。 This event isn't stored so it isn't retrievable via the [Events API](/rest/reference/activity#ping-a-repository-webhook) endpoint.
diff --git a/translations/ja-JP/data/reusables/webhooks/repo_desc.md b/translations/ja-JP/data/reusables/webhooks/repo_desc.md
index 27cc4f74c0..df26fb3e7a 100644
--- a/translations/ja-JP/data/reusables/webhooks/repo_desc.md
+++ b/translations/ja-JP/data/reusables/webhooks/repo_desc.md
@@ -1 +1 @@
-`repository` | `object` | The [`repository`](/v3/repos/#get-a-repository) where the event occured.
+`repository` | `object` | The [`repository`](/v3/repos/#get-a-repository) where the event occurred.
diff --git a/translations/ja-JP/data/reusables/webhooks/repository_vulnerability_alert_short_desc.md b/translations/ja-JP/data/reusables/webhooks/repository_vulnerability_alert_short_desc.md
index 575e669852..b01cdce335 100644
--- a/translations/ja-JP/data/reusables/webhooks/repository_vulnerability_alert_short_desc.md
+++ b/translations/ja-JP/data/reusables/webhooks/repository_vulnerability_alert_short_desc.md
@@ -1 +1 @@
-リポジトリ内のセキュリティ脆弱性アラートに関連するアクティビティ。 {% data reusables.webhooks.action_type_desc %} 詳しい情報については「[脆弱性のある依存関係に対するセキュリティアラートについて](/github/managing-security-vulnerabilities/about-security-alerts-for-vulnerable-dependencies)」を参照してください。
+リポジトリ内のセキュリティ脆弱性アラートに関連するアクティビティ。 {% data reusables.webhooks.action_type_desc %} For more information, see the "[About security alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-security-alerts-for-vulnerable-dependencies)".
diff --git a/translations/ja-JP/data/ui.yml b/translations/ja-JP/data/ui.yml
index fbd005670a..0353edc0c2 100644
--- a/translations/ja-JP/data/ui.yml
+++ b/translations/ja-JP/data/ui.yml
@@ -15,8 +15,9 @@ homepage:
version_picker: バージョン
toc:
getting_started: はじめましょう
- popular_articles: 人気のある記事
+ popular_articles: 人気
guides: ガイド
+ whats_new: 更新情報
pages:
article_version: "記事のバージョン:"
miniToc: 'ここには以下の内容があります:'
@@ -118,3 +119,6 @@ footer:
careers: キャリア
press: プレス
shop: ショップ
+product_landing:
+ quick_start: クイックスタート
+ reference_guides: Reference guides
diff --git a/translations/ja-JP/data/variables/product.yml b/translations/ja-JP/data/variables/product.yml
index 8369b9ca16..726cad186c 100644
--- a/translations/ja-JP/data/variables/product.yml
+++ b/translations/ja-JP/data/variables/product.yml
@@ -118,11 +118,10 @@ prodname_vscode: 'Visual Studio Code'
prodname_vss_ghe: 'Visual Studio subscription with GitHub Enterprise'
prodname_vss_admin_portal_with_url: 'the [administrator portal for Visual Studio subscriptions](https://visualstudio.microsoft.com/subscriptions-administration/)'
#GitHub Dependabot
-prodname_dependabot: 'GitHub Dependabot'
-prodname_dependabot_short: 'Dependabot'
-prodname_dependabot_alerts: 'GitHub Dependabotアラート'
-prodname_dependabot_security_updates: 'GitHub Dependabotセキュリティアップデート'
-prodname_dependabot_version_updates: 'GitHub Dependabotバージョンアップデート'
+prodname_dependabot: 'Dependabot'
+prodname_dependabot_alerts: 'Dependabot alerts'
+prodname_dependabot_security_updates: 'Dependabot security updates'
+prodname_dependabot_version_updates: 'Dependabot version updates'
#GitHub Archive Program
prodname_archive: 'GitHub Archive Program'
prodname_arctic_vault: 'Arctic Code Vault'
diff --git a/translations/ko-KR/content/actions/guides/building-and-testing-powershell.md b/translations/ko-KR/content/actions/guides/building-and-testing-powershell.md
new file mode 100644
index 0000000000..8e985f521e
--- /dev/null
+++ b/translations/ko-KR/content/actions/guides/building-and-testing-powershell.md
@@ -0,0 +1,236 @@
+---
+title: Building and testing PowerShell
+intro: You can create a continuous integration (CI) workflow to build and test your PowerShell project.
+product: '{% data reusables.gated-features.actions %}'
+versions:
+ free-pro-team: '*'
+ enterprise-server: '>=2.22'
+---
+
+{% data reusables.actions.enterprise-beta %}
+{% data reusables.actions.enterprise-github-hosted-runners %}
+
+### Introduction
+
+This guide shows you how to use PowerShell for CI. It describes how to use Pester, install dependencies, test your module, and publish to the PowerShell Gallery.
+
+{% data variables.product.prodname_dotcom %}-hosted runners have a tools cache with pre-installed software, which includes PowerShell and Pester. For a full list of up-to-date software and the pre-installed versions of PowerShell and Pester, see "[Specifications for {% data variables.product.prodname_dotcom %}-hosted runners](/actions/reference/specifications-for-github-hosted-runners/#supported-software)".
+
+### 빌드전 요구 사양
+
+You should be familiar with YAML and the syntax for {% data variables.product.prodname_actions %}. For more information, see "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)."
+
+We recommend that you have a basic understanding of PowerShell and Pester. For more information, see:
+- [Getting started with PowerShell](https://docs.microsoft.com/powershell/scripting/learn/ps101/01-getting-started)
+- [Pester](https://pester.dev)
+
+{% data reusables.actions.enterprise-setup-prereq %}
+
+### Adding a workflow for Pester
+
+To automate your testing with PowerShell and Pester, you can add a workflow that runs every time a change is pushed to your repository. In the following example, `Test-Path` is used to check that a file called `resultsfile.log` is present.
+
+This example workflow file must be added to your repository's `.github/workflows/` directory:
+
+{% raw %}
+```yaml
+name: Test PowerShell on Ubuntu
+on: push
+
+jobs:
+ pester-test:
+ name: Pester test
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check out repository code
+ uses: actions/checkout@v2
+ - name: Perform a Pester test from the command-line
+ shell: pwsh
+ run: Test-Path resultsfile.log | Should -Be $true
+ - name: Perform a Pester test from the Tests.ps1 file
+ shell: pwsh
+ run: |
+ Invoke-Pester Unit.Tests.ps1 -Passthru
+```
+{% endraw %}
+
+* `shell: pwsh` - Configures the job to use PowerShell when running the `run` commands.
+* `run: Test-Path resultsfile.log` - Check whether a file called `resultsfile.log` is present in the repository's root directory.
+* `Should -Be $true` - Uses Pester to define an expected result. If the result is unexpected, then {% data variables.product.prodname_actions %} flags this as a failed test. 예시:
+
+ 
+
+* `Invoke-Pester Unit.Tests.ps1 -Passthru` - Uses Pester to execute tests defined in a file called `Unit.Tests.ps1`. For example, to perform the same test described above, the `Unit.Tests.ps1` will contain the following:
+ ```
+ Describe "Check results file is present" {
+ It "Check results file is present" {
+ Test-Path resultsfile.log | Should -Be $true
+ }
+ }
+ ```
+
+### PowerShell module locations
+
+The table below describes the locations for various PowerShell modules in each {% data variables.product.prodname_dotcom %}-hosted runner.
+
+| | Ubuntu | macOS | Windows |
+| ----------------------------- | ------------------------------------------------ | ------------------------------------------------- | ------------------------------------------------------------ |
+| **PowerShell system modules** | `/opt/microsoft/powershell/7/Modules/*` | `/usr/local/microsoft/powershell/7/Modules/*` | `C:\program files\powershell\7\Modules\*` |
+| **PowerShell add-on modules** | `/usr/local/share/powershell/Modules/*` | `/usr/local/share/powershell/Modules/*` | `C:\Modules\*` |
+| **User-installed modules** | `/home/runner/.local/share/powershell/Modules/*` | `/Users/runner/.local/share/powershell/Modules/*` | `C:\Users\runneradmin\Documents\PowerShell\Modules\*` |
+
+### Installing dependencies
+
+{% data variables.product.prodname_dotcom %}-hosted runners have PowerShell 7 and Pester installed. You can use `Install-Module` to install additional dependencies from the PowerShell Gallery before building and testing your code.
+
+{% note %}
+
+**Note:** The pre-installed packages (such as Pester) used by {% data variables.product.prodname_dotcom %}-hosted runners are regularly updated, and can introduce significant changes. As a result, it is recommended that you always specify the required package versions by using `Install-Module` with `-MaximumVersion`.
+
+{% endnote %}
+
+You can also cache dependencies to speed up your workflow. For more information, see "[Caching dependencies to speed up your workflow](/actions/automating-your-workflow-with-github-actions/caching-dependencies-to-speed-up-workflows)."
+
+For example, the following job installs the `SqlServer` and `PSScriptAnalyzer` modules:
+
+{% raw %}
+```yaml
+jobs:
+ install-dependencies:
+ name: Install dependencies
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Install from PSGallery
+ shell: pwsh
+ run: |
+ Set-PSRepository PSGallery -InstallationPolicy Trusted
+ Install-Module SqlServer, PSScriptAnalyzer
+```
+{% endraw %}
+
+{% note %}
+
+**Note:** By default, no repositories are trusted by PowerShell. When installing modules from the PowerShell Gallery, you must explicitly set the installation policy for `PSGallery` to `Trusted`.
+
+{% endnote %}
+
+#### Caching dependencies
+
+You can cache PowerShell dependencies using a unique key, which allows you to restore the dependencies for future workflows with the [`cache`](https://github.com/marketplace/actions/cache) action. For more information, see "[Caching dependencies to speed up workflows](/actions/automating-your-workflow-with-github-actions/caching-dependencies-to-speed-up-workflows)."
+
+PowerShell caches its dependencies in different locations, depending on the runner's operating system. For example, the `path` location used in the following Ubuntu example will be different for a Windows operating system.
+
+{% raw %}
+```yaml
+steps:
+ - uses: actions/checkout@v2
+ - name: Setup PowerShell module cache
+ id: cacher
+ uses: actions/cache@v2
+ with:
+ path: "~/.local/share/powershell/Modules"
+ key: ${{ runner.os }}-SqlServer-PSScriptAnalyzer
+ - name: Install required PowerShell modules
+ if: steps.cacher.outputs.cache-hit != 'true'
+ shell: pwsh
+ run: |
+ Set-PSRepository PSGallery -InstallationPolicy Trusted
+ Install-Module SqlServer, PSScriptAnalyzer -ErrorAction Stop
+```
+{% endraw %}
+
+### Testing your code
+
+You can use the same commands that you use locally to build and test your code.
+
+#### Using PSScriptAnalyzer to lint code
+
+The following example installs `PSScriptAnalyzer` and uses it to lint all `ps1` files in the repository. For more information, see [PSScriptAnalyzer on GitHub](https://github.com/PowerShell/PSScriptAnalyzer).
+
+{% raw %}
+```yaml
+ lint-with-PSScriptAnalyzer:
+ name: Install and run PSScriptAnalyzer
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Install PSScriptAnalyzer module
+ shell: pwsh
+ run: |
+ Set-PSRepository PSGallery -InstallationPolicy Trusted
+ Install-Module PSScriptAnalyzer -ErrorAction Stop
+ - name: Lint with PSScriptAnalyzer
+ shell: pwsh
+ run: |
+ Invoke-ScriptAnalyzer -Path *.ps1 -Recurse -Outvariable issues
+ $errors = $issues.Where({$_.Severity -eq 'Error'})
+ $warnings = $issues.Where({$_.Severity -eq 'Warning'})
+ if ($errors) {
+ Write-Error "There were $($errors.Count) errors and $($warnings.Count) warnings total." -ErrorAction Stop
+ } else {
+ Write-Output "There were $($errors.Count) errors and $($warnings.Count) warnings total."
+ }
+```
+{% endraw %}
+
+### Packaging workflow data as artifacts
+
+You can upload artifacts to view after a workflow completes. For example, you may need to save log files, core dumps, test results, or screenshots. For more information, see "[Persisting workflow data using artifacts](/github/automating-your-workflow-with-github-actions/persisting-workflow-data-using-artifacts)."
+
+The following example demonstrates how you can use the `upload-artifact` action to archive the test results received from `Invoke-Pester`. For more information, see the [`upload-artifact` action](https://github.com/actions/upload-artifact).
+
+{% raw %}
+```yaml
+name: Upload artifact from Ubuntu
+
+on: [push]
+
+jobs:
+ upload-pester-results:
+ name: Run Pester and upload results
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Test with Pester
+ shell: pwsh
+ run: Invoke-Pester Unit.Tests.ps1 -Passthru | Export-CliXml -Path Unit.Tests.xml
+ - name: Upload test results
+ uses: actions/upload-artifact@v2
+ with:
+ name: ubuntu-Unit-Tests
+ path: Unit.Tests.xml
+ if: ${{ always() }}
+```
+{% endraw %}
+
+The `always()` function configures the job to continue processing even if there are test failures. For more information, see "[always](/actions/reference/context-and-expression-syntax-for-github-actions#always)."
+
+### Publishing to PowerShell Gallery
+
+You can configure your workflow to publish your PowerShell module to the PowerShell Gallery when your CI tests pass. You can use repository secrets to store any tokens or credentials needed to publish your package. For more information, see "[Creating and using encrypted secrets](/github/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)."
+
+The following example creates a package and uses `Publish-Module` to publish it to the PowerShell Gallery:
+
+{% raw %}
+```yaml
+name: Publish PowerShell Module
+
+on:
+ release:
+ types: [created]
+
+jobs:
+ publish-to-gallery:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Build and publish
+ env:
+ NUGET_KEY: ${{ secrets.NUGET_KEY }}
+ shell: pwsh
+ run: |
+ ./build.ps1 -Path /tmp/samplemodule
+ Publish-Module -Path /tmp/samplemodule -NuGetApiKey $env:NUGET_KEY -Verbose
+```
+{% endraw %}
diff --git a/translations/ko-KR/content/actions/guides/index.md b/translations/ko-KR/content/actions/guides/index.md
index 42c98b828d..4b0c154128 100644
--- a/translations/ko-KR/content/actions/guides/index.md
+++ b/translations/ko-KR/content/actions/guides/index.md
@@ -29,6 +29,7 @@ You can use {% data variables.product.prodname_actions %} to create custom conti
{% link_in_list /about-continuous-integration %}
{% link_in_list /setting-up-continuous-integration-using-workflow-templates %}
{% link_in_list /building-and-testing-nodejs %}
+{% link_in_list /building-and-testing-powershell %}
{% link_in_list /building-and-testing-python %}
{% link_in_list /building-and-testing-java-with-maven %}
{% link_in_list /building-and-testing-java-with-gradle %}
diff --git a/translations/ko-KR/content/actions/guides/storing-workflow-data-as-artifacts.md b/translations/ko-KR/content/actions/guides/storing-workflow-data-as-artifacts.md
index 42c5602559..aae79b58b2 100644
--- a/translations/ko-KR/content/actions/guides/storing-workflow-data-as-artifacts.md
+++ b/translations/ko-KR/content/actions/guides/storing-workflow-data-as-artifacts.md
@@ -171,12 +171,12 @@ Jobs that are dependent on a previous job's artifacts must wait for the dependen
Job 1 performs these steps:
- Performs a math calculation and saves the result to a text file called `math-homework.txt`.
-- Uses the `upload-artifact` action to upload the `math-homework.txt` file with the name `homework`. The action places the file in a directory named `homework`.
+- Uses the `upload-artifact` action to upload the `math-homework.txt` file with the artifact name `homework`.
Job 2 uses the result in the previous job:
- Downloads the `homework` artifact uploaded in the previous job. By default, the `download-artifact` action downloads artifacts to the workspace directory that the step is executing in. You can use the `path` input parameter to specify a different download directory.
-- Reads the value in the `homework/math-homework.txt` file, performs a math calculation, and saves the result to `math-homework.txt`.
-- Uploads the `math-homework.txt` file. This upload overwrites the previous upload because both of the uploads share the same name.
+- Reads the value in the `math-homework.txt` file, performs a math calculation, and saves the result to `math-homework.txt` again, overwriting its contents.
+- Uploads the `math-homework.txt` file. This upload overwrites the previously uploaded artifact because they share the same name.
Job 3 displays the result uploaded in the previous job:
- Downloads the `homework` artifact.
diff --git a/translations/ko-KR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/translations/ko-KR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md
index e91d67cb95..022c544673 100644
--- a/translations/ko-KR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md
+++ b/translations/ko-KR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md
@@ -111,6 +111,7 @@ You must ensure that the machine has the appropriate network access to communica
github.com
api.github.com
*.actions.githubusercontent.com
+codeload.github.com
```
If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)" or "[Enforcing security settings in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account#using-github-actions-with-an-ip-allow-list)".
diff --git a/translations/ko-KR/content/actions/index.md b/translations/ko-KR/content/actions/index.md
index 7cbfa42321..0f0516da08 100644
--- a/translations/ko-KR/content/actions/index.md
+++ b/translations/ko-KR/content/actions/index.md
@@ -4,17 +4,34 @@ shortTitle: GitHub Actions
intro: 'Automate, customize, and execute your software development workflows right in your repository with {% data variables.product.prodname_actions %}. You can discover, create, and share actions to perform any job you''d like, including CI/CD, and combine actions in a completely customized workflow.'
introLinks:
quickstart: /actions/quickstart
- learn: /actions/learn-github-actions
+ reference: /actions/reference
featuredLinks:
+ guides:
+ - /actions/guides/setting-up-continuous-integration-using-workflow-templates
+ - /actions/guides/about-packaging-with-github-actions
gettingStarted:
- /actions/managing-workflow-runs
- /actions/hosting-your-own-runners
- guide:
- - /actions/guides/setting-up-continuous-integration-using-workflow-templates
- - /actions/guides/about-packaging-with-github-actions
popular:
- /actions/reference/workflow-syntax-for-github-actions
- /actions/reference/events-that-trigger-workflows
+changelog:
+ -
+ title: Self-Hosted Runner Group Access Changes
+ date: '2020-10-16'
+ href: https://github.blog/changelog/2020-10-16-github-actions-self-hosted-runner-group-access-changes/
+ -
+ title: Ability to change retention days for artifacts and logs
+ date: '2020-10-08'
+ href: https://github.blog/changelog/2020-10-08-github-actions-ability-to-change-retention-days-for-artifacts-and-logs
+ -
+ title: Deprecating set-env and add-path commands
+ date: '2020-10-01'
+ href: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands
+ -
+ title: Fine-tune access to external actions
+ date: '2020-10-01'
+ href: https://github.blog/changelog/2020-10-01-github-actions-fine-tune-access-to-external-actions
redirect_from:
- /articles/automating-your-workflow-with-github-actions/
- /articles/customizing-your-project-with-github-actions/
@@ -36,44 +53,8 @@ versions:
-
-
-
-
- {% data ui.toc.guides %}
-
-
- {% for link in featuredLinks.guide %}
- - {% include featured-link %}
- {% endfor %}
-
-
-
-
-
- {% data ui.toc.popular_articles %}
-
-
- {% for link in featuredLinks.popular %}
- - {% include featured-link %}
- {% endfor %}
-
-
-
-
-
- Manage workflows
-
-
- {% for link in featuredLinks.gettingStarted %}
- - {% include featured-link %}
- {% endfor %}
-
-
-
-
-
+
More guides
diff --git a/translations/ko-KR/content/actions/learn-github-actions/finding-and-customizing-actions.md b/translations/ko-KR/content/actions/learn-github-actions/finding-and-customizing-actions.md
index 919d54c916..e50e08fbb4 100644
--- a/translations/ko-KR/content/actions/learn-github-actions/finding-and-customizing-actions.md
+++ b/translations/ko-KR/content/actions/learn-github-actions/finding-and-customizing-actions.md
@@ -87,7 +87,7 @@ For more information, see "[Using release management for actions](/actions/creat
### Using inputs and outputs with an action
-An action often accepts or requires inputs and generates outputs that you can use. For example, an action might require you to specify a path to a file, the name of a label, or other data it will uses as part of the action processing.
+An action often accepts or requires inputs and generates outputs that you can use. For example, an action might require you to specify a path to a file, the name of a label, or other data it will use as part of the action processing.
To see the inputs and outputs of an action, check the `action.yml` or `action.yaml` in the root directory of the repository.
diff --git a/translations/ko-KR/content/actions/learn-github-actions/index.md b/translations/ko-KR/content/actions/learn-github-actions/index.md
index 8bc97d038f..e120b015a2 100644
--- a/translations/ko-KR/content/actions/learn-github-actions/index.md
+++ b/translations/ko-KR/content/actions/learn-github-actions/index.md
@@ -36,7 +36,8 @@ versions:
{% link_with_intro /managing-complex-workflows %}
{% link_with_intro /sharing-workflows-with-your-organization %}
{% link_with_intro /security-hardening-for-github-actions %}
+{% link_with_intro /migrating-from-azure-pipelines-to-github-actions %}
{% link_with_intro /migrating-from-circleci-to-github-actions %}
{% link_with_intro /migrating-from-gitlab-cicd-to-github-actions %}
-{% link_with_intro /migrating-from-azure-pipelines-to-github-actions %}
{% link_with_intro /migrating-from-jenkins-to-github-actions %}
+{% link_with_intro /migrating-from-travis-ci-to-github-actions %}
\ No newline at end of file
diff --git a/translations/ko-KR/content/actions/learn-github-actions/introduction-to-github-actions.md b/translations/ko-KR/content/actions/learn-github-actions/introduction-to-github-actions.md
index bf2fb4614d..f326710453 100644
--- a/translations/ko-KR/content/actions/learn-github-actions/introduction-to-github-actions.md
+++ b/translations/ko-KR/content/actions/learn-github-actions/introduction-to-github-actions.md
@@ -34,7 +34,7 @@ The workflow is an automated procedure that you add to your repository. Workflow
#### 이벤트
-An event is a specific activity that triggers a workflow. For example, activity can originate from {% data variables.product.prodname_dotcom %} when someone pushes a commit to a repository or when an issue or pull request is created. You can also use the repository dispatch webhook to trigger a workflow when an external event occurs. For a complete list of events that can be used to trigger workflows, see [Events that trigger workflows](/actions/reference/events-that-trigger-workflows).
+An event is a specific activity that triggers a workflow. For example, activity can originate from {% data variables.product.prodname_dotcom %} when someone pushes a commit to a repository or when an issue or pull request is created. You can also use the [repository dispatch webhook](/rest/reference/repos#create-a-repository-dispatch-event) to trigger a workflow when an external event occurs. For a complete list of events that can be used to trigger workflows, see [Events that trigger workflows](/actions/reference/events-that-trigger-workflows).
#### Jobs
diff --git a/translations/ko-KR/content/actions/learn-github-actions/managing-complex-workflows.md b/translations/ko-KR/content/actions/learn-github-actions/managing-complex-workflows.md
index 8525abcfa0..4c4da16850 100644
--- a/translations/ko-KR/content/actions/learn-github-actions/managing-complex-workflows.md
+++ b/translations/ko-KR/content/actions/learn-github-actions/managing-complex-workflows.md
@@ -24,12 +24,13 @@ This example action demonstrates how to reference an existing secret as an envir
```yaml
jobs:
example-job:
+ runs-on: ubuntu-latest
steps:
- name: Retrieve secret
env:
super_secret: ${{ secrets.SUPERSECRET }}
run: |
- example-command "$SUPER_SECRET"
+ example-command "$super_secret"
```
{% endraw %}
@@ -49,6 +50,7 @@ jobs:
- run: ./setup_server.sh
build:
needs: setup
+ runs-on: ubuntu-latest
steps:
- run: ./build_server.sh
test:
@@ -141,7 +143,7 @@ This example shows how a workflow can use labels to specify the required runner:
```yaml
jobs:
example-job:
- runs-on: [self-hosted, linux, x64, gpu]
+ runs-on: [self-hosted, linux, x64, gpu]
```
For more information, see ["Using labels with self-hosted runners](/actions/hosting-your-own-runners/using-labels-with-self-hosted-runners)."
diff --git a/translations/ko-KR/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md b/translations/ko-KR/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md
index 1982021402..2d794e5443 100644
--- a/translations/ko-KR/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md
+++ b/translations/ko-KR/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md
@@ -41,7 +41,7 @@ Jobs and steps in Azure Pipelines are very similar to jobs and steps in {% data
### Migrating script steps
-You can run a script or a shell command as a step in a workflow. In Azure Pipelines, script steps can be specified using the `script` key, or with the `bash`, `powershell`, or `pwsh` keys. Scripts can also be specified as an input to the [Bash task](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/utility/bash?view=azure-devops) or the [PowerShell task](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/utility/powershell?view=azure-devops).
+You can run a script or a shell command as a step in a workflow. In Azure Pipelines, script steps can be specified using the `script` key, or with the `bash`, `powershell`, or `pwsh` keys. Scripts can also be specified as an input to the [Bash task](https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/bash?view=azure-devops) or the [PowerShell task](https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/powershell?view=azure-devops).
In {% data variables.product.prodname_actions %}, all scripts are specified using the `run` key. To select a particular shell, you can specify the `shell` key when providing the script. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun)."
diff --git a/translations/ko-KR/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md b/translations/ko-KR/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
index 873144e8fe..618503642e 100644
--- a/translations/ko-KR/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
+++ b/translations/ko-KR/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
@@ -180,7 +180,7 @@ GitLab CI/CD
deploy_prod:
stage: deploy
script:
- - echo "Deply to production server"
+ - echo "Deploy to production server"
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
```
@@ -194,7 +194,7 @@ jobs:
if: contains( github.ref, 'master')
runs-on: ubuntu-latest
steps:
- - run: echo "Deply to production server"
+ - run: echo "Deploy to production server"
```
{% endraw %}
diff --git a/translations/ko-KR/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md b/translations/ko-KR/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md
index 5120c83087..836994f01b 100644
--- a/translations/ko-KR/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md
+++ b/translations/ko-KR/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md
@@ -232,12 +232,19 @@ Jenkins Pipeline
```yaml
pipeline {
- agent none
- stages {
- stage('Run Tests') {
- parallel {
- stage('Test On MacOS') {
- agent { label "macos" }
+agent none
+stages {
+ stage('Run Tests') {
+ matrix {
+ axes {
+ axis {
+ name: 'PLATFORM'
+ values: 'macos', 'linux'
+ }
+ }
+ agent { label "${PLATFORM}" }
+ stages {
+ stage('test') {
tools { nodejs "node-12" }
steps {
dir("scripts/myapp") {
@@ -246,19 +253,10 @@ pipeline {
}
}
}
- stage('Test On Linux') {
- agent { label "linux" }
- tools { nodejs "node-12" }
- steps {
- dir("script/myapp") {
- sh(script: "npm install -g bats")
- sh(script: "bats tests")
- }
- }
- }
}
}
}
+}
}
```
diff --git a/translations/ko-KR/content/actions/learn-github-actions/migrating-from-travis-ci-to-github-actions.md b/translations/ko-KR/content/actions/learn-github-actions/migrating-from-travis-ci-to-github-actions.md
new file mode 100644
index 0000000000..f2931cc45a
--- /dev/null
+++ b/translations/ko-KR/content/actions/learn-github-actions/migrating-from-travis-ci-to-github-actions.md
@@ -0,0 +1,408 @@
+---
+title: Migrating from Travis CI to GitHub Actions
+intro: '{% data variables.product.prodname_actions %} and Travis CI share multiple similarities, which helps make it relatively straightforward to migrate to {% data variables.product.prodname_actions %}.'
+redirect_from:
+ - /actions/migrating-to-github-actions/migrating-from-travis-ci-to-github-actions
+versions:
+ free-pro-team: '*'
+ enterprise-server: '>=2.22'
+---
+
+### Introduction
+
+This guide helps you migrate from Travis CI to {% data variables.product.prodname_actions %}. It compares their concepts and syntax, describes the similarities, and demonstrates their different approaches to common tasks.
+
+### Before you start
+
+Before starting your migration to {% data variables.product.prodname_actions %}, it would be useful to become familiar with how it works:
+
+- For a quick example that demonstrates a {% data variables.product.prodname_actions %} job, see "[Quickstart for {% data variables.product.prodname_actions %}](/actions/quickstart)."
+- To learn the essential {% data variables.product.prodname_actions %} concepts, see "[Introduction to GitHub Actions](/actions/learn-github-actions/introduction-to-github-actions)."
+
+### Comparing job execution
+
+To give you control over when CI tasks are executed, a {% data variables.product.prodname_actions %} _workflow_ uses _jobs_ that run in parallel by default. Each job contains _steps_ that are executed in a sequence that you define. If you need to run setup and cleanup actions for a job, you can define steps in each job to perform these.
+
+### Key similarities
+
+{% data variables.product.prodname_actions %} and Travis CI share certain similarities, and understanding these ahead of time can help smooth the migration process.
+
+#### Using YAML syntax
+
+Travis CI and {% data variables.product.prodname_actions %} both use YAML to create jobs and workflows, and these files are stored in the code's repository. For more information on how {% data variables.product.prodname_actions %} uses YAML, see ["Creating a workflow file](/actions/learn-github-actions/introduction-to-github-actions#create-an-example-workflow)."
+
+#### Custom environment variables
+
+Travis CI lets you set environment variables and share them between stages. Similarly, {% data variables.product.prodname_actions %} lets you define environment variables for a step, job, or workflow. For more information, see ["Environment variables](/actions/reference/environment-variables)."
+
+#### Default environment variables
+
+Travis CI and {% data variables.product.prodname_actions %} both include default environment variables that you can use in your YAML files. For {% data variables.product.prodname_actions %}, you can see these listed in "[Default environment variables](/actions/reference/environment-variables#default-environment-variables)."
+
+#### Parallel job processing
+
+Travis CI can use `stages` to run jobs in parallel. Similarly, {% data variables.product.prodname_actions %} runs `jobs` in parallel. For more information, see "[Creating dependent jobs](/actions/learn-github-actions/managing-complex-workflows#creating-dependent-jobs)."
+
+#### Status badges
+
+Travis CI and {% data variables.product.prodname_actions %} both support status badges, which let you indicate whether a build is passing or failing. For more information, see ["Adding a workflow status badge to your repository](/actions/managing-workflow-runs/adding-a-workflow-status-badge)."
+
+#### Using a build matrix
+
+Travis CI and {% data variables.product.prodname_actions %} both support a build matrix, allowing you to perform testing using combinations of operating systems and software packages. For more information, see "[Using a build matrix](/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix)."
+
+Below is an example comparing the syntax for each system:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+matrix:
+ include:
+ - rvm: 2.5
+ - rvm: 2.6.3
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+jobs:
+ build:
+ strategy:
+ matrix:
+ ruby: [2.5, 2.6.3]
+```
+{% endraw %}
+
+
+
+
+#### Targeting specific branches
+
+Travis CI and {% data variables.product.prodname_actions %} both allow you to target your CI to a specific branch. For more information, see "[Workflow syntax for GitHub Actions](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestbranchestags)."
+
+Below is an example of the syntax for each system:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+branches:
+ only:
+ - main
+ - 'mona/octocat'
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+on:
+ push:
+ branches:
+ - main
+ - 'mona/octocat'
+```
+{% endraw %}
+
+
+
+
+#### Checking out submodules
+
+Travis CI and {% data variables.product.prodname_actions %} both allow you to control whether submodules are included in the repository clone.
+
+Below is an example of the syntax for each system:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+git:
+ submodules: false
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+ - uses: actions/checkout@v2
+ with:
+ submodules: false
+```
+{% endraw %}
+
+
+
+
+### Key features in {% data variables.product.prodname_actions %}
+
+When migrating from Travis CI, consider the following key features in {% data variables.product.prodname_actions %}:
+
+#### Storing secrets
+
+{% data variables.product.prodname_actions %} allows you to store secrets and reference them in your jobs. {% data variables.product.prodname_actions %} also includes policies that allow you to limit access to secrets at the repository and organization level. For more information, see "[Encrypted secrets](/actions/reference/encrypted-secrets)."
+
+#### Sharing files between jobs and workflows
+
+{% data variables.product.prodname_actions %} includes integrated support for artifact storage, allowing you to share files between jobs in a workflow. You can also save the resulting files and share them with other workflows. For more information, see "[Sharing data between jobs](/actions/learn-github-actions/essential-features-of-github-actions#sharing-data-between-jobs)."
+
+#### Hosting your own runners
+
+If your jobs require specific hardware or software, {% data variables.product.prodname_actions %} allows you to host your own runners and send your jobs to them for processing. {% data variables.product.prodname_actions %} also lets you use policies to control how these runners are accessed, granting access at the organization or repository level. For more information, see ["Hosting your own runners](/actions/hosting-your-own-runners)."
+
+#### Concurrent jobs and execution time
+
+The concurrent jobs and workflow execution times in {% data variables.product.prodname_actions %} can vary depending on your {% data variables.product.company_short %} plan. For more information, see "[Usage limits, billing, and administration](/actions/reference/usage-limits-billing-and-administration)."
+
+#### Using different languages in {% data variables.product.prodname_actions %}
+
+When working with different languages in {% data variables.product.prodname_actions %}, you can create a step in your job to set up your language dependencies. For more information about working with a particular language, see the specific guide:
+ - [Building and testing Node.js](/actions/guides/building-and-testing-nodejs)
+ - [Building and testing PowerShell](/actions/guides/building-and-testing-powershell)
+ - [Building and testing Python](/actions/guides/building-and-testing-python)
+ - [Building and testing Java with Maven](/actions/guides/building-and-testing-java-with-maven)
+ - [Building and testing Java with Gradle](/actions/guides/building-and-testing-java-with-gradle)
+ - [Building and testing Java with Ant](/actions/guides/building-and-testing-java-with-ant)
+
+### Executing scripts
+
+{% data variables.product.prodname_actions %} can use `run` steps to run scripts or shell commands. To use a particular shell, you can specify the `shell` type when providing the path to the script. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun)."
+
+예시:
+
+```yaml
+ steps:
+ - name: Run build script
+ run: ./.github/scripts/build.sh
+ shell: bash
+```
+
+### Error handling in {% data variables.product.prodname_actions %}
+
+When migrating to {% data variables.product.prodname_actions %}, there are different approaches to error handling that you might need to be aware of.
+
+#### Script error handling
+
+{% data variables.product.prodname_actions %} stops a job immediately if one of the steps returns an error code. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference)."
+
+#### Job error handling
+
+{% data variables.product.prodname_actions %} uses `if` conditionals to execute jobs or steps in certain situations. For example, you can run a step when another step results in a `failure()`. For more information, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#example-using-status-check-functions)." You can also use [`continue-on-error`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontinue-on-error) to prevent a workflow run from stopping when a job fails.
+
+### Migrating syntax for conditionals and expressions
+
+To run jobs under conditional expressions, Travis CI and {% data variables.product.prodname_actions %} share a similar `if` condition syntax. {% data variables.product.prodname_actions %} lets you use the `if` conditional to prevent a job or step from running unless a condition is met. For more information, see "[Context and expression syntax for {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)."
+
+This example demonstrates how an `if` conditional can control whether a step is executed:
+
+```yaml
+jobs:
+ conditional:
+ runs-on: ubuntu-latest
+ steps:
+ - run: echo "This step runs with str equals 'ABC' and num equals 123"
+ if: env.str == 'ABC' && env.num == 123
+```
+
+### Migrating phases to steps
+
+Where Travis CI uses _phases_ to run _steps_, {% data variables.product.prodname_actions %} has _steps_ which execute _actions_. You can find prebuilt actions in the [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?type=actions), or you can create your own actions. For more information, see "[Building actions](/actions/building-actions)."
+
+Below is an example of the syntax for each system:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+language: python
+python:
+ - "3.7"
+
+script:
+ - python script.py
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+jobs:
+ run_python:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/setup-python@v2
+ with:
+ python-version: '3.7'
+ architecture: 'x64'
+ - run: python script.py
+```
+{% endraw %}
+
+
+
+
+### Caching dependencies
+
+Travis CI and {% data variables.product.prodname_actions %} let you manually cache dependencies for later reuse. This example demonstrates the cache syntax for each system.
+
+
+
+
+Travis CI
+
+
+GitHub Actions
+
+
+
+
+{% raw %}
+```yaml
+language: node_js
+cache: npm
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+- name: Cache node modules
+ uses: actions/cache@v2
+ with:
+ path: ~/.npm
+ key: v1-npm-deps-${{ hashFiles('**/package-lock.json') }}
+ restore-keys: v1-npm-deps-
+```
+{% endraw %}
+
+
+
+
+For more information, see "[Caching dependencies to speed up workflows](/actions/guides/caching-dependencies-to-speed-up-workflows)."
+
+### Examples of common tasks
+
+This section compares how {% data variables.product.prodname_actions %} and Travis CI perform common tasks.
+
+#### Configuring environment variables
+
+You can create custom environment variables in a {% data variables.product.prodname_actions %} job. 예시:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %} Workflow
+
+
+
+
+
+ ```yaml
+env:
+ - MAVEN_PATH="/usr/local/maven"
+ ```
+
+
+
+
+ ```yaml
+ jobs:
+ maven-build:
+ env:
+ MAVEN_PATH: '/usr/local/maven'
+ ```
+
+
+
+
+
+#### Building with Node.js
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %} Workflow
+
+
+
+
+{% raw %}
+ ```yaml
+install:
+ - npm install
+script:
+ - npm run build
+ - npm test
+ ```
+{% endraw %}
+
+
+{% raw %}
+ ```yaml
+name: Node.js CI
+on: [push]
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Use Node.js
+ uses: actions/setup-node@v1
+ with:
+ node-version: '12.x'
+ - run: npm install
+ - run: npm run build
+ - run: npm test
+ ```
+{% endraw %}
+
+
+
+
+### 다음 단계
+
+To continue learning about the main features of {% data variables.product.prodname_actions %}, see "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)."
diff --git a/translations/ko-KR/content/actions/learn-github-actions/security-hardening-for-github-actions.md b/translations/ko-KR/content/actions/learn-github-actions/security-hardening-for-github-actions.md
index abe2244646..96ca6b2b21 100644
--- a/translations/ko-KR/content/actions/learn-github-actions/security-hardening-for-github-actions.md
+++ b/translations/ko-KR/content/actions/learn-github-actions/security-hardening-for-github-actions.md
@@ -26,7 +26,7 @@ Secrets use [Libsodium sealed boxes](https://libsodium.gitbook.io/doc/public-key
To help prevent accidental disclosure, {% data variables.product.product_name %} uses a mechanism that attempts to redact any secrets that appear in run logs. This redaction looks for exact matches of any configured secrets, as well as common encodings of the values, such as Base64. However, because there are multiple ways a secret value can be transformed, this redaction is not guaranteed. As a result, there are certain proactive steps and good practices you should follow to help ensure secrets are redacted, and to limit other risks associated with secrets:
- **Never use structured data as a secret**
- - Unstructured data can cause secret redaction within logs to fail, because redaction largely relies on finding an exact match for the specific secret value. For example, do not use a blob of JSON, XML, or YAML (or similar) to encapsulate a secret value, as this significantly reduces the probability the secrets will be properly redacted. Instead, create individual secrets for each sensitive value.
+ - Structured data can cause secret redaction within logs to fail, because redaction largely relies on finding an exact match for the specific secret value. For example, do not use a blob of JSON, XML, or YAML (or similar) to encapsulate a secret value, as this significantly reduces the probability the secrets will be properly redacted. Instead, create individual secrets for each sensitive value.
- **Register all secrets used within workflows**
- If a secret is used to generate another sensitive value within a workflow, that generated value should be formally [registered as a secret](https://github.com/actions/toolkit/tree/main/packages/core#setting-a-secret), so that it will be redacted if it ever appears in the logs. For example, if using a private key to generate a signed JWT to access a web API, be sure to register that JWT as a secret or else it won’t be redacted if it ever enters the log output.
- Registering secrets applies to any sort of transformation/encoding as well. If your secret is transformed in some way (such as Base64 or URL-encoded), be sure to register the new value as a secret too.
@@ -98,7 +98,7 @@ You should also consider the environment of the self-hosted runner machines:
### Auditing {% data variables.product.prodname_actions %} events
-You can use the audit log to monitor administrative tasks in an organization. The audit log records the type of action, when it was run, and which user account perfomed the action.
+You can use the audit log to monitor administrative tasks in an organization. The audit log records the type of action, when it was run, and which user account performed the action.
For example, you can use the audit log to track the `action:org.update_actions_secret` event, which tracks changes to organization secrets: 
diff --git a/translations/ko-KR/content/actions/managing-workflow-runs/manually-running-a-workflow.md b/translations/ko-KR/content/actions/managing-workflow-runs/manually-running-a-workflow.md
index 2288a35e5a..081baff4a2 100644
--- a/translations/ko-KR/content/actions/managing-workflow-runs/manually-running-a-workflow.md
+++ b/translations/ko-KR/content/actions/managing-workflow-runs/manually-running-a-workflow.md
@@ -10,7 +10,9 @@ versions:
{% data reusables.actions.enterprise-beta %}
{% data reusables.actions.enterprise-github-hosted-runners %}
-To run a workflow manually, the workflow must be configured to run on the `workflow_dispatch` event. For more information, see "[Events that trigger workflows](/actions/reference/events-that-trigger-workflows)."
+### Configuring a workflow to run manually
+
+To run a workflow manually, the workflow must be configured to run on the `workflow_dispatch` event. For more information about configuring the `workflow_dispatch` event, see "[Events that trigger workflows](/actions/reference/events-that-trigger-workflows#workflow_dispatch)".
### Running a workflow on {% data variables.product.prodname_dotcom %}
diff --git a/translations/ko-KR/content/actions/reference/encrypted-secrets.md b/translations/ko-KR/content/actions/reference/encrypted-secrets.md
index ece5229726..bd499e0b88 100644
--- a/translations/ko-KR/content/actions/reference/encrypted-secrets.md
+++ b/translations/ko-KR/content/actions/reference/encrypted-secrets.md
@@ -105,7 +105,7 @@ steps:
```
{% endraw %}
-Avoid passing secrets between processes from the command line, whenever possible. Command-line processes may be visible to other users (using the `ps` command) or captured by [security audit events](https://docs.microsoft.com/en-us/windows-server/identity/ad-ds/manage/component-updates/command-line-process-auditing). To help protect secrets, consider using environment variables, `STDIN`, or other mechanisms supported by the target process.
+Avoid passing secrets between processes from the command line, whenever possible. Command-line processes may be visible to other users (using the `ps` command) or captured by [security audit events](https://docs.microsoft.com/windows-server/identity/ad-ds/manage/component-updates/command-line-process-auditing). To help protect secrets, consider using environment variables, `STDIN`, or other mechanisms supported by the target process.
If you must pass secrets within a command line, then enclose them within the proper quoting rules. Secrets often contain special characters that may unintentionally affect your shell. To escape these special characters, use quoting with your environment variables. 예시:
diff --git a/translations/ko-KR/content/actions/reference/events-that-trigger-workflows.md b/translations/ko-KR/content/actions/reference/events-that-trigger-workflows.md
index 46cc7cf5cb..ba576ca204 100644
--- a/translations/ko-KR/content/actions/reference/events-that-trigger-workflows.md
+++ b/translations/ko-KR/content/actions/reference/events-that-trigger-workflows.md
@@ -98,9 +98,17 @@ You can manually trigger a workflow run using the {% data variables.product.prod
To trigger the custom `workflow_dispatch` webhook event using the REST API, you must send a `POST` request to a {% data variables.product.prodname_dotcom %} API endpoint and provide the `ref` and any required `inputs`. For more information, see the "[Create a workflow dispatch event](/rest/reference/actions/#create-a-workflow-dispatch-event)" REST API endpoint.
+##### 예시
+
+To use the `workflow_dispatch` event, you need to include it as a trigger in your GitHub Actions workflow file. The example below only runs the workflow when it's manually triggered:
+
+```yaml
+on: workflow_dispatch
+```
+
##### Example workflow configuration
-This example defines the `name` and `home` inputs and prints them using the `github.event.inputs.name` and `github.event.inputs.home` contexts. If a `name` isn't provided, the default value 'Mona the Octocat' is printed.
+This example defines the `name` and `home` inputs and prints them using the `github.event.inputs.name` and `github.event.inputs.home` contexts. If a `home` isn't provided, the default value 'The Octoverse' is printed.
{% raw %}
```yaml
@@ -115,6 +123,7 @@ on:
home:
description: 'location'
required: false
+ default: 'The Octoverse'
jobs:
say_hello:
@@ -314,6 +323,33 @@ on:
types: [created, deleted]
```
+The `issue_comment` event occurs for comments on both issues and pull requests. To determine whether the `issue_comment` event was triggered from an issue or pull request, you can check the event payload for the `issue.pull_request` property and use it as a condition to skip a job.
+
+For example, you can choose to run the `pr_commented` job when comment events occur in a pull request, and the `issue_commented` job when comment events occur in an issue.
+
+```yaml
+on: issue_comment
+
+jobs:
+ pr_commented:
+ # This job only runs for pull request comments
+ name: PR comment
+ if: ${{ github.event.issue.pull_request }}
+ runs-on: ubuntu-latest
+ steps:
+ - run: |
+ echo "Comment on PR #${{ github.event.issue.number }}"
+
+ issue-commented:
+ # This job only runs for issue comments
+ name: Issue comment
+ if: ${{ !github.event.issue.pull_request }}
+ runs-on: ubuntu-latest
+ steps:
+ - run: |
+ echo "Comment on issue #${{ github.event.issue.number }}"
+```
+
#### `issues`
Runs your workflow anytime the `issues` event occurs. {% data reusables.developer-site.multiple_activity_types %} For information about the REST API, see "[Issues](/v3/issues)."
@@ -655,6 +691,10 @@ on:
{% data reusables.webhooks.workflow_run_desc %}
+| Webhook event payload | Activity types | `GITHUB_SHA` | `GITHUB_REF` |
+| -------------------------------------------------------- | -------------- | ----------------------------- | -------------- |
+| [`workflow_run`](/webhooks/event-payloads/#workflow_run) | - n/a | Last commit on default branch | Default branch |
+
If you need to filter branches from this event, you can use `branches` or `branches-ignore`.
In this example, a workflow is configured to run after the separate “Run Tests” workflow completes.
diff --git a/translations/ko-KR/content/actions/reference/specifications-for-github-hosted-runners.md b/translations/ko-KR/content/actions/reference/specifications-for-github-hosted-runners.md
index 6176c4ce2a..88021e0a57 100644
--- a/translations/ko-KR/content/actions/reference/specifications-for-github-hosted-runners.md
+++ b/translations/ko-KR/content/actions/reference/specifications-for-github-hosted-runners.md
@@ -29,7 +29,7 @@ You can specify the runner type for each job in a workflow. Each job in a workfl
#### Cloud hosts for {% data variables.product.prodname_dotcom %}-hosted runners
-{% data variables.product.prodname_dotcom %} hosts Linux and Windows runners on Standard_DS2_v2 virtual machines in Microsoft Azure with the {% data variables.product.prodname_actions %} runner application installed. The {% data variables.product.prodname_dotcom %}-hosted runner application is a fork of the Azure Pipelines Agent. Inbound ICMP packets are blocked for all Azure virtual machines, so ping or traceroute commands might not work. For more information about the Standard_DS2_v2 machine resources, see "[Dv2 and DSv2-series](https://docs.microsoft.com/en-us/azure/virtual-machines/dv2-dsv2-series#dsv2-series)" in the Microsoft Azure documentation.
+{% data variables.product.prodname_dotcom %} hosts Linux and Windows runners on Standard_DS2_v2 virtual machines in Microsoft Azure with the {% data variables.product.prodname_actions %} runner application installed. The {% data variables.product.prodname_dotcom %}-hosted runner application is a fork of the Azure Pipelines Agent. Inbound ICMP packets are blocked for all Azure virtual machines, so ping or traceroute commands might not work. For more information about the Standard_DS2_v2 machine resources, see "[Dv2 and DSv2-series](https://docs.microsoft.com/azure/virtual-machines/dv2-dsv2-series#dsv2-series)" in the Microsoft Azure documentation.
{% data variables.product.prodname_dotcom %} uses [MacStadium](https://www.macstadium.com/) to host the macOS runners.
@@ -37,7 +37,7 @@ You can specify the runner type for each job in a workflow. Each job in a workfl
The Linux and macOS virtual machines both run using passwordless `sudo`. When you need to execute commands or install tools that require more privileges than the current user, you can use `sudo` without needing to provide a password. For more information, see the "[Sudo Manual](https://www.sudo.ws/man/1.8.27/sudo.man.html)."
-Windows virtual machines are configured to run as administrators with User Account Control (UAC) disabled. For more information, see "[How User Account Control works](https://docs.microsoft.com/en-us/windows/security/identity-protection/user-account-control/how-user-account-control-works)" in the Windows documentation.
+Windows virtual machines are configured to run as administrators with User Account Control (UAC) disabled. For more information, see "[How User Account Control works](https://docs.microsoft.com/windows/security/identity-protection/user-account-control/how-user-account-control-works)" in the Windows documentation.
### Supported runners and hardware resources
diff --git a/translations/ko-KR/content/actions/reference/workflow-commands-for-github-actions.md b/translations/ko-KR/content/actions/reference/workflow-commands-for-github-actions.md
index 1c6dee2ed7..c541de2027 100644
--- a/translations/ko-KR/content/actions/reference/workflow-commands-for-github-actions.md
+++ b/translations/ko-KR/content/actions/reference/workflow-commands-for-github-actions.md
@@ -164,6 +164,25 @@ Creates an error message and prints the message to the log. You can optionally p
echo "::error file=app.js,line=10,col=15::Something went wrong"
```
+### Grouping log lines
+
+```
+::group::{title}
+::endgroup::
+```
+
+Creates an expandable group in the log. To create a group, use the `group` command and specify a `title`. Anything you print to the log between the `group` and `endgroup` commands is nested inside an expandable entry in the log.
+
+#### 예시
+
+```bash
+echo "::group::My title"
+echo "Inside group"
+echo "::endgroup::"
+```
+
+
+
### Masking a value in log
`::add-mask::{value}`
@@ -259,7 +278,8 @@ echo "action_state=yellow" >> $GITHUB_ENV
Running `$action_state` in a future step will now return `yellow`
-#### Multline strings
+#### Multiline strings
+
For multiline strings, you may use a delimiter with the following syntax.
```
@@ -268,7 +288,8 @@ For multiline strings, you may use a delimiter with the following syntax.
{delimiter}
```
-#### 예시
+##### 예시
+
In this example, we use `EOF` as a delimiter and set the `JSON_RESPONSE` environment variable to the value of the curl response.
```
steps:
diff --git a/translations/ko-KR/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md b/translations/ko-KR/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
index 66ef979228..51d9a7d1c9 100644
--- a/translations/ko-KR/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
+++ b/translations/ko-KR/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
@@ -10,7 +10,7 @@ versions:
### About authentication and user provisioning with Azure AD
-Azure Active Directory (Azure AD) is a service from Microsoft that allows you to centrally manage user accounts and access to web applications. For more information, see [What is Azure Active Directory?](https://docs.microsoft.com/en-us/azure/active-directory/fundamentals/active-directory-whatis) in the Microsoft Docs.
+Azure Active Directory (Azure AD) is a service from Microsoft that allows you to centrally manage user accounts and access to web applications. For more information, see [What is Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-whatis) in the Microsoft Docs.
To manage identity and access for {% data variables.product.product_name %}, you can use an Azure AD tenant as a SAML IdP for authentication. You can also configure Azure AD to automatically provision accounts and access with SCIM. This configuration allows you to assign or unassign the {% data variables.product.prodname_ghe_managed %} application for a user account in your Azure AD tenant to automatically create, grant access to, or deactivate a corresponding user account on {% data variables.product.product_name %}.
@@ -18,9 +18,9 @@ For more information about managing identity and access for your enterprise on {
### 빌드전 요구 사양
-To configure authentication and user provisioning for {% data variables.product.product_name %} using Azure AD, you must have an Azure AD account and tenant. For more information, see the [Azure AD website](https://azure.microsoft.com/en-us/free/active-directory) and [Quickstart: Create an Azure Active Directory tenant](https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-create-new-tenant) in the Microsoft Docs.
+To configure authentication and user provisioning for {% data variables.product.product_name %} using Azure AD, you must have an Azure AD account and tenant. For more information, see the [Azure AD website](https://azure.microsoft.com/free/active-directory) and [Quickstart: Create an Azure Active Directory tenant](https://docs.microsoft.com/azure/active-directory/develop/quickstart-create-new-tenant) in the Microsoft Docs.
-{% data reusables.saml.assert-the-administrator-attribute %} For more information about including the `administrator` attribute in the SAML claim from Azure AD, see [How to: customize claims issued in the SAML token for enterprise applications](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-saml-claims-customization) in the Microsoft Docs.
+{% data reusables.saml.assert-the-administrator-attribute %} For more information about including the `administrator` attribute in the SAML claim from Azure AD, see [How to: customize claims issued in the SAML token for enterprise applications](https://docs.microsoft.com/azure/active-directory/develop/active-directory-saml-claims-customization) in the Microsoft Docs.
{% data reusables.saml.create-a-machine-user %}
diff --git a/translations/ko-KR/content/admin/authentication/using-saml.md b/translations/ko-KR/content/admin/authentication/using-saml.md
index 0f30378b70..465cdf945f 100644
--- a/translations/ko-KR/content/admin/authentication/using-saml.md
+++ b/translations/ko-KR/content/admin/authentication/using-saml.md
@@ -29,7 +29,7 @@ Each {% data variables.product.prodname_ghe_server %} username is determined by
The `NameID` element is required even if other attributes are present.
-A mapping is created between the `NameID` and the {% data variables.product.prodname_ghe_server %} username, so the `NameID` should be persistent, unique, and not subject to change for the lifecyle of the user.
+A mapping is created between the `NameID` and the {% data variables.product.prodname_ghe_server %} username, so the `NameID` should be persistent, unique, and not subject to change for the lifecycle of the user.
{% note %}
diff --git a/translations/ko-KR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md b/translations/ko-KR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md
index e399f4be5d..8358524b0e 100644
--- a/translations/ko-KR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md
+++ b/translations/ko-KR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md
@@ -1,11 +1,11 @@
---
title: Enabling alerts for vulnerable dependencies on GitHub Enterprise Server
-intro: 'You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_ghe_cloud %} and enable {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies in repositories in your instance.'
+intro: 'You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_ghe_cloud %} and enable {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies in repositories in your instance.'
redirect_from:
- /enterprise/admin/installation/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server
- /enterprise/admin/configuration/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server
- /enterprise/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server
-permissions: 'Site administrators for {% data variables.product.prodname_ghe_server %} who are also owners of the connected {% data variables.product.prodname_ghe_cloud %} organization or enterprise account can enable {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}.'
+permissions: 'Site administrators for {% data variables.product.prodname_ghe_server %} who are also owners of the connected {% data variables.product.prodname_ghe_cloud %} organization or enterprise account can enable {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}.'
versions:
enterprise-server: '*'
---
@@ -14,11 +14,11 @@ versions:
{% data reusables.repositories.tracks-vulnerabilities %} For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)."
-You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}, then sync vulnerability data to your instance and generate {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts in repositories with a vulnerable dependency.
+You can connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}, then sync vulnerability data to your instance and generate {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts in repositories with a vulnerable dependency.
-After connecting {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %} and enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies, vulnerability data is synced from {% data variables.product.prodname_dotcom_the_website %} to your instance once every hour. You can also choose to manually sync vulnerability data at any time. No code or information about code from {% data variables.product.product_location %} is uploaded to {% data variables.product.prodname_dotcom_the_website %}.
+After connecting {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %} and enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies, vulnerability data is synced from {% data variables.product.prodname_dotcom_the_website %} to your instance once every hour. You can also choose to manually sync vulnerability data at any time. No code or information about code from {% data variables.product.product_location %} is uploaded to {% data variables.product.prodname_dotcom_the_website %}.
-{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate {% data variables.product.prodname_dependabot_short %} alerts. You can customize how you receive {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)."
+{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate {% data variables.product.prodname_dependabot_alerts %}. You can customize how you receive {% data variables.product.prodname_dependabot_alerts %}. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-dependabot-alerts)."
{% endif %}
{% if currentVersion == "enterprise-server@2.21" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate security alerts. You can customize how you receive security alerts. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)."
@@ -28,23 +28,25 @@ After connecting {% data variables.product.product_location %} to {% data variab
{% endif %}
{% if currentVersion ver_gt "enterprise-server@2.21" %}
-### Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}
+### Enabling {% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}
{% else %}
### Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}
{% endif %}
-Before enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}, you must connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Connecting {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_ghe_cloud %}](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)."
+Before enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}, you must connect {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Connecting {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_ghe_cloud %}](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)."
{% if currentVersion ver_gt "enterprise-server@2.20" %}
-{% if currentVersion ver_gt "enterprise-server@2.21" %}We recommend configuring {% data variables.product.prodname_dependabot_short %} alerts without notifications for the first few days to avoid an overload of emails. After a few days, you can enable notifications to receive {% data variables.product.prodname_dependabot_short %} alerts as usual.{% endif %}
+{% if currentVersion ver_gt "enterprise-server@2.21" %}We recommend configuring {% data variables.product.prodname_dependabot_alerts %} without notifications for the first few days to avoid an overload of emails. After a few days, you can enable notifications to receive {% data variables.product.prodname_dependabot_alerts %} as usual.{% endif %}
{% if currentVersion == "enterprise-server@2.21" %}We recommend configuring security alerts without notifications for the first few days to avoid an overload of emails. After a few days, you can enable notifications to receive security alerts as usual.{% endif %}
{% endif %}
{% data reusables.enterprise_site_admin_settings.sign-in %}
-1. In the administrative shell, enable the {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}:
+
+1. In the administrative shell, enable the {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies on {% data variables.product.product_location %}:
+
``` shell
$ ghe-dep-graph-enable
```
diff --git a/translations/ko-KR/content/admin/enterprise-management/monitoring-cluster-nodes.md b/translations/ko-KR/content/admin/enterprise-management/monitoring-cluster-nodes.md
index 045496a658..84c2cc639f 100644
--- a/translations/ko-KR/content/admin/enterprise-management/monitoring-cluster-nodes.md
+++ b/translations/ko-KR/content/admin/enterprise-management/monitoring-cluster-nodes.md
@@ -34,26 +34,34 @@ You can configure [Nagios](https://www.nagios.org/) to monitor {% data variables
#### Configuring the Nagios host
1. Generate an SSH key with a blank passphrase. Nagios uses this to authenticate to the {% data variables.product.prodname_ghe_server %} cluster.
```shell
- nagiosuser@nagios:~$ ssh-keygen -t rsa -b 4096
- > Generating public/private rsa key pair.
- > Enter file in which to save the key (/home/nagiosuser/.ssh/id_rsa):
+ nagiosuser@nagios:~$ ssh-keygen -t ed25519
+ > Generating public/private ed25519 key pair.
+ > Enter file in which to save the key (/home/nagiosuser/.ssh/id_ed25519):
> Enter passphrase (empty for no passphrase): leave blank by pressing enter
> Enter same passphrase again: press enter again
- > Your identification has been saved in /home/nagiosuser/.ssh/id_rsa.
- > Your public key has been saved in /home/nagiosuser/.ssh/id_rsa.pub.
+ > Your identification has been saved in /home/nagiosuser/.ssh/id_ed25519.
+ > Your public key has been saved in /home/nagiosuser/.ssh/id_ed25519.pub.
```
{% danger %}
**Security Warning:** An SSH key without a passphrase can pose a security risk if authorized for full access to a host. Limit this key's authorization to a single read-only command.
{% enddanger %}
-2. Copy the private key (`id_rsa`) to the `nagios` home folder and set the appropriate ownership.
+ {% note %}
+
+ **Note:** If you're using a distribution of Linux that doesn't support the Ed25519 algorithm, use the command:
```shell
- nagiosuser@nagios:~$ sudo cp .ssh/id_rsa /var/lib/nagios/.ssh/
- nagiosuser@nagios:~$ sudo chown nagios:nagios /var/lib/nagios/.ssh/id_rsa
+ nagiosuser@nagios:~$ ssh-keygen -t rsa -b 4096
```
-3. To authorize the public key to run *only* the `ghe-cluster-status -n` command, use a `command=` prefix in the `/data/user/common/authorized_keys` file. From the administrative shell on any node, modify this file to add the public key generated in step 1. For example: `command="/usr/local/bin/ghe-cluster-status -n" ssh-rsa AAAA....`
+ {% endnote %}
+2. Copy the private key (`id_ed25519`) to the `nagios` home folder and set the appropriate ownership.
+ ```shell
+ nagiosuser@nagios:~$ sudo cp .ssh/id_ed25519 /var/lib/nagios/.ssh/
+ nagiosuser@nagios:~$ sudo chown nagios:nagios /var/lib/nagios/.ssh/id_ed25519
+ ```
+
+3. To authorize the public key to run *only* the `ghe-cluster-status -n` command, use a `command=` prefix in the `/data/user/common/authorized_keys` file. From the administrative shell on any node, modify this file to add the public key generated in step 1. For example: `command="/usr/local/bin/ghe-cluster-status -n" ssh-ed25519 AAAA....`
4. Validate and copy the configuration to each node in the cluster by running `ghe-cluster-config-apply` on the node where you modified the `/data/user/common/authorized_keys` file.
diff --git a/translations/ko-KR/content/admin/enterprise-management/upgrading-github-enterprise-server.md b/translations/ko-KR/content/admin/enterprise-management/upgrading-github-enterprise-server.md
index 4efa9b5709..34a8fd4d34 100644
--- a/translations/ko-KR/content/admin/enterprise-management/upgrading-github-enterprise-server.md
+++ b/translations/ko-KR/content/admin/enterprise-management/upgrading-github-enterprise-server.md
@@ -49,7 +49,7 @@ There are two types of snapshots:
| 플랫폼 | Snapshot method | Snapshot documentation URL |
| --------------------- | --------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
| Amazon AWS | Disk | |
-| Azure | VM | |
+| Azure | VM | |
| Hyper-V | VM | |
| Google Compute Engine | Disk | |
| VMware | VM | [https://pubs.vmware.com/vsphere-50/topic/com.vmware.wssdk.pg.doc_50/PG_Ch11_VM_Manage.13.3.html](https://pubs.vmware.com/vsphere-50/topic/com.vmware.wssdk.pg.doc_50/PG_Ch11_VM_Manage.13.3.html) |
diff --git a/translations/ko-KR/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/ko-KR/content/admin/enterprise-support/about-github-enterprise-support.md
index 96e7bba7ad..a3e54c5e3b 100644
--- a/translations/ko-KR/content/admin/enterprise-support/about-github-enterprise-support.md
+++ b/translations/ko-KR/content/admin/enterprise-support/about-github-enterprise-support.md
@@ -29,9 +29,16 @@ In addition to all of the benefits of {% data variables.contact.enterprise_suppo
- Written support through our support portal 24 hours per day, 7 days per week
- Phone support 24 hours per day, 7 days per week
- A{% if currentVersion == "github-ae@latest" %}n enhanced{% endif %} Service Level Agreement (SLA) {% if enterpriseServerVersions contains currentVersion %}with guaranteed initial response times{% endif %}
- - Access to premium content{% if enterpriseServerVersions contains currentVersion %}
- - Scheduled health checks{% endif %}
- - Managed services
+{% if currentVersion == "github-ae@latest" %}
+ - An assigned Technical Service Account Manager
+ - Quarterly support reviews
+ - Managed Admin services
+{% else if enterpriseServerVersions contains currentVersion %}
+ - Technical account managers
+ - Access to premium content
+ - Scheduled health checks
+ - Managed Admin hours
+{% endif %}
{% data reusables.support.government-response-times-may-vary %}
diff --git a/translations/ko-KR/content/admin/enterprise-support/submitting-a-ticket.md b/translations/ko-KR/content/admin/enterprise-support/submitting-a-ticket.md
index fbff24786e..2573af2604 100644
--- a/translations/ko-KR/content/admin/enterprise-support/submitting-a-ticket.md
+++ b/translations/ko-KR/content/admin/enterprise-support/submitting-a-ticket.md
@@ -51,7 +51,7 @@ After submitting your support request and optional diagnostic information,
{% if currentVersion == "github-ae@latest" %}
### Submitting a ticket using the {% data variables.contact.ae_azure_portal %}
-Commercial customers can submit a support request in the {% data variables.contact.contact_ae_portal %}. Government customers should use the [Azure portal for government customers](https://portal.azure.us/#blade/Microsoft_Azure_Support/HelpAndSupportBlade). For more information, see [Create an Azure support request](https://docs.microsoft.com/en-us/azure/azure-portal/supportability/how-to-create-azure-support-request) in the Microsoft documentation.
+Commercial customers can submit a support request in the {% data variables.contact.contact_ae_portal %}. Government customers should use the [Azure portal for government customers](https://portal.azure.us/#blade/Microsoft_Azure_Support/HelpAndSupportBlade). For more information, see [Create an Azure support request](https://docs.microsoft.com/azure/azure-portal/supportability/how-to-create-azure-support-request) in the Microsoft documentation.
For urgent issues, to ensure a quick response, after you submit a ticket, please call the support hotline immediately. Your Technical Support Account Manager (TSAM) will provide you with the number to use in your onboarding session.
diff --git a/translations/ko-KR/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md b/translations/ko-KR/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md
index 60e03a011b..37a543f948 100644
--- a/translations/ko-KR/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md
+++ b/translations/ko-KR/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md
@@ -12,7 +12,7 @@ versions:
### About {% data variables.product.prodname_actions %} permissions for your enterprise
-When you enable {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %}, it is enabled for all organizations in your enterprise. You can choose to disable {% data variables.product.prodname_actions %} for all organizations in your enterprise, or only allow specific organizations. You can also limit the use of public actions, so that people can only use local actions that exist in an organization.
+When you enable {% data variables.product.prodname_actions %} on {% data variables.product.prodname_ghe_server %}, it is enabled for all organizations in your enterprise. You can choose to disable {% data variables.product.prodname_actions %} for all organizations in your enterprise, or only allow specific organizations. You can also limit the use of public actions, so that people can only use local actions that exist in your enterprise.
### Managing {% data variables.product.prodname_actions %} permissions for your enterprise
diff --git a/translations/ko-KR/content/admin/installation/installing-github-enterprise-server-on-azure.md b/translations/ko-KR/content/admin/installation/installing-github-enterprise-server-on-azure.md
index 0aa63816ee..ee92ac32b8 100644
--- a/translations/ko-KR/content/admin/installation/installing-github-enterprise-server-on-azure.md
+++ b/translations/ko-KR/content/admin/installation/installing-github-enterprise-server-on-azure.md
@@ -14,7 +14,7 @@ You can deploy {% data variables.product.prodname_ghe_server %} on global Azure
- {% data reusables.enterprise_installation.software-license %}
- You must have an Azure account capable of provisioning new machines. For more information, see the [Microsoft Azure website](https://azure.microsoft.com).
-- Most actions needed to launch your virtual machine (VM) may also be performed using the Azure Portal. However, we recommend installing the Azure command line interface (CLI) for initial setup. Examples using the Azure CLI 2.0 are included below. For more information, see Azure's guide "[Install Azure CLI 2.0](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest)."
+- Most actions needed to launch your virtual machine (VM) may also be performed using the Azure Portal. However, we recommend installing the Azure command line interface (CLI) for initial setup. Examples using the Azure CLI 2.0 are included below. For more information, see Azure's guide "[Install Azure CLI 2.0](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest)."
### Hardware considerations
@@ -26,9 +26,9 @@ Before launching {% data variables.product.product_location %} on Azure, you'll
#### Supported VM types and regions
-The {% data variables.product.prodname_ghe_server %} appliance requires a premium storage data disk, and is supported on any Azure VM that supports premium storage. For more information, see "[Supported VMs](https://docs.microsoft.com/en-us/azure/storage/common/storage-premium-storage#supported-vms)" in the Azure documentation. For general information about available VMs, see [the Azure virtual machines overview page](http://azure.microsoft.com/en-us/pricing/details/virtual-machines/#Linux).
+The {% data variables.product.prodname_ghe_server %} appliance requires a premium storage data disk, and is supported on any Azure VM that supports premium storage. For more information, see "[Supported VMs](https://docs.microsoft.com/azure/storage/common/storage-premium-storage#supported-vms)" in the Azure documentation. For general information about available VMs, see [the Azure virtual machines overview page](https://azure.microsoft.com/pricing/details/virtual-machines/#Linux).
-{% data variables.product.prodname_ghe_server %} supports any region that supports your VM type. For more information about the supported regions for each VM, see Azure's "[Products available by region](https://azure.microsoft.com/en-us/regions/services/)."
+{% data variables.product.prodname_ghe_server %} supports any region that supports your VM type. For more information about the supported regions for each VM, see Azure's "[Products available by region](https://azure.microsoft.com/regions/services/)."
#### Recommended VM types
@@ -47,20 +47,20 @@ We recommend you use a DS v2 instance type with at least 14 GB of RAM. You can u
{% data reusables.enterprise_installation.create-ghe-instance %}
-1. Find the most recent {% data variables.product.prodname_ghe_server %} appliance image. For more information about the `vm image list` command, see "[az vm image list](https://docs.microsoft.com/en-us/cli/azure/vm/image?view=azure-cli-latest#az_vm_image_list)" in the Microsoft documentation.
+1. Find the most recent {% data variables.product.prodname_ghe_server %} appliance image. For more information about the `vm image list` command, see "[az vm image list](https://docs.microsoft.com/cli/azure/vm/image?view=azure-cli-latest#az_vm_image_list)" in the Microsoft documentation.
```shell
$ az vm image list --all -f GitHub-Enterprise | grep '"urn":' | sort -V
```
-2. Create a new VM using the appliance image you found. For more information, see "[az vm create](https://docs.microsoft.com/en-us/cli/azure/vm?view=azure-cli-latest#az_vm_create)" in the Microsoft documentation.
+2. Create a new VM using the appliance image you found. For more information, see "[az vm create](https://docs.microsoft.com/cli/azure/vm?view=azure-cli-latest#az_vm_create)" in the Microsoft documentation.
- Pass in options for the name of your VM, the resource group, the size of your VM, the name of your preferred Azure region, the name of the appliance image VM you listed in the previous step, and the storage SKU for premium storage. For more information about resource groups, see "[Resource groups](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-overview#resource-groups)" in the Microsoft documentation.
+ Pass in options for the name of your VM, the resource group, the size of your VM, the name of your preferred Azure region, the name of the appliance image VM you listed in the previous step, and the storage SKU for premium storage. For more information about resource groups, see "[Resource groups](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-overview#resource-groups)" in the Microsoft documentation.
```shell
$ az vm create -n VM_NAME -g RESOURCE_GROUP --size VM_SIZE -l REGION --image APPLIANCE_IMAGE_NAME --storage-sku Premium_LRS
```
-3. Configure the security settings on your VM to open up required ports. For more information, see "[az vm open-port](https://docs.microsoft.com/en-us/cli/azure/vm?view=azure-cli-latest#az_vm_open_port)" in the Microsoft documentation. See the table below for a description of each port to determine what ports you need to open.
+3. Configure the security settings on your VM to open up required ports. For more information, see "[az vm open-port](https://docs.microsoft.com/cli/azure/vm?view=azure-cli-latest#az_vm_open_port)" in the Microsoft documentation. See the table below for a description of each port to determine what ports you need to open.
```shell
$ az vm open-port -n VM_NAME -g RESOURCE_GROUP --port PORT_NUMBER
@@ -70,7 +70,7 @@ We recommend you use a DS v2 instance type with at least 14 GB of RAM. You can u
{% data reusables.enterprise_installation.necessary_ports %}
-4. Create and attach a new unencrypted data disk to the VM, and configure the size based on your user license count. For more information, see "[az vm disk attach](https://docs.microsoft.com/en-us/cli/azure/vm/disk?view=azure-cli-latest#az_vm_disk_attach)" in the Microsoft documentation.
+4. Create and attach a new unencrypted data disk to the VM, and configure the size based on your user license count. For more information, see "[az vm disk attach](https://docs.microsoft.com/cli/azure/vm/disk?view=azure-cli-latest#az_vm_disk_attach)" in the Microsoft documentation.
Pass in options for the name of your VM (for example, `ghe-acme-corp`), the resource group, the premium storage SKU, the size of the disk (for example, `100`), and a name for the resulting VHD.
@@ -86,7 +86,7 @@ We recommend you use a DS v2 instance type with at least 14 GB of RAM. You can u
### Configuring the {% data variables.product.prodname_ghe_server %} virtual machine
-1. Before configuring the VM, you must wait for it to enter ReadyRole status. Check the status of the VM with the `vm list` command. For more information, see "[az vm list](https://docs.microsoft.com/en-us/cli/azure/vm?view=azure-cli-latest#az_vm_list)" in the Microsoft documentation.
+1. Before configuring the VM, you must wait for it to enter ReadyRole status. Check the status of the VM with the `vm list` command. For more information, see "[az vm list](https://docs.microsoft.com/cli/azure/vm?view=azure-cli-latest#az_vm_list)" in the Microsoft documentation.
```shell
$ az vm list -d -g RESOURCE_GROUP -o table
> Name ResourceGroup PowerState PublicIps Fqdns Location Zones
@@ -96,7 +96,7 @@ We recommend you use a DS v2 instance type with at least 14 GB of RAM. You can u
```
{% note %}
- **Note:** Azure does not automatically create a FQDNS entry for the VM. For more information, see Azure's guide on how to "[Create a fully qualified domain name in the Azure portal for a Linux VM](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/portal-create-fqdn)."
+ **Note:** Azure does not automatically create a FQDNS entry for the VM. For more information, see Azure's guide on how to "[Create a fully qualified domain name in the Azure portal for a Linux VM](https://docs.microsoft.com/azure/virtual-machines/linux/portal-create-fqdn)."
{% endnote %}
diff --git a/translations/ko-KR/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md b/translations/ko-KR/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md
index a595cc18b2..0ff67897ce 100644
--- a/translations/ko-KR/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md
+++ b/translations/ko-KR/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md
@@ -12,7 +12,7 @@ versions:
- {% data reusables.enterprise_installation.software-license %}
- You must have Windows Server 2008 through Windows Server 2016, which support Hyper-V.
-- Most actions needed to create your virtual machine (VM) may also be performed using the [Hyper-V Manager](https://docs.microsoft.com/en-us/windows-server/virtualization/hyper-v/manage/remotely-manage-hyper-v-hosts). However, we recommend using the Windows PowerShell command-line shell for initial setup. Examples using PowerShell are included below. For more information, see the Microsoft guide "[Getting Started with Windows PowerShell](https://docs.microsoft.com/en-us/powershell/scripting/getting-started/getting-started-with-windows-powershell?view=powershell-5.1)."
+- Most actions needed to create your virtual machine (VM) may also be performed using the [Hyper-V Manager](https://docs.microsoft.com/windows-server/virtualization/hyper-v/manage/remotely-manage-hyper-v-hosts). However, we recommend using the Windows PowerShell command-line shell for initial setup. Examples using PowerShell are included below. For more information, see the Microsoft guide "[Getting Started with Windows PowerShell](https://docs.microsoft.com/powershell/scripting/getting-started/getting-started-with-windows-powershell?view=powershell-5.1)."
### Hardware considerations
@@ -30,23 +30,23 @@ versions:
{% data reusables.enterprise_installation.create-ghe-instance %}
-1. In PowerShell, create a new Generation 1 virtual machine, configure the size based on your user license count, and attach the {% data variables.product.prodname_ghe_server %} image you downloaded. For more information, see "[New-VM](https://docs.microsoft.com/en-us/powershell/module/hyper-v/new-vm?view=win10-ps)" in the Microsoft documentation.
+1. In PowerShell, create a new Generation 1 virtual machine, configure the size based on your user license count, and attach the {% data variables.product.prodname_ghe_server %} image you downloaded. For more information, see "[New-VM](https://docs.microsoft.com/powershell/module/hyper-v/new-vm?view=win10-ps)" in the Microsoft documentation.
```shell
PS C:\> New-VM -Generation 1 -Name VM_NAME -MemoryStartupBytes MEMORY_SIZE -BootDevice VHD -VHDPath PATH_TO_VHD
```
-{% data reusables.enterprise_installation.create-attached-storage-volume %} Replace `PATH_TO_DATA_DISK` with the path to the location where you create the disk. For more information, see "[New-VHD](https://docs.microsoft.com/en-us/powershell/module/hyper-v/new-vhd?view=win10-ps)" in the Microsoft documentation.
+{% data reusables.enterprise_installation.create-attached-storage-volume %} Replace `PATH_TO_DATA_DISK` with the path to the location where you create the disk. For more information, see "[New-VHD](https://docs.microsoft.com/powershell/module/hyper-v/new-vhd?view=win10-ps)" in the Microsoft documentation.
```shell
PS C:\> New-VHD -Path PATH_TO_DATA_DISK -SizeBytes DISK_SIZE
```
-3. Attach the data disk to your instance. For more information, see "[Add-VMHardDiskDrive](https://docs.microsoft.com/en-us/powershell/module/hyper-v/add-vmharddiskdrive?view=win10-ps)" in the Microsoft documentation.
+3. Attach the data disk to your instance. For more information, see "[Add-VMHardDiskDrive](https://docs.microsoft.com/powershell/module/hyper-v/add-vmharddiskdrive?view=win10-ps)" in the Microsoft documentation.
```shell
PS C:\> Add-VMHardDiskDrive -VMName VM_NAME -Path PATH_TO_DATA_DISK
```
-4. Start the VM. For more information, see "[Start-VM](https://docs.microsoft.com/en-us/powershell/module/hyper-v/start-vm?view=win10-ps)" in the Microsoft documentation.
+4. Start the VM. For more information, see "[Start-VM](https://docs.microsoft.com/powershell/module/hyper-v/start-vm?view=win10-ps)" in the Microsoft documentation.
```shell
PS C:\> Start-VM -Name VM_NAME
```
-5. Get the IP address of your VM. For more information, see "[Get-VMNetworkAdapter](https://docs.microsoft.com/en-us/powershell/module/hyper-v/get-vmnetworkadapter?view=win10-ps)" in the Microsoft documentation.
+5. Get the IP address of your VM. For more information, see "[Get-VMNetworkAdapter](https://docs.microsoft.com/powershell/module/hyper-v/get-vmnetworkadapter?view=win10-ps)" in the Microsoft documentation.
```shell
PS C:\> (Get-VMNetworkAdapter -VMName VM_NAME).IpAddresses
```
diff --git a/translations/ko-KR/content/admin/packages/configuring-third-party-storage-for-packages.md b/translations/ko-KR/content/admin/packages/configuring-third-party-storage-for-packages.md
index f3dfd6acb5..523834c7e4 100644
--- a/translations/ko-KR/content/admin/packages/configuring-third-party-storage-for-packages.md
+++ b/translations/ko-KR/content/admin/packages/configuring-third-party-storage-for-packages.md
@@ -13,7 +13,7 @@ versions:
{% data variables.product.prodname_registry %} on {% data variables.product.prodname_ghe_server %} uses external blob storage to store your packages. The amount of storage required depends on your usage of {% data variables.product.prodname_registry %}.
-At this time, {% data variables.product.prodname_registry %} supports blob storage with Amazon Web Services (AWS) S3. MinIO is also supported, but configuration is not currently implemented in the {% data variables.product.product_name %} interface. You can use MinIO for storage by following the instructions for AWS S3, entering the analagous information for your MinIO configuration.
+At this time, {% data variables.product.prodname_registry %} supports blob storage with Amazon Web Services (AWS) S3. MinIO is also supported, but configuration is not currently implemented in the {% data variables.product.product_name %} interface. You can use MinIO for storage by following the instructions for AWS S3, entering the analogous information for your MinIO configuration.
For the best experience, we recommend using a dedicated bucket for {% data variables.product.prodname_registry %}, separate from the bucket you use for {% data variables.product.prodname_actions %} storage.
diff --git a/translations/ko-KR/content/admin/policies/creating-a-pre-receive-hook-script.md b/translations/ko-KR/content/admin/policies/creating-a-pre-receive-hook-script.md
index 8b51c575da..a34f36223f 100644
--- a/translations/ko-KR/content/admin/policies/creating-a-pre-receive-hook-script.md
+++ b/translations/ko-KR/content/admin/policies/creating-a-pre-receive-hook-script.md
@@ -102,8 +102,8 @@ You can test a pre-receive hook script locally before you create or update it on
adduser git -D -G root -h /home/git -s /bin/bash && \
passwd -d git && \
su git -c "mkdir /home/git/.ssh && \
- ssh-keygen -t rsa -b 4096 -f /home/git/.ssh/id_rsa -P '' && \
- mv /home/git/.ssh/id_rsa.pub /home/git/.ssh/authorized_keys && \
+ ssh-keygen -t ed25519 -f /home/git/.ssh/id_ed25519 -P '' && \
+ mv /home/git/.ssh/id_ed25519.pub /home/git/.ssh/authorized_keys && \
mkdir /home/git/test.git && \
git --bare init /home/git/test.git"
@@ -135,7 +135,7 @@ You can test a pre-receive hook script locally before you create or update it on
> Sending build context to Docker daemon 3.584 kB
> Step 1 : FROM gliderlabs/alpine:3.3
> ---> 8944964f99f4
- > Step 2 : RUN apk add --no-cache git openssh bash && ssh-keygen -A && sed -i "s/#AuthorizedKeysFile/AuthorizedKeysFile/g" /etc/ssh/sshd_config && adduser git -D -G root -h /home/git -s /bin/bash && passwd -d git && su git -c "mkdir /home/git/.ssh && ssh-keygen -t rsa -b 4096 -f /home/git/.ssh/id_rsa -P ' && mv /home/git/.ssh/id_rsa.pub /home/git/.ssh/authorized_keys && mkdir /home/git/test.git && git --bare init /home/git/test.git"
+ > Step 2 : RUN apk add --no-cache git openssh bash && ssh-keygen -A && sed -i "s/#AuthorizedKeysFile/AuthorizedKeysFile/g" /etc/ssh/sshd_config && adduser git -D -G root -h /home/git -s /bin/bash && passwd -d git && su git -c "mkdir /home/git/.ssh && ssh-keygen -t ed25519 -f /home/git/.ssh/id_ed25519 -P ' && mv /home/git/.ssh/id_ed25519.pub /home/git/.ssh/authorized_keys && mkdir /home/git/test.git && git --bare init /home/git/test.git"
> ---> Running in e9d79ab3b92c
> fetch http://alpine.gliderlabs.com/alpine/v3.3/main/x86_64/APKINDEX.tar.gz
> fetch http://alpine.gliderlabs.com/alpine/v3.3/community/x86_64/APKINDEX.tar.gz
@@ -143,9 +143,9 @@ You can test a pre-receive hook script locally before you create or update it on
> OK: 34 MiB in 26 packages
> ssh-keygen: generating new host keys: RSA DSA ECDSA ED25519
> Password for git changed by root
- > Generating public/private rsa key pair.
- > Your identification has been saved in /home/git/.ssh/id_rsa.
- > Your public key has been saved in /home/git/.ssh/id_rsa.pub.
+ > Generating public/private ed25519 key pair.
+ > Your identification has been saved in /home/git/.ssh/id_ed25519.
+ > Your public key has been saved in /home/git/.ssh/id_ed25519.pub.
....truncated output....
> Initialized empty Git repository in /home/git/test.git/
> Successfully built dd8610c24f82
@@ -173,7 +173,7 @@ You can test a pre-receive hook script locally before you create or update it on
9. Copy the generated SSH key from the data container to the local machine:
```shell
- $ docker cp data:/home/git/.ssh/id_rsa .
+ $ docker cp data:/home/git/.ssh/id_ed25519 .
```
10. Modify the remote of a test repository and push to the `test.git` repo within the Docker container. This example uses `git@github.com:octocat/Hello-World.git` but you can use any repo you want. This example assumes your local machine (127.0.0.1) is binding port 52311, but you can use a different IP address if docker is running on a remote machine.
@@ -182,7 +182,7 @@ You can test a pre-receive hook script locally before you create or update it on
$ git clone git@github.com:octocat/Hello-World.git
$ cd Hello-World
$ git remote add test git@127.0.0.1:test.git
- $ GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 52311 -i ../id_rsa" git push -u test main
+ $ GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 52311 -i ../id_ed25519" git push -u test main
> Warning: Permanently added '[192.168.99.100]:52311' (ECDSA) to the list of known hosts.
> Counting objects: 7, done.
> Delta compression using up to 4 threads.
diff --git a/translations/ko-KR/content/admin/user-management/auditing-users-across-your-enterprise.md b/translations/ko-KR/content/admin/user-management/auditing-users-across-your-enterprise.md
index dac654d642..5527a0d2f4 100644
--- a/translations/ko-KR/content/admin/user-management/auditing-users-across-your-enterprise.md
+++ b/translations/ko-KR/content/admin/user-management/auditing-users-across-your-enterprise.md
@@ -66,9 +66,9 @@ You can only use a {% data variables.product.product_name %} username, not an in
The `org` qualifier limits actions to a specific organization. 예시:
-* `org:my-org` finds all events that occured for the `my-org` organization.
+* `org:my-org` finds all events that occurred for the `my-org` organization.
* `org:my-org action:team` finds all team events performed within the `my-org` organization.
-* `-org:my-org` excludes all events that occured for the `my-org` organization.
+* `-org:my-org` excludes all events that occurred for the `my-org` organization.
#### Search based on the action performed
diff --git a/translations/ko-KR/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md b/translations/ko-KR/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md
index 7e2378fae0..3f180fe282 100644
--- a/translations/ko-KR/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md
+++ b/translations/ko-KR/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md
@@ -80,12 +80,8 @@ Now that you've created and published your repository, you're ready to make chan
2. Make some changes to the _README.md_ file that you previously created. You can add information that describes your project, like what it does and why it is useful. When you are satisfied with your changes, save them in your text editor.
3. In {% data variables.product.prodname_desktop %}, navigate to the **Changes** view. In the file list, you should see your _README.md_. The checkmark to the left of the _README.md_ file indicates that the changes you've made to the file will be part of the commit you make. In the future, you might make changes to multiple files but only want to commit the changes you've made to some of the files. If you click the checkmark next to a file, that file will not be included in the commit. 
-4. At the bottom of the **Changes** list, enter a commit message. To the right of your profile picture, type a short description of the commit. Since we're changing the _README.md_ file, "Add information about purpose of project" would be a good commit summary. Below the summary, you'll see a "Description" text field where you can type a longer description of the changes in the commit, which is helpful when looking back at the history of a project and understanding why changes were made. Since you're making a basic update of a _README.md_ file, you can skip the description.  <<<<<<< HEAD
-5. Click **Commit to BRANCH NAME**. The commit button shows your current branch so you can be sure to commit to the branch you want.
-
-=======
-5. Click **Commit to master**. The commit button shows your current branch, which in this case is `master`, so that you know which branch you are making a commit to. 
-> > > > > > > master
+4. At the bottom of the **Changes** list, enter a commit message. To the right of your profile picture, type a short description of the commit. Since we're changing the _README.md_ file, "Add information about purpose of project" would be a good commit summary. Below the summary, you'll see a "Description" text field where you can type a longer description of the changes in the commit, which is helpful when looking back at the history of a project and understanding why changes were made. Since you're making a basic update of a _README.md_ file, you can skip the description. 
+5. Click **Commit to BRANCH NAME**. The commit button shows your current branch so you can be sure to commit to the branch you want. 
6. To push your changes to the remote repository on {% data variables.product.product_name %}, click **Push origin**. 
- The **Push origin** button is the same one that you clicked to publish your repository to {% data variables.product.product_name %}. This button changes contextually based on where you are at in the Git workflow. It should now say `Push origin` with a `1` next to it, indicating that there is one commit that has not been pushed up to {% data variables.product.product_name %}.
- The "origin" in **Push origin** means that you are pushing changes to the remote called `origin`, which in this case is your project's repository on {% data variables.product.prodname_dotcom_the_website %}. Until you push any new commits to {% data variables.product.product_name %}, there will be differences between your project's repository on your computer and your project's repository on {% data variables.product.prodname_dotcom_the_website %}. This allows you to work locally and only push your changes to {% data variables.product.prodname_dotcom_the_website %} when you're ready.
diff --git a/translations/ko-KR/content/developers/apps/creating-ci-tests-with-the-checks-api.md b/translations/ko-KR/content/developers/apps/creating-ci-tests-with-the-checks-api.md
index d31f6878ae..a74759ea0c 100644
--- a/translations/ko-KR/content/developers/apps/creating-ci-tests-with-the-checks-api.md
+++ b/translations/ko-KR/content/developers/apps/creating-ci-tests-with-the-checks-api.md
@@ -836,7 +836,7 @@ Here are a few common problems and some suggested solutions. If you run into any
* **Q:** My app isn't pushing code to GitHub. I don't see the fixes that RuboCop automatically makes!
- **A:** Make sure you have **Read & write** permissions for "Repository contents," and that you are cloning the repository with your intallation token. See [Step 2.2. Cloning the repository](#step-22-cloning-the-repository) for details.
+ **A:** Make sure you have **Read & write** permissions for "Repository contents," and that you are cloning the repository with your installation token. See [Step 2.2. Cloning the repository](#step-22-cloning-the-repository) for details.
* **Q:** I see an error in the `template_server.rb` debug output related to cloning my repository.
diff --git a/translations/ko-KR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md b/translations/ko-KR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
index 90b345d4f7..a1d18a0d14 100644
--- a/translations/ko-KR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
+++ b/translations/ko-KR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
@@ -662,7 +662,7 @@ While most of your API interaction should occur using your server-to-server inst
* [Create commit signature protection](/v3/repos/branches/#create-commit-signature-protection)
* [Delete commit signature protection](/v3/repos/branches/#delete-commit-signature-protection)
* [Get status checks protection](/v3/repos/branches/#get-status-checks-protection)
-* [Update status check potection](/v3/repos/branches/#update-status-check-potection)
+* [Update status check protection](/v3/repos/branches/#update-status-check-protection)
* [Remove status check protection](/v3/repos/branches/#remove-status-check-protection)
* [Get all status check contexts](/v3/repos/branches/#get-all-status-check-contexts)
* [Add status check contexts](/v3/repos/branches/#add-status-check-contexts)
diff --git a/translations/ko-KR/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md b/translations/ko-KR/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md
index ea9fc0b72e..86058820ec 100644
--- a/translations/ko-KR/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md
+++ b/translations/ko-KR/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md
@@ -262,7 +262,7 @@ Before you can use the Octokit.rb library to make API calls, you'll need to init
# Instantiate an Octokit client authenticated as a GitHub App.
# GitHub App authentication requires that you construct a
# JWT (https://jwt.io/introduction/) signed with the app's private key,
-# so GitHub can be sure that it came from the app an not altererd by
+# so GitHub can be sure that it came from the app an not altered by
# a malicious third party.
def authenticate_app
payload = {
diff --git a/translations/ko-KR/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md b/translations/ko-KR/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md
index ffbc4c69fc..5ad1d2f177 100644
--- a/translations/ko-KR/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md
+++ b/translations/ko-KR/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md
@@ -1,6 +1,6 @@
---
title: REST endpoints for the GitHub Marketplace API
-intro: 'To help manage your app on {% data variables.product.prodname_marketplace %}, use these {% data variables.product.prodname_marketplace %} API endoints.'
+intro: 'To help manage your app on {% data variables.product.prodname_marketplace %}, use these {% data variables.product.prodname_marketplace %} API endpoints.'
redirect_from:
- /apps/marketplace/github-marketplace-api-endpoints/
- /apps/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-rest-api-endpoints/
diff --git a/translations/ko-KR/content/github/administering-a-repository/about-dependabot-version-updates.md b/translations/ko-KR/content/github/administering-a-repository/about-dependabot-version-updates.md
new file mode 100644
index 0000000000..a49e5c06ec
--- /dev/null
+++ b/translations/ko-KR/content/github/administering-a-repository/about-dependabot-version-updates.md
@@ -0,0 +1,45 @@
+---
+title: About Dependabot version updates
+intro: 'You can use {% data variables.product.prodname_dependabot %} to keep the packages you use updated to the latest versions.'
+redirect_from:
+ - /github/administering-a-repository/about-dependabot
+ - /github/administering-a-repository/about-github-dependabot-version-updates
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.dependabot.beta-note %}
+
+### About {% data variables.product.prodname_dependabot_version_updates %}
+
+{% data variables.product.prodname_dependabot %} takes the effort out of maintaining your dependencies. You can use it to ensure that your repository automatically keeps up with the latest releases of the packages and applications it depends on.
+
+You enable {% data variables.product.prodname_dependabot_version_updates %} by checking a configuration file in to your repository. The configuration file specifies the location of the manifest, or other package definition files, stored in your repository. {% data variables.product.prodname_dependabot %} uses this information to check for outdated packages and applications. {% data variables.product.prodname_dependabot %} determines if there is a new version of a dependency by looking at the semantic versioning ([semver](https://semver.org/)) of the dependency to decide whether it should update to that version. For certain package managers, {% data variables.product.prodname_dependabot_version_updates %} also supports vendoring. Vendored (or cached) dependencies are dependencies that are checked in to a specific directory in a repository, rather than referenced in a manifest. Vendored dependencies are available at build time even if package servers are unavailable. {% data variables.product.prodname_dependabot_version_updates %} can be configured to check vendored dependencies for new versions and update them if necessary.
+
+When {% data variables.product.prodname_dependabot %} identifies an outdated dependency, it raises a pull request to update the manifest to the latest version of the dependency. For vendored dependencies, {% data variables.product.prodname_dependabot %} raises a pull request to directly replace the outdated dependency with the new version. You check that your tests pass, review the changelog and release notes included in the pull request summary, and then merge it. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)."
+
+If you enable security updates, {% data variables.product.prodname_dependabot %} also raises pull requests to update vulnerable dependencies. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
+
+{% data reusables.dependabot.dependabot-tos %}
+
+### Frequency of {% data variables.product.prodname_dependabot %} pull requests
+
+You specify how often to check each ecosystem for new versions in the configuration file: daily, weekly, or monthly.
+
+{% data reusables.dependabot.initial-updates %}
+
+If you've enabled security updates, you'll sometimes see extra pull requests for security updates. These are triggered by a {% data variables.product.prodname_dependabot %} alert for a dependency on your default branch. {% data variables.product.prodname_dependabot %} automatically raises a pull request to update the vulnerable dependency.
+
+### Supported repositories and ecosystems
+
+{% note %}
+
+{% data reusables.dependabot.private-dependencies %}
+
+{% endnote %}
+
+You can configure version updates for repositories that contain a dependency manifest or lock file for one of the supported package managers. For some package managers, you can also configure vendoring for dependencies. For more information, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates#vendor)."
+
+{% data reusables.dependabot.supported-package-managers %}
+
+If your repository already uses an integration for dependency management, you will need to disable this before enabling {% data variables.product.prodname_dependabot %}. For more information, see "[About integrations](/github/customizing-your-github-workflow/about-integrations)."
diff --git a/translations/ko-KR/content/github/administering-a-repository/about-releases.md b/translations/ko-KR/content/github/administering-a-repository/about-releases.md
index 4be9004f54..65fd50ecbb 100644
--- a/translations/ko-KR/content/github/administering-a-repository/about-releases.md
+++ b/translations/ko-KR/content/github/administering-a-repository/about-releases.md
@@ -32,7 +32,7 @@ People with admin permissions to a repository can choose whether
{% if currentVersion == "free-pro-team@latest" %}
If a release fixes a security vulnerability, you should publish a security advisory in your repository.
-{% data variables.product.prodname_dotcom %} reviews each published security advisory and may use it to send {% data variables.product.prodname_dependabot_short %} alerts to affected repositories. For more information, see "[About GitHub Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)."
+{% data variables.product.prodname_dotcom %} reviews each published security advisory and may use it to send {% data variables.product.prodname_dependabot_alerts %} to affected repositories. For more information, see "[About GitHub Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)."
You can view the **Dependents** tab of the dependency graph to see which repositories and packages depend on code in your repository, and may therefore be affected by a new release. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)."
{% endif %}
diff --git a/translations/ko-KR/content/github/administering-a-repository/about-securing-your-repository.md b/translations/ko-KR/content/github/administering-a-repository/about-securing-your-repository.md
index 9b1b79977a..2718b4c036 100644
--- a/translations/ko-KR/content/github/administering-a-repository/about-securing-your-repository.md
+++ b/translations/ko-KR/content/github/administering-a-repository/about-securing-your-repository.md
@@ -21,13 +21,13 @@ The first step to securing a repository is to set up who can see and modify your
Privately discuss and fix security vulnerabilities in your repository's code. You can then publish a security advisory to alert your community to the vulnerability and encourage them to upgrade. For more information, see "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)."
-- **{% data variables.product.prodname_dependabot_short %} alerts and security updates**
+- **{% data variables.product.prodname_dependabot_alerts %} and security updates**
- View alerts about dependencies that are known to contain security vulnerabilities, and choose whether to have pull requests generated automatically to update these dependencies. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."
+ View alerts about dependencies that are known to contain security vulnerabilities, and choose whether to have pull requests generated automatically to update these dependencies. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
-- **{% data variables.product.prodname_dependabot_short %} version updates**
+- **{% data variables.product.prodname_dependabot %} version updates**
- Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. For more information, see "[About {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-github-dependabot-version-updates)."
+ Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. For more information, see "[About {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-dependabot-version-updates)."
- **{% data variables.product.prodname_code_scanning_capc %} alerts**
@@ -43,6 +43,6 @@ The first step to securing a repository is to set up who can see and modify your
* Ecosystems and packages that your repository depends on
* Repositories and packages that depend on your repository
-You must enable the dependency graph before {% data variables.product.prodname_dotcom %} can generate {% data variables.product.prodname_dependabot_short %} alerts for dependencies with security vulnerabilities.
+You must enable the dependency graph before {% data variables.product.prodname_dotcom %} can generate {% data variables.product.prodname_dependabot_alerts %} for dependencies with security vulnerabilities.
You can find the dependency graph on the **Insights** tab for your repository. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)."
diff --git a/translations/ko-KR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md b/translations/ko-KR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md
index 2ac0938a19..7b3ccfce08 100644
--- a/translations/ko-KR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md
+++ b/translations/ko-KR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md
@@ -12,7 +12,7 @@ versions:
The {% data variables.product.prodname_dependabot %} configuration file, *dependabot.yml*, uses YAML syntax. If you're new to YAML and want to learn more, see "[Learn YAML in five minutes](https://www.codeproject.com/Articles/1214409/Learn-YAML-in-five-minutes)."
-You must store this file in the `.github` directory of your repository. When you add or update the *dependabot.yml* file, this triggers an immediate check for version updates. Any options that also affect security updates are used the next time a security alert triggers a pull request with for security update. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."
+You must store this file in the `.github` directory of your repository. When you add or update the *dependabot.yml* file, this triggers an immediate check for version updates. Any options that also affect security updates are used the next time a security alert triggers a pull request for a security update. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)."
### Configuration options for *dependabot.yml*
@@ -56,13 +56,13 @@ In addition, the [`open-pull-requests-limit`](#open-pull-requests-limit) option
Security updates are raised for vulnerable package manifests only on the default branch. When configuration options are set for the same branch (true unless you use `target-branch`), and specify a `package-ecosystem` and `directory` for the vulnerable manifest, then pull requests for security updates use relevant options.
-In general, security updates use any configuration options that affect pull requests, for example, adding metadata or changing their behavior. For more information about security updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."
+In general, security updates use any configuration options that affect pull requests, for example, adding metadata or changing their behavior. For more information about security updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)."
{% endnote %}
### `package-ecosystem`
-**Required** You add one `package-ecosystem` element for each package manager that you want {% data variables.product.prodname_dependabot_short %} to monitor for new versions. The repository must also contain a dependency manifest or lock file for each of these package managers. If you want to enable vendoring for a package manager that supports it, the vendored dependencies must be located in the required directory. For more information, see [`vendor`](#vendor) below.
+**Required** You add one `package-ecosystem` element for each package manager that you want {% data variables.product.prodname_dependabot %} to monitor for new versions. The repository must also contain a dependency manifest or lock file for each of these package managers. If you want to enable vendoring for a package manager that supports it, the vendored dependencies must be located in the required directory. For more information, see [`vendor`](#vendor) below.
{% data reusables.dependabot.supported-package-managers %}
@@ -308,7 +308,7 @@ updates:
{% note %}
-**Note**: {% data variables.product.prodname_dependabot_version_updates %} can't run version updates for any dependencies in manifests containing private git dependencies or private git registries, even if you add the private dependencies to the `ignore` option of your configuration file. For more information, see "[About {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-github-dependabot#supported-repositories-and-ecosystems)."
+**Note**: {% data variables.product.prodname_dependabot_version_updates %} can't run version updates for any dependencies in manifests containing private git dependencies or private git registries, even if you add the private dependencies to the `ignore` option of your configuration file. For more information, see "[About {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-dependabot#supported-repositories-and-ecosystems)."
{% endnote %}
@@ -543,7 +543,7 @@ updates:
### `vendor`
-Use the `vendor` option to tell {% data variables.product.prodname_dependabot_short %} to vendor dependencies when updating them.
+Use the `vendor` option to tell {% data variables.product.prodname_dependabot %} to vendor dependencies when updating them.
```yaml
# Configure version updates for both dependencies defined in manifests and vendored dependencies
@@ -558,7 +558,7 @@ updates:
interval: "weekly"
```
-{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository.
+{% data variables.product.prodname_dependabot %} only updates the vendored dependencies located in specific directories in a repository.
| Package manager | Required file path for vendored dependencies | More information |
| --------------- | ------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------- |
diff --git a/translations/ko-KR/content/github/administering-a-repository/customizing-dependency-updates.md b/translations/ko-KR/content/github/administering-a-repository/customizing-dependency-updates.md
index 26f64bba21..95340f31d2 100644
--- a/translations/ko-KR/content/github/administering-a-repository/customizing-dependency-updates.md
+++ b/translations/ko-KR/content/github/administering-a-repository/customizing-dependency-updates.md
@@ -20,7 +20,7 @@ After you've enabled version updates, you can customize how {% data variables.pr
For more information about the configuration options, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates)."
-When you update the *dependabot.yml* file in your repository, {% data variables.product.prodname_dependabot %} runs an immediate check with the new configuration. Within minutes you will see an updated list of dependencies on the **{% data variables.product.prodname_dependabot_short %}** tab, this may take longer if the repository has many dependencies. You may also see new pull requests for version updates. For more information, see "[Listing dependencies configured for version updates](/github/administering-a-repository/listing-dependencies-configured-for-version-updates)."
+When you update the *dependabot.yml* file in your repository, {% data variables.product.prodname_dependabot %} runs an immediate check with the new configuration. Within minutes you will see an updated list of dependencies on the **{% data variables.product.prodname_dependabot %}** tab, this may take longer if the repository has many dependencies. You may also see new pull requests for version updates. For more information, see "[Listing dependencies configured for version updates](/github/administering-a-repository/listing-dependencies-configured-for-version-updates)."
### Impact of configuration changes on security updates
diff --git a/translations/ko-KR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md b/translations/ko-KR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md
index dc326ed50c..44181e9930 100644
--- a/translations/ko-KR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md
+++ b/translations/ko-KR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md
@@ -63,7 +63,7 @@ You can disable all workflows for a repository or set a policy that configures w
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
{% data reusables.repositories.settings-sidebar-actions %}
-1. Under **Actions permissions**, select **Allow specific actions** and add your required actions to the list. 
+1. Under **Actions permissions**, select **Allow select actions** and add your required actions to the list. 
2. Click **Save**.
{% endif %}
diff --git a/translations/ko-KR/content/github/administering-a-repository/enabling-and-disabling-version-updates.md b/translations/ko-KR/content/github/administering-a-repository/enabling-and-disabling-version-updates.md
index ac3104a783..5604b5f003 100644
--- a/translations/ko-KR/content/github/administering-a-repository/enabling-and-disabling-version-updates.md
+++ b/translations/ko-KR/content/github/administering-a-repository/enabling-and-disabling-version-updates.md
@@ -10,7 +10,7 @@ versions:
### About version updates for dependencies
-You enable {% data variables.product.prodname_dependabot_version_updates %} by checking a *dependabot.yml* configuration file in to your repository's `.github` directory. {% data variables.product.prodname_dependabot_short %} then raises pull requests to keep the dependencies you configure up-to-date. For each package manager's dependencies that you want to update, you must specify the location of the package manifest files and how often to check for updates to the dependencies listed in those files. For information about enabling security updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."
+You enable {% data variables.product.prodname_dependabot_version_updates %} by checking a *dependabot.yml* configuration file in to your repository's `.github` directory. {% data variables.product.prodname_dependabot %} then raises pull requests to keep the dependencies you configure up-to-date. For each package manager's dependencies that you want to update, you must specify the location of the package manifest files and how often to check for updates to the dependencies listed in those files. For information about enabling security updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)."
{% data reusables.dependabot.initial-updates %} For more information, see "[Customizing dependency updates](/github/administering-a-repository/customizing-dependency-updates)."
@@ -72,7 +72,7 @@ On a fork, you also need to explicitly enable {% data variables.product.prodname
### Checking the status of version updates
-After you enable version updates, you'll see a new **Dependabot** tab in the dependency graph for the repository. This tab shows which package managers {% data variables.product.prodname_dependabot %} is configured to monitor and when {% data variables.product.prodname_dependabot_short %} last checked for new versions.
+After you enable version updates, you'll see a new **Dependabot** tab in the dependency graph for the repository. This tab shows which package managers {% data variables.product.prodname_dependabot %} is configured to monitor and when {% data variables.product.prodname_dependabot %} last checked for new versions.

diff --git a/translations/ko-KR/content/github/administering-a-repository/index.md b/translations/ko-KR/content/github/administering-a-repository/index.md
index 7f702c0946..4d9e27630d 100644
--- a/translations/ko-KR/content/github/administering-a-repository/index.md
+++ b/translations/ko-KR/content/github/administering-a-repository/index.md
@@ -91,11 +91,11 @@ versions:
{% topic_link_in_list /keeping-your-dependencies-updated-automatically %}
- {% link_in_list /about-github-dependabot-version-updates %}
+ {% link_in_list /about-dependabot-version-updates %}
{% link_in_list /enabling-and-disabling-version-updates %}
{% link_in_list /listing-dependencies-configured-for-version-updates %}
{% link_in_list /managing-pull-requests-for-dependency-updates %}
{% link_in_list /customizing-dependency-updates %}
{% link_in_list /configuration-options-for-dependency-updates %}
- {% link_in_list /keeping-your-actions-up-to-date-with-github-dependabot %}
+ {% link_in_list /keeping-your-actions-up-to-date-with-dependabot %}
diff --git a/translations/ko-KR/content/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot.md b/translations/ko-KR/content/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot.md
new file mode 100644
index 0000000000..a7233d2937
--- /dev/null
+++ b/translations/ko-KR/content/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot.md
@@ -0,0 +1,49 @@
+---
+title: Keeping your actions up to date with Dependabot
+intro: 'You can use {% data variables.product.prodname_dependabot %} to keep the actions you use updated to the latest versions.'
+redirect_from:
+ - /github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.dependabot.beta-note %}
+
+### About {% data variables.product.prodname_dependabot_version_updates %} for actions
+
+Actions are often updated with bug fixes and new features to make automated processes more reliable, faster, and safer. When you enable {% data variables.product.prodname_dependabot_version_updates %} for {% data variables.product.prodname_actions %}, {% data variables.product.prodname_dependabot %} will help ensure that references to actions in a repository's *workflow.yml* file are kept up to date. For each action in the file, {% data variables.product.prodname_dependabot %} checks the action's reference (typically a version number or commit identifier associated with the action) against the latest version. If a more recent version of the action is available, {% data variables.product.prodname_dependabot %} will send you a pull request that updates the reference in the workflow file to the latest version. For more information about {% data variables.product.prodname_dependabot_version_updates %}, see "[About {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-dependabot-version-updates)." For more information about configuring workflows for {% data variables.product.prodname_actions %}, see "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)."
+
+### Enabling {% data variables.product.prodname_dependabot_version_updates %} for actions
+
+{% data reusables.dependabot.create-dependabot-yml %} If you have already enabled {% data variables.product.prodname_dependabot_version_updates %} for other ecosystems or package managers, simply open the existing *dependabot.yml* file.
+1. Specify `"github-actions"` as a `package-ecosystem` to monitor.
+1. Set the `directory` to `"/"` to check for workflow files in `.github/workflows`.
+1. Set a `schedule.interval` to specify how often to check for new versions.
+{% data reusables.dependabot.check-in-dependabot-yml %} If you have edited an existing file, save your changes.
+
+You can also enable {% data variables.product.prodname_dependabot_version_updates %} on forks. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates#enabling-version-updates-on-forks)."
+
+#### Example *dependabot.yml* file for {% data variables.product.prodname_actions %}
+
+The example *dependabot.yml* file below configures version updates for {% data variables.product.prodname_actions %}. The `directory` must be set to `"/"` to check for workflow files in `.github/workflows`. The `schedule.interval` is set to `"daily"`. After this file has been checked in or updated, {% data variables.product.prodname_dependabot %} checks for new versions of your actions. {% data variables.product.prodname_dependabot %} will raise pull requests for version updates for any outdated actions that it finds. After the initial version updates, {% data variables.product.prodname_dependabot %} will continue to check for outdated versions of actions once a day.
+
+```yaml
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ # Check for updates to GitHub Actions every weekday
+ interval: "daily"
+```
+
+### Configuring {% data variables.product.prodname_dependabot_version_updates %} for actions
+
+When enabling {% data variables.product.prodname_dependabot_version_updates %} for actions, you must specify values for `package-ecosystem`, `directory`, and `schedule.interval`. There are many more optional properties that you can set to further customize your version updates. For more information, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates)."
+
+### 더 읽을거리
+
+- "[About GitHub Actions](/actions/getting-started-with-github-actions/about-github-actions)"
diff --git a/translations/ko-KR/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md b/translations/ko-KR/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md
index 9fbbf406b5..950db236ee 100644
--- a/translations/ko-KR/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md
+++ b/translations/ko-KR/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md
@@ -9,7 +9,7 @@ versions:
### Viewing dependencies monitored by {% data variables.product.prodname_dependabot %}
-After you've enabled version updates, you can confirm that your configuration is correct using the **{% data variables.product.prodname_dependabot_short %}** tab in the dependency graph for the repository. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)."
+After you've enabled version updates, you can confirm that your configuration is correct using the **{% data variables.product.prodname_dependabot %}** tab in the dependency graph for the repository. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)."
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.accessing-repository-graphs %}
@@ -21,5 +21,5 @@ If any dependencies are missing, check the log files for errors. If any package
### Viewing {% data variables.product.prodname_dependabot %} log files
-1. On the **{% data variables.product.prodname_dependabot_short %}** tab, click **Last checked *TIME* ago** to see the log file that {% data variables.product.prodname_dependabot %} generated during the last check for version updates. 
+1. On the **{% data variables.product.prodname_dependabot %}** tab, click **Last checked *TIME* ago** to see the log file that {% data variables.product.prodname_dependabot %} generated during the last check for version updates. 
2. Optionally, to rerun the version check, click **Check for updates**. 
diff --git a/translations/ko-KR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md b/translations/ko-KR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md
index 6f93905e1f..ebe089535a 100644
--- a/translations/ko-KR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md
+++ b/translations/ko-KR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md
@@ -11,7 +11,7 @@ versions:
{% data reusables.dependabot.pull-request-introduction %}
-When {% data variables.product.prodname_dependabot %} raises a pull request, you're notified by your chosen method for the repository. Each pull request contains detailed information about the proposed change, taken from the package manager. These pull requests follow the normal checks and tests defined in your repository. In addition, where enough information is available, you'll see a compatibility score. This may also help you decide whether or not to merge the change. For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."
+When {% data variables.product.prodname_dependabot %} raises a pull request, you're notified by your chosen method for the repository. Each pull request contains detailed information about the proposed change, taken from the package manager. These pull requests follow the normal checks and tests defined in your repository. In addition, where enough information is available, you'll see a compatibility score. This may also help you decide whether or not to merge the change. For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
If you have many dependencies to manage, you may want to customize the configuration for each package manager so that pull requests have specific reviewers, assignees, and labels. For more information, see "[Customizing dependency updates](/github/administering-a-repository/customizing-dependency-updates)."
diff --git a/translations/ko-KR/content/github/authenticating-to-github/connecting-with-third-party-applications.md b/translations/ko-KR/content/github/authenticating-to-github/connecting-with-third-party-applications.md
index 9715beac5a..4cf6fcd978 100644
--- a/translations/ko-KR/content/github/authenticating-to-github/connecting-with-third-party-applications.md
+++ b/translations/ko-KR/content/github/authenticating-to-github/connecting-with-third-party-applications.md
@@ -55,10 +55,10 @@ There are several types of data that applications can request.
| Type of data | 설명 |
| ----------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| Commit status | You can grant access for a third-party application to report your commit status. Commit status access allows applications to determine if a build is a successful against a specific commit. Applications won't have access to your code, but they can read and write status information against a specific commit. |
-| Deployments | Deployment status access allows applicationss to determine if a deployment is successful against a specific commit for public and private repositories. Applicationss won't have access to your code. |
+| Deployments | Deployment status access allows applications to determine if a deployment is successful against a specific commit for public and private repositories. Applications won't have access to your code. |
| Gists | [Gist](https://gist.github.com) access allows applications to read or write to both your public and secret Gists. |
| Hooks | [Webhooks](/webhooks) access allows applications to read or write hook configurations on repositories you manage. |
-| 알림(Notifications) | Notification access allows applicationss to read your {% data variables.product.product_name %} notifications, such as comments on issues and pull requests. However, applications remain unable to access anything in your repositories. |
+| 알림(Notifications) | Notification access allows applications to read your {% data variables.product.product_name %} notifications, such as comments on issues and pull requests. However, applications remain unable to access anything in your repositories. |
| Organizations and teams | Organization and teams access allows apps to access and manage organization and team membership. |
| Personal user data | User data includes information found in your user profile, like your name, e-mail address, and location. |
| Repositories | Repository information includes the names of contributors, the branches you've created, and the actual files within your repository. Applications can request access for either public or private repositories on a user-wide level. |
diff --git a/translations/ko-KR/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md b/translations/ko-KR/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
index 9f21b6e865..b19fc462f2 100644
--- a/translations/ko-KR/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
+++ b/translations/ko-KR/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
@@ -20,18 +20,26 @@ If you don't want to reenter your passphrase every time you use your SSH key, yo
{% data reusables.command_line.open_the_multi_os_terminal %}
2. Paste the text below, substituting in your {% data variables.product.product_name %} email address.
```shell
- $ ssh-keygen -t rsa -b 4096 -C "your_email@example.com"
+ $ ssh-keygen -t ed25519 -C "your_email@example.com"
```
+ {% note %}
+
+ **Note:** If you are using a legacy system that doesn't support the Ed25519 algorithm, use:
+ ```shell
+ $ ssh-keygen -t rsa -b 4096 -C "your_email@example.com"
+ ```
+
+ {% endnote %}
This creates a new ssh key, using the provided email as a label.
```shell
- > Generating public/private rsa key pair.
+ > Generating public/private ed25519 key pair.
```
3. When you're prompted to "Enter a file in which to save the key," press Enter. This accepts the default file location.
{% mac %}
```shell
- > Enter a file in which to save the key (/Users/you/.ssh/id_rsa): [Press enter]
+ > Enter a file in which to save the key (/Users/you/.ssh/id_ed25519): [Press enter]
```
{% endmac %}
@@ -39,7 +47,7 @@ If you don't want to reenter your passphrase every time you use your SSH key, yo
{% windows %}
```shell
- > Enter a file in which to save the key (/c/Users/you/.ssh/id_rsa):[Press enter]
+ > Enter a file in which to save the key (/c/Users/you/.ssh/id_ed25519):[Press enter]
```
{% endwindows %}
@@ -47,7 +55,7 @@ If you don't want to reenter your passphrase every time you use your SSH key, yo
{% linux %}
```shell
- > Enter a file in which to save the key (/home/you/.ssh/id_rsa): [Press enter]
+ > Enter a file in which to save the key (/home/you/.ssh/id_ed25519): [Press enter]
```
{% endlinux %}
@@ -81,18 +89,18 @@ Before adding a new SSH key to the ssh-agent to manage your keys, you should hav
$ touch ~/.ssh/config
```
- * Open your `~/.ssh/config` file, then modify the file, replacing `~/.ssh/id_rsa` if you are not using the default location and name for your `id_rsa` key.
+ * Open your `~/.ssh/config` file, then modify the file, replacing `~/.ssh/id_ed25519` if you are not using the default location and name for your `id_ed25519` key.
```
Host *
AddKeysToAgent yes
UseKeychain yes
- IdentityFile ~/.ssh/id_rsa
+ IdentityFile ~/.ssh/id_ed25519
```
3. Add your SSH private key to the ssh-agent and store your passphrase in the keychain. {% data reusables.ssh.add-ssh-key-to-ssh-agent %}
```shell
- $ ssh-add -K ~/.ssh/id_rsa
+ $ ssh-add -K ~/.ssh/id_ed25519
```
{% note %}
diff --git a/translations/ko-KR/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md b/translations/ko-KR/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md
index 7b05c49776..16e34b7c00 100644
--- a/translations/ko-KR/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md
+++ b/translations/ko-KR/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md
@@ -20,6 +20,7 @@ You can block a user in your account settings or from the user's profile. {% dat
When you block a user:
- The user stops following you
- The user stops watching and unpins your repositories
+- The user is not able to join any organizations you are an owner of
- The user's stars and issue assignments are removed from your repositories
- The user's forks of your repositories are deleted
- You delete any forks of the user's repositories
diff --git a/translations/ko-KR/content/github/building-a-strong-community/index.md b/translations/ko-KR/content/github/building-a-strong-community/index.md
index 9674f9f7e0..854d6d0950 100644
--- a/translations/ko-KR/content/github/building-a-strong-community/index.md
+++ b/translations/ko-KR/content/github/building-a-strong-community/index.md
@@ -37,6 +37,7 @@ versions:
{% link_in_list /managing-disruptive-comments %}
{% link_in_list /locking-conversations %}
{% link_in_list /limiting-interactions-in-your-repository %}
+ {% link_in_list /limiting-interactions-for-your-user-account %}
{% link_in_list /limiting-interactions-in-your-organization %}
{% link_in_list /tracking-changes-in-a-comment %}
{% link_in_list /managing-how-contributors-report-abuse-in-your-organizations-repository %}
diff --git a/translations/ko-KR/content/github/building-a-strong-community/limiting-interactions-for-your-user-account.md b/translations/ko-KR/content/github/building-a-strong-community/limiting-interactions-for-your-user-account.md
new file mode 100644
index 0000000000..fbd7c5f0dc
--- /dev/null
+++ b/translations/ko-KR/content/github/building-a-strong-community/limiting-interactions-for-your-user-account.md
@@ -0,0 +1,26 @@
+---
+title: Limiting interactions for your user account
+intro: 'You can temporarily enforce a period of limited activity for certain users in all public repositories owned by your user account.'
+versions:
+ free-pro-team: '*'
+permissions: Anyone can limit interactions for their own user account.
+---
+
+### About temporary interaction limits
+
+Limiting interactions for your user account enables temporary interaction limits for all public repositories owned by your user account. {% data reusables.community.interaction-limits-restrictions %}
+
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your public repositories.
+
+{% data reusables.community.types-of-interaction-limits %}
+
+When you enable user-wide activity limitations, you can't enable or disable interaction limits on individual repositories. For more information on limiting activity for an individual repository, see "[Limiting interactions in your repository](/articles/limiting-interactions-in-your-repository)."
+
+You can also block users. For more information, see "[Blocking a user from your personal account](/github/building-a-strong-community/blocking-a-user-from-your-personal-account)."
+
+### Limiting interactions for your user account
+
+{% data reusables.user_settings.access_settings %}
+1. In your user settings sidebar, under "Moderation settings", click **Interaction limits**. 
+{% data reusables.community.set-interaction-limit %}
+ 
\ No newline at end of file
diff --git a/translations/ko-KR/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md b/translations/ko-KR/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md
index 891168a936..926a70cc79 100644
--- a/translations/ko-KR/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md
+++ b/translations/ko-KR/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md
@@ -1,29 +1,37 @@
---
title: Limiting interactions in your organization
-intro: 'Organization owners can temporarily restrict certain users from commenting, opening issues, or creating pull requests in the organization''s public repositories to enforce a period of limited activity.'
+intro: 'You can temporarily enforce a period of limited activity for certain users in all public repositories owned by your organization.'
redirect_from:
- /github/setting-up-and-managing-organizations-and-teams/limiting-interactions-in-your-organization
- /articles/limiting-interactions-in-your-organization
versions:
free-pro-team: '*'
+permissions: Organization owners can limit interactions in an organization.
---
-After 24 hours, users can resume normal activity in your organization's public repositories. When you enable organization-wide activity limitations, you can't enable or disable interaction limits on individual repositories. For more information on per-repository activity limitation, see "[Limiting interactions in your repository](/articles/limiting-interactions-in-your-repository)."
+### About temporary interaction limits
-{% tip %}
+Limiting interactions in your organization enables temporary interaction limits for all public repositories owned by the organization. {% data reusables.community.interaction-limits-restrictions %}
-**Tip:** Organization owners can also block users for a specific amount of time. After the block expires, the user is automatically unblocked. For more information, see "[Blocking a user from your organization](/articles/blocking-a-user-from-your-organization)."
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your organization's public repositories.
-{% endtip %}
+{% data reusables.community.types-of-interaction-limits %}
+
+Members of the organization are not affected by any of the limit types.
+
+When you enable organization-wide activity limitations, you can't enable or disable interaction limits on individual repositories. For more information on limiting activity for an individual repository, see "[Limiting interactions in your repository](/articles/limiting-interactions-in-your-repository)."
+
+Organization owners can also block users for a specific amount of time. After the block expires, the user is automatically unblocked. For more information, see "[Blocking a user from your organization](/articles/blocking-a-user-from-your-organization)."
+
+### Limiting interactions in your organization
{% data reusables.profile.access_profile %}
{% data reusables.profile.access_org %}
{% data reusables.organizations.org_settings %}
-4. In your organization's Settings sidebar, click **Interaction limits**. 
-5. Under "Temporary interaction limits", click one or more options. 
- - **Limit to existing users**: Limits activity for organization users with accounts that are less than 24 hours old who do not have prior contributions and are not collaborators.
- - **Limit to prior contributors**: Limits activity for organization users who have not previously contributed and are not collaborators.
- - **Limit to repository collaborators**: Limits activity for organization users who do not have write access or are not collaborators.
+1. In the organization settings sidebar, click **Moderation settings**. 
+1. Under "Moderation settings", click **Interaction limits**. 
+{% data reusables.community.set-interaction-limit %}
+ 
### 더 읽을거리
- "[Reporting abuse or spam](/articles/reporting-abuse-or-spam)"
diff --git a/translations/ko-KR/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md b/translations/ko-KR/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md
index 0e1a12fbb4..8b6d850eb5 100644
--- a/translations/ko-KR/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md
+++ b/translations/ko-KR/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md
@@ -1,28 +1,32 @@
---
title: Limiting interactions in your repository
-intro: 'People with owner or admin access can temporarily restrict certain users from commenting, opening issues, or creating pull requests in your public repository to enforce a period of limited activity.'
+intro: 'You can temporarily enforce a period of limited activity for certain users on a public repository.'
redirect_from:
- /articles/limiting-interactions-with-your-repository/
- /articles/limiting-interactions-in-your-repository
versions:
free-pro-team: '*'
+permissions: People with admin permissions to a repository can temporarily limit interactions in that repository.
---
-After 24 hours, users can resume normal activity in your repository.
+### About temporary interaction limits
-{% tip %}
+{% data reusables.community.interaction-limits-restrictions %}
-**Tip:** Organization owners can enable organization-wide activity limitations. If organization-wide activity limitations are enabled, you can't limit activity for individual repositories. For more information, see "[Limiting interactions in your organization](/articles/limiting-interactions-in-your-organization)."
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your repository.
-{% endtip %}
+{% data reusables.community.types-of-interaction-limits %}
+
+You can also enable activity limitations on all repositories owned by your user account or an organization. If a user-wide or organization-wide limit is enabled, you can't limit activity for individual repositories owned by the account. For more information, see "[Limiting interactions for your user account](/github/building-a-strong-community/limiting-interactions-for-your-user-account)" and "[Limiting interactions in your organization](/github/building-a-strong-community/limiting-interactions-in-your-organization)."
+
+### Limiting interactions in your repository
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
-3. In your repository's Settings sidebar, click **Interaction limits**. 
-4. Under "Temporary interaction limits", click one or more options: 
- - **Limit to existing users**: Limits activity for users with accounts that are less than 24 hours old who do not have prior contributions and are not collaborators.
- - **Limit to prior contributors**: Limits activity for users who have not previously contributed and are not collaborators.
- - **Limit to repository collaborators**: Limits activity for users who do not have write access or are not collaborators.
+1. In the left sidebar, click **Moderation settings**. 
+1. Under "Moderation settings", click **Interaction limits**. 
+{% data reusables.community.set-interaction-limit %}
+ 
### 더 읽을거리
- "[Reporting abuse or spam](/articles/reporting-abuse-or-spam)"
diff --git a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md
index de058f89a0..231340acb5 100644
--- a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md
+++ b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md
@@ -38,6 +38,10 @@ You can view all of the reviews a pull request has received in the Conversation
{% data reusables.pull_requests.resolving-conversations %}
+### Re-requesting a review
+
+{% data reusables.pull_requests.re-request-review %}
+
### Required reviews
{% data reusables.pull_requests.required-reviews-for-prs-summary %}
diff --git a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md
index 6455fe8751..97745517b6 100644
--- a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md
+++ b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md
@@ -25,6 +25,10 @@ Each person who suggested a change included in the commit will be a co-author of
4. In the commit message field, type a short, meaningful commit message that describes the change you made to the file or files. 
5. Click **Commit changes.** 
+### Re-requesting a review
+
+{% data reusables.pull_requests.re-request-review %}
+
### Opening an issue for an out-of-scope suggestion
If someone suggests changes to your pull request and the changes are out of the pull request's scope, you can open a new issue to track the feedback. For more information, see "[Opening an issue from a comment](/github/managing-your-work-on-github/opening-an-issue-from-a-comment)."
diff --git a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md
index ce6b8f294c..2f82905ec6 100644
--- a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md
+++ b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md
@@ -43,6 +43,12 @@ If you decide you don't want the changes in a topic branch to be merged to the u
{% data reusables.files.choose-commit-email %}
+ {% note %}
+
+ **Note:** The email selector is not available for rebase merges, which do not create a merge commit, or for squash merges, which credit the user who created the pull request as the author of the squashed commit.
+
+ {% endnote %}
+
6. Click **Confirm merge**, **Confirm squash and merge**, or **Confirm rebase and merge**.
6. Optionally, [delete the branch](/articles/deleting-unused-branches). This keeps the list of branches in your repository tidy.
diff --git a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
index 68f9557fc2..affc3dd844 100644
--- a/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
+++ b/translations/ko-KR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
@@ -13,7 +13,7 @@ Before you can sync your fork with an upstream repository, you must [configure a
{% data reusables.command_line.open_the_multi_os_terminal %}
2. Change the current working directory to your local project.
-3. Fetch the branches and their respective commits from the upstream repository. Commits to `main` will be stored in a local branch, `upstream/main`.
+3. Fetch the branches and their respective commits from the upstream repository. Commits to `BRANCHNAME` will be stored in the local branch `upstream/BRANCHNAME`.
```shell
$ git fetch upstream
> remote: Counting objects: 75, done.
@@ -23,12 +23,12 @@ Before you can sync your fork with an upstream repository, you must [configure a
> From https://{% data variables.command_line.codeblock %}/ORIGINAL_OWNER/ORIGINAL_REPOSITORY
> * [new branch] main -> upstream/main
```
-4. Check out your fork's local `main` branch.
+4. Check out your fork's local default branch - in this case, we use `main`.
```shell
$ git checkout main
> Switched to branch 'main'
```
-5. Merge the changes from `upstream/main` into your local `main` branch. This brings your fork's `main` branch into sync with the upstream repository, without losing your local changes.
+5. Merge the changes from the upstream default branch - in this case, `upstream/main` - into your local default branch. This brings your fork's default branch into sync with the upstream repository, without losing your local changes.
```shell
$ git merge upstream/main
> Updating a422352..5fdff0f
diff --git a/translations/ko-KR/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md b/translations/ko-KR/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md
index 9b692c800f..bae90e2db4 100644
--- a/translations/ko-KR/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md
+++ b/translations/ko-KR/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md
@@ -61,7 +61,6 @@ You can use configuration keys supported by {% data variables.product.prodname_c
- `settings`
- `extensions`
- `forwardPorts`
-- `devPort`
- `postCreateCommand`
#### Docker, Dockerfile, or image settings
@@ -73,13 +72,9 @@ You can use configuration keys supported by {% data variables.product.prodname_c
- `remoteEnv`
- `containerUser`
- `remoteUser`
-- `updateRemoteUserUID`
- `mounts`
-- `workspaceMount`
-- `workspaceFolder`
- `runArgs`
- `overrideCommand`
-- `shutdownAction`
- `dockerComposeFile`
For more information about the available settings for `devcontainer.json`, see [devcontainer.json reference](https://aka.ms/vscode-remote/devcontainer.json) in the {% data variables.product.prodname_vscode %} documentation.
diff --git a/translations/ko-KR/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md b/translations/ko-KR/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md
index 559be22b2d..b91786592a 100644
--- a/translations/ko-KR/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md
+++ b/translations/ko-KR/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md
@@ -32,7 +32,7 @@ If none of these files are found, then any files or folders in `dotfiles` starti
Any changes to your `dotfiles` repository will apply only to each new codespace, and do not affect any existing codespace.
-For more information, see [Personalizing](https://docs.microsoft.com/en-us/visualstudio/online/reference/personalizing) in the {% data variables.product.prodname_vscode %} documentation.
+For more information, see [Personalizing](https://docs.microsoft.com/visualstudio/online/reference/personalizing) in the {% data variables.product.prodname_vscode %} documentation.
{% note %}
diff --git a/translations/ko-KR/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md b/translations/ko-KR/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md
index 2f4e8ad477..1ab7d68c82 100644
--- a/translations/ko-KR/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md
+++ b/translations/ko-KR/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md
@@ -32,14 +32,14 @@ Some open-source projects provide mirrors on {% data variables.product.prodname_
Here are a few prominent repositories that are mirrored on {% data variables.product.prodname_dotcom_the_website %}:
-- [android](https://github.com/android)
+- [Android Open Source Project](https://github.com/aosp-mirror)
- [The Apache Software Foundation](https://github.com/apache)
- [The Chromium Project](https://github.com/chromium)
-- [The Eclipse Foundation](https://github.com/eclipse)
+- [Eclipse Foundation](https://github.com/eclipse)
- [The FreeBSD Project](https://github.com/freebsd)
-- [The Glasgow Haskell Compiler](https://github.com/ghc)
+- [Glasgow Haskell Compiler](https://github.com/ghc)
- [GNOME](https://github.com/GNOME)
-- [The Linux kernel source tree](https://github.com/torvalds/linux)
+- [Linux kernel source tree](https://github.com/torvalds/linux)
- [Qt](https://github.com/qt)
To set up your own mirror, you can configure [a post-receive hook](https://git-scm.com/book/en/Customizing-Git-Git-Hooks) on your official project repository to automatically push commits to a mirror repository on {% data variables.product.product_name %}.
diff --git a/translations/ko-KR/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md b/translations/ko-KR/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md
index 282cd39579..259e8566da 100644
--- a/translations/ko-KR/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md
+++ b/translations/ko-KR/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md
@@ -13,7 +13,7 @@ versions:
You can request a 45-day trial to evaluate {% data variables.product.prodname_ghe_server %}. Your trial will be installed as a virtual appliance, with options for on-premises or cloud deployment. For a list of supported visualization platforms, see "[Setting up a GitHub Enterprise Server instance](/enterprise/admin/installation/setting-up-a-github-enterprise-server-instance)."
-{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}Security{% endif %} alerts and {% data variables.product.prodname_github_connect %} are not currently available in trials of {% data variables.product.prodname_ghe_server %}. For a demonstration of these features, contact {% data variables.contact.contact_enterprise_sales %}. For more information about these features, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[Connecting {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_dotcom_the_website %}](/enterprise/admin/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)."
+{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}Security{% endif %} alerts and {% data variables.product.prodname_github_connect %} are not currently available in trials of {% data variables.product.prodname_ghe_server %}. For a demonstration of these features, contact {% data variables.contact.contact_enterprise_sales %}. For more information about these features, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[Connecting {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_dotcom_the_website %}](/enterprise/admin/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)."
Trials are also available for {% data variables.product.prodname_ghe_cloud %}. For more information, see "[Setting up a trial of {% data variables.product.prodname_ghe_cloud %}](/articles/setting-up-a-trial-of-github-enterprise-cloud)."
diff --git a/translations/ko-KR/content/github/managing-large-files/removing-files-from-a-repositorys-history.md b/translations/ko-KR/content/github/managing-large-files/removing-files-from-a-repositorys-history.md
index 16cf70a104..e0b980ab1f 100644
--- a/translations/ko-KR/content/github/managing-large-files/removing-files-from-a-repositorys-history.md
+++ b/translations/ko-KR/content/github/managing-large-files/removing-files-from-a-repositorys-history.md
@@ -16,10 +16,6 @@ versions:
{% endwarning %}
-### Removing a file that was added in an earlier commit
-
-If you added a file in an earlier commit, you need to remove it from the repository's history. To remove files from the repository's history, you can use the BFG Repo-Cleaner or the `git filter-branch` command. For more information see "[Removing sensitive data from a repository](/github/authenticating-to-github/removing-sensitive-data-from-a-repository)."
-
### Removing a file added in the most recent unpushed commit
If the file was added with your most recent commit, and you have not pushed to {% data variables.product.product_location %}, you can delete the file and amend the commit:
@@ -43,3 +39,7 @@ If the file was added with your most recent commit, and you have not pushed to {
$ git push
# Push our rewritten, smaller commit
```
+
+### Removing a file that was added in an earlier commit
+
+If you added a file in an earlier commit, you need to remove it from the repository's history. To remove files from the repository's history, you can use the BFG Repo-Cleaner or the `git filter-branch` command. For more information see "[Removing sensitive data from a repository](/github/authenticating-to-github/removing-sensitive-data-from-a-repository)."
diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md
index 2662e62cc8..6f58c5039d 100644
--- a/translations/ko-KR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md
+++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md
@@ -17,7 +17,7 @@ When your code depends on a package that has a security vulnerability, this vuln
### Detection of vulnerable dependencies
- {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %} detects vulnerable dependencies and sends {% data variables.product.prodname_dependabot_short %} alerts{% else %}{% data variables.product.product_name %} detects vulnerable dependencies and sends security alerts{% endif %} when:
+ {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %} detects vulnerable dependencies and sends {% data variables.product.prodname_dependabot_alerts %}{% else %}{% data variables.product.product_name %} detects vulnerable dependencies and sends security alerts{% endif %} when:
{% if currentVersion == "free-pro-team@latest" %}
- A new vulnerability is added to the {% data variables.product.prodname_advisory_database %}. For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)."
@@ -50,12 +50,12 @@ You can also enable or disable {% data variables.product.prodname_dependabot_ale
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
When
-{% data variables.product.product_name %} identifies a vulnerable dependency, we generate a {% data variables.product.prodname_dependabot_short %} alert and display it on the Security tab for the repository. The alert includes a link to the affected file in the project, and information about a fixed version. {% data variables.product.product_name %} also notifies the maintainers of affected repositories about the new alert according to their notification preferences. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."
+{% data variables.product.product_name %} identifies a vulnerable dependency, we generate a {% data variables.product.prodname_dependabot %} alert and display it on the Security tab for the repository. The alert includes a link to the affected file in the project, and information about a fixed version. {% data variables.product.product_name %} also notifies the maintainers of affected repositories about the new alert according to their notification preferences. For more information, see "[Configuring notifications for vulnerable dependencies](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies)."
{% endif %}
{% if currentVersion == "free-pro-team@latest" %}
For repositories where
-{% data variables.product.prodname_dependabot_security_updates %} are enabled, the alert may also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."
+{% data variables.product.prodname_dependabot_security_updates %} are enabled, the alert may also contain a link to a pull request to update the manifest or lock file to the minimum version that resolves the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
{% endif %}
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %}
@@ -69,13 +69,13 @@ When
{% endwarning %}
-### Access to {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts
+### Access to {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts
You can see all of the alerts that affect a particular project{% if currentVersion == "free-pro-team@latest" %} on the repository's Security tab or{% endif %} in the repository's dependency graph.{% if currentVersion == "free-pro-team@latest" %} For more information, see "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)."{% endif %}
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
By default, we notify people with admin permissions in the affected repositories about new
-{% data variables.product.prodname_dependabot_short %} alerts.{% endif %} {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. You can also make {% data variables.product.prodname_dependabot_short %} alerts visible to additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts)."
+{% data variables.product.prodname_dependabot_alerts %}.{% endif %} {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.product_name %} never publicly discloses identified vulnerabilities for any repository. You can also make {% data variables.product.prodname_dependabot_alerts %} visible to additional people or teams working repositories that you own or have admin permissions for. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-dependabot-alerts)."
{% endif %}
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %}
@@ -88,6 +88,6 @@ We send security alerts to people with admin permissions in the affected reposit
{% if currentVersion == "free-pro-team@latest" %}
### 더 읽을거리
-- "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)"
+- "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)"
- "[Viewing and updating vulnerable dependencies in your repository](/articles/viewing-and-updating-vulnerable-dependencies-in-your-repository)"
- "[Understanding how {% data variables.product.product_name %} uses and protects your data](/categories/understanding-how-github-uses-and-protects-your-data)"{% endif %}
diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/about-dependabot-security-updates.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/about-dependabot-security-updates.md
new file mode 100644
index 0000000000..c242a0d8b6
--- /dev/null
+++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/about-dependabot-security-updates.md
@@ -0,0 +1,35 @@
+---
+title: About Dependabot security updates
+intro: '{% data variables.product.prodname_dependabot %} can fix vulnerable dependencies for you by raising pull requests with security updates.'
+shortTitle: About Dependabot security updates
+redirect_from:
+ - /github/managing-security-vulnerabilities/about-github-dependabot-security-updates
+versions:
+ free-pro-team: '*'
+---
+
+### About {% data variables.product.prodname_dependabot_security_updates %}
+
+{% data variables.product.prodname_dependabot_security_updates %} make it easier for you to fix vulnerable dependencies in your repository. If you enable this feature, when a {% data variables.product.prodname_dependabot %} alert is raised for a vulnerable dependency in the dependency graph of your repository, {% data variables.product.prodname_dependabot %} automatically tries to fix it. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)."
+
+{% data variables.product.prodname_dependabot %} checks whether it's possible to upgrade the vulnerable dependency to a fixed version without disrupting the dependency graph for the repository. Then {% data variables.product.prodname_dependabot %} raises a pull request to update the dependency to the minimum version that includes the patch and links the pull request to the {% data variables.product.prodname_dependabot %} alert, or reports an error on the alert. For more information, see "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)."
+
+{% note %}
+
+**참고**
+
+The {% data variables.product.prodname_dependabot_security_updates %} feature is available for repositories where you have enabled the dependency graph and {% data variables.product.prodname_dependabot_alerts %}. You will see a {% data variables.product.prodname_dependabot %} alert for every vulnerable dependency identified in your full dependency graph. However, security updates are triggered only for dependencies that are specified in a manifest or lock file. {% data variables.product.prodname_dependabot %} is unable to update an indirect or transitive dependency that is not explicitly defined. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#dependencies-included)."
+
+{% endnote %}
+
+### About pull requests for security updates
+
+Each pull request contains everything you need to quickly and safely review and merge a proposed fix into your project. This includes information about the vulnerability like release notes, changelog entries, and commit details. Details of which vulnerability a pull request resolves are hidden from anyone who does not have access to {% data variables.product.prodname_dependabot_alerts %} for the repository.
+
+When you merge a pull request that contains a security update, the corresponding {% data variables.product.prodname_dependabot %} alert is marked as resolved for your repository. For more information about {% data variables.product.prodname_dependabot %} pull requests, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates)."
+
+{% data reusables.dependabot.automated-tests-note %}
+
+### About compatibility scores
+
+{% data variables.product.prodname_dependabot_security_updates %} may include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. These are calculated from CI tests in other public repositories where the same security update has been generated. An update's compatibility score is the percentage of CI runs that passed when updating between specific versions of the dependency.
diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-dependabot-security-updates.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-dependabot-security-updates.md
new file mode 100644
index 0000000000..035e314e87
--- /dev/null
+++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-dependabot-security-updates.md
@@ -0,0 +1,60 @@
+---
+title: Configuring Dependabot security updates
+intro: 'You can use {% data variables.product.prodname_dependabot_security_updates %} or manual pull requests to easily update vulnerable dependencies.'
+shortTitle: Configuring Dependabot security updates
+redirect_from:
+ - /articles/configuring-automated-security-fixes
+ - /github/managing-security-vulnerabilities/configuring-automated-security-fixes
+ - /github/managing-security-vulnerabilities/configuring-automated-security-updates
+ - /github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates
+versions:
+ free-pro-team: '*'
+---
+
+### About configuring {% data variables.product.prodname_dependabot_security_updates %}
+
+You can enable {% data variables.product.prodname_dependabot_security_updates %} for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
+
+You can disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository or for all repositories owned by your user account or organization. For more information, see "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories](#managing-dependabot-security-updates-for-your-repositories)" below.
+
+{% data reusables.dependabot.dependabot-tos %}
+
+### Supported repositories
+
+{% data variables.product.prodname_dotcom %} automatically enables {% data variables.product.prodname_dependabot_security_updates %} for every repository that meets these prerequisites.
+
+{% note %}
+
+**Note**: You can manually enable {% data variables.product.prodname_dependabot_security_updates %}, even if the repository doesn't meet some of the prerequisites below. For example, you can enable {% data variables.product.prodname_dependabot_security_updates %} on a fork, or for a package manager that isn't directly supported by following the instructions in "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories](#managing-dependabot-security-updates-for-your-repositories)."
+
+{% endnote %}
+
+| Automatic enablement prerequisite | More information |
+| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Repository is not a fork | "[About forks](/github/collaborating-with-issues-and-pull-requests/about-forks)" |
+| Repository is not archived | "[Archiving repositories](/github/creating-cloning-and-archiving-repositories/archiving-repositories)" |
+| Repository is public, or repository is private and you have enabled read-only analysis by {% data variables.product.prodname_dotcom %}, dependency graph, and vulnerability alerts in the repository's settings | "[Managing data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)." |
+| Repository contains dependency manifest file from a package ecosystem that {% data variables.product.prodname_dotcom %} supports | "[Supported package ecosystems](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)" |
+| {% data variables.product.prodname_dependabot_security_updates %} are not disabled for the repository | "[Managing {% data variables.product.prodname_dependabot_security_updates %} for your repository](#managing-dependabot-security-updates-for-your-repositories)" |
+| Repository is not already using an integration for dependency management | "[About integrations](/github/customizing-your-github-workflow/about-integrations)" |
+
+If security updates are not enabled for your repository and you don't know why, first try enabling them using the instructions given in the procedural sections below. If security updates are still not working, you can [contact support](https://support.github.com/contact).
+
+### Managing {% data variables.product.prodname_dependabot_security_updates %} for your repositories
+
+You can enable or disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository.
+
+You can also enable or disable {% data variables.product.prodname_dependabot_security_updates %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)."
+
+{% data variables.product.prodname_dependabot_security_updates %} require specific repository settings. For more information, see "[Supported repositories](#supported-repositories)."
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-security %}
+{% data reusables.repositories.sidebar-dependabot-alerts %}
+1. Above the list of alerts, use the drop-down menu and select or unselect **{% data variables.product.prodname_dependabot %} security updates**. 
+
+### 더 읽을거리
+
+- "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)"
+- "[Managing data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)"
+- "[Supported package ecosystems](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)"
diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md
index fc90d15560..2dc007d65a 100644
--- a/translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md
+++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md
@@ -1,7 +1,7 @@
---
title: Configuring notifications for vulnerable dependencies
shortTitle: Configuring notifications
-intro: 'Optimize how you receive notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts.'
+intro: 'Optimize how you receive notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts.'
versions:
free-pro-team: '*'
enterprise-server: '>=2.21'
@@ -9,10 +9,10 @@ versions:
### About notifications for vulnerable dependencies
-{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we generate a {% data variables.product.prodname_dependabot_short %} alert and display it on the Security tab for the repository. {% data variables.product.product_name %} notifies the maintainers of affected repositories about the new alert according to their notification preferences.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot_short %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability.
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we generate a {% data variables.product.prodname_dependabot %} alert and display it on the Security tab for the repository. {% data variables.product.product_name %} notifies the maintainers of affected repositories about the new alert according to their notification preferences.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability.
{% endif %}
-{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_short %} alerts for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)."
+{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)."
{% endif %}
{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.21" %}
@@ -23,7 +23,7 @@ Your site administrator needs to enable security alerts for vulnerable dependenc
By default, if your site administrator has configured email for notifications on your enterprise, you will receive
{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} by email.{% endif %}
-{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
+{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
@@ -35,14 +35,14 @@ You can configure notification settings for yourself or your organization from t
{% data reusables.notifications.vulnerable-dependency-notification-options %}
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
- 
+ 
{% else %}

{% endif %}
{% note %}
-**Note:** You can filter your {% data variables.product.company_short %} inbox notifications to show {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. For more information, see "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)."
+**Note:** You can filter your {% data variables.product.company_short %} inbox notifications to show {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %} security{% endif %} alerts. For more information, see "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)."
{% endnote %}
diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/index.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/index.md
index 61c09009e1..819e4c4e24 100644
--- a/translations/ko-KR/content/github/managing-security-vulnerabilities/index.md
+++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/index.md
@@ -30,9 +30,9 @@ versions:
{% link_in_list /about-alerts-for-vulnerable-dependencies %}
{% link_in_list /configuring-notifications-for-vulnerable-dependencies %}
- {% link_in_list /about-github-dependabot-security-updates %}
- {% link_in_list /configuring-github-dependabot-security-updates %}
+ {% link_in_list /about-dependabot-security-updates %}
+ {% link_in_list /configuring-dependabot-security-updates %}
{% link_in_list /viewing-and-updating-vulnerable-dependencies-in-your-repository %}
{% link_in_list /troubleshooting-the-detection-of-vulnerable-dependencies %}
- {% link_in_list /troubleshooting-github-dependabot-errors %}
+ {% link_in_list /troubleshooting-dependabot-errors %}
diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors.md
new file mode 100644
index 0000000000..c33aa46aba
--- /dev/null
+++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors.md
@@ -0,0 +1,84 @@
+---
+title: Troubleshooting Dependabot errors
+intro: 'Sometimes {% data variables.product.prodname_dependabot %} is unable to raise a pull request to update your dependencies. You can review the error and unblock {% data variables.product.prodname_dependabot %}.'
+shortTitle: Troubleshooting errors
+redirect_from:
+ - /github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.dependabot.beta-note %}
+
+### About {% data variables.product.prodname_dependabot %} errors
+
+{% data reusables.dependabot.pull-request-introduction %}
+
+If anything prevents {% data variables.product.prodname_dependabot %} from raising a pull request, this is reported as an error.
+
+### Investigating errors with {% data variables.product.prodname_dependabot_security_updates %}
+
+When {% data variables.product.prodname_dependabot %} is blocked from creating a pull request to fix a {% data variables.product.prodname_dependabot %} alert, it posts the error message on the alert. The {% data variables.product.prodname_dependabot_alerts %} view shows a list of any alerts that have not been resolved yet. To access the alerts view, click **{% data variables.product.prodname_dependabot_alerts %}** on the **Security** tab for the repository. Where a pull request that will fix the vulnerable dependency has been generated, the alert includes a link to that pull request.
+
+
+
+There are three reasons why an alert may have no pull request link:
+
+1. {% data variables.product.prodname_dependabot_security_updates %} are not enabled for the repository.
+1. The alert is for an indirect or transitive dependency that is not explicitly defined in a lock file.
+1. An error blocked {% data variables.product.prodname_dependabot %} from creating a pull request.
+
+If an error blocked {% data variables.product.prodname_dependabot %} from creating a pull request, you can display details of the error by clicking the alert.
+
+
+
+### Investigating errors with {% data variables.product.prodname_dependabot_version_updates %}
+
+When {% data variables.product.prodname_dependabot %} is blocked from creating a pull request to update a dependency in an ecosystem, it posts the error icon on the manifest file. The manifest files that are managed by {% data variables.product.prodname_dependabot %} are listed on the {% data variables.product.prodname_dependabot %} tab. To access this tab, on the **Insights** tab for the repository click **Dependency graph**, and then click the **{% data variables.product.prodname_dependabot %}** tab.
+
+
+
+To see the log file for any manifest file, click the **Last checked TIME ago** link. When you display the log file for a manifest that's shown with an error symbol (for example, Maven in the screenshot above), any errors are also displayed.
+
+
+
+### Understanding {% data variables.product.prodname_dependabot %} errors
+
+Pull requests for security updates act to upgrade a vulnerable dependency to the minimum version that includes a fix for the vulnerability. In contrast, pull requests for version updates act to upgrade a dependency to the latest version allowed by the package manifest and {% data variables.product.prodname_dependabot %} configuration files. Consequently, some errors are specific to one type of update.
+
+#### {% data variables.product.prodname_dependabot %} cannot update DEPENDENCY to a non-vulnerable version
+
+**Security updates only.** {% data variables.product.prodname_dependabot %} cannot create a pull request to update the vulnerable dependency to a secure version without breaking other dependencies in the dependency graph for this repository.
+
+Every application that has dependencies has a dependency graph, that is, a directed acyclic graph of every package version that the application directly or indirectly depends on. Every time a dependency is updated, this graph must resolve otherwise the application won't build. When an ecosystem has a deep and complex dependency graph, for example, npm and RubyGems, it is often impossible to upgrade a single dependency without upgrading the whole ecosystem.
+
+The best way to avoid this problem is to stay up to date with the most recently released versions, for example, by enabling version updates. This increases the likelihood that a vulnerability in one dependency can be resolved by a simple upgrade that doesn't break the dependency graph. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)."
+
+#### {% data variables.product.prodname_dependabot %} cannot update to the required version as there is already an open pull request for the latest version
+
+**Security updates only.** {% data variables.product.prodname_dependabot %} will not create a pull request to update the vulnerable dependency to a secure version because there is already an open pull request to update this dependency. You will see this error when a vulnerability is detected in a single dependency and there's already an open pull request to update the dependency to the latest version.
+
+There are two options: you can review the open pull request and merge it as soon as you are confident that the change is safe, or close that pull request and trigger a new security update pull request. For more information, see "[Triggering a {% data variables.product.prodname_dependabot %} pull request manually](#triggering-a-dependabot-pull-request-manually)."
+
+#### {% data variables.product.prodname_dependabot %} timed out during its update
+
+{% data variables.product.prodname_dependabot %} took longer than the maximum time allowed to assess the update required and prepare a pull request. This error is usually seen only for large repositories with many manifest files, for example, npm or yarn monorepo projects with hundreds of *package.json* files. Updates to the Composer ecosystem also take longer to assess and may time out.
+
+This error is difficult to address. If a version update times out, you could specify the most important dependencies to update using the `allow` parameter or, alternatively, use the `ignore` parameter to exclude some dependencies from updates. Updating your configuration might allow {% data variables.product.prodname_dependabot %} to review the version update and generate the pull request in the time available.
+
+If a security update times out, you can reduce the chances of this happening by keeping the dependencies updated, for example, by enabling version updates. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)."
+
+#### {% data variables.product.prodname_dependabot %} cannot open any more pull requests
+
+There's a limit on the number of open pull requests {% data variables.product.prodname_dependabot %} will generate. When this limit is reached, no new pull requests are opened and this error is reported. The best way to resolve this error is to review and merge some of the open pull requests.
+
+There are separate limits for security and version update pull requests, so that open version update pull requests cannot block the creation of a security update pull request. The limit for security update pull requests is 10. By default, the limit for version updates is 5 but you can change this using the `open-pull-requests-limit` parameter in the configuration file. For more information, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates#open-pull-requests-limit)."
+
+The best way to resolve this error is to merge or close some of the existing pull requests and trigger a new pull request manually. For more information, see "[Triggering a {% data variables.product.prodname_dependabot %} pull request manually](#triggering-a-dependabot-pull-request-manually)."
+
+### Triggering a {% data variables.product.prodname_dependabot %} pull request manually
+
+If you unblock {% data variables.product.prodname_dependabot %}, you can manually trigger a fresh attempt to create a pull request.
+
+- **Security updates**—display the {% data variables.product.prodname_dependabot %} alert that shows the error you have fixed and click **Create {% data variables.product.prodname_dependabot %} security update**.
+- **Version updates**—display the log file for the manifest that shows the error that you have fixed and click **Check for updates**.
diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md
index 2ca896617a..b9c4b678df 100644
--- a/translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md
+++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md
@@ -14,14 +14,14 @@ The results of dependency detection reported by {% data variables.product.produc
* {% data variables.product.prodname_advisory_database %} is one of the data sources that {% data variables.product.prodname_dotcom %} uses to identify vulnerable dependencies. It's a free, curated database of vulnerability information for common package ecosystems on {% data variables.product.prodname_dotcom %}. It includes both data reported directly to {% data variables.product.prodname_dotcom %} from {% data variables.product.prodname_security_advisories %}, as well as official feeds and community sources. This data is reviewed and curated by {% data variables.product.prodname_dotcom %} to ensure that false or unactionable information is not shared with the development community. For more information, see "[Browsing security vulnerabilities in the {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)" and "[About {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)."
* The dependency graph parses all known package manifest files in a user’s repository. For example, for npm it will parse the _package-lock.json_ file. It constructs a graph of all of the repository’s dependencies and public dependents. This happens when you enable the dependency graph and when anyone pushes to the default branch, and it includes commits that makes changes to a supported manifest format. For more information, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)."
-* {% data variables.product.prodname_dependabot_short %} scans any push, to the default branch, that contains a manifest file. When a new vulnerability record is added, it scans all existing repositories and generates an alert for each vulnerable repository. {% data variables.product.prodname_dependabot_short %} alerts are aggregated at the repository level, rather than creating one alert per vulnerability. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)."
-* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot_short %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)."
+* {% data variables.product.prodname_dependabot %} scans any push, to the default branch, that contains a manifest file. When a new vulnerability record is added, it scans all existing repositories and generates an alert for each vulnerable repository. {% data variables.product.prodname_dependabot_alerts %} are aggregated at the repository level, rather than creating one alert per vulnerability. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)."
+* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)."
- {% data variables.product.prodname_dependabot_short %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database.
+ {% data variables.product.prodname_dependabot %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. For example, a scan is triggered when a new dependency is added ({% data variables.product.prodname_dotcom %} checks for this on every push), or when a new vulnerability is discovered and added to the advisory database.
### Why don't I get vulnerability alerts for some ecosystems?
-{% data variables.product.prodname_dotcom %} limits its support for vulnerability alerts to a set of ecosystems where we can provide high-quality, actionable data. Curated vulnerabilities in the {% data variables.product.prodname_advisory_database %}, the dependency graph, {% data variables.product.prodname_dependabot_short %} alerts, and {% data variables.product.prodname_dependabot_short %} security updates are provided for several ecosystems, including Java’s Maven, JavaScript’s npm and Yarn, .NET’s NuGet, Python’s pip, Ruby's RubyGems, and PHP’s Composer. We'll continue to add support for more ecosystems over time. For an overview of the package ecosystems that we support, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)."
+{% data variables.product.prodname_dotcom %} limits its support for vulnerability alerts to a set of ecosystems where we can provide high-quality, actionable data. Curated vulnerabilities in the {% data variables.product.prodname_advisory_database %}, the dependency graph, {% data variables.product.prodname_dependabot_alerts %}, and {% data variables.product.prodname_dependabot %} security updates are provided for several ecosystems, including Java’s Maven, JavaScript’s npm and Yarn, .NET’s NuGet, Python’s pip, Ruby's RubyGems, and PHP’s Composer. We'll continue to add support for more ecosystems over time. For an overview of the package ecosystems that we support, see "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)."
It's worth noting that [{% data variables.product.prodname_dotcom %} Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories) may exist for other ecosystems. The information in a security advisory is provided by the maintainers of a particular repository. This data is not curated in the same way as information for the supported ecosystems.
@@ -31,7 +31,7 @@ It's worth noting that [{% data variables.product.prodname_dotcom %} Security Ad
The dependency graph includes information on dependencies that are explicitly declared in your environment. That is, dependencies that are specified in a manifest or a lockfile. The dependency graph generally also includes transitive dependencies, even when they aren't specified in a lockfile, by looking at the dependencies of the dependencies in a manifest file.
-{% data variables.product.prodname_dependabot_short %} alerts advise you about dependencies you should update, including transitive dependencies, where the version can be determined from a manifest or a lockfile. {% data variables.product.prodname_dependabot_short %} security updates only suggests a change where it can directly "fix" the dependency, that is, when these are:
+{% data variables.product.prodname_dependabot_alerts %} advise you about dependencies you should update, including transitive dependencies, where the version can be determined from a manifest or a lockfile. {% data variables.product.prodname_dependabot %} security updates only suggests a change where it can directly "fix" the dependency, that is, when these are:
* Direct dependencies explicitly declared in a manifest or lockfile
* Transitive dependencies declared in a lockfile
@@ -51,21 +51,21 @@ Yes, the dependency graph has two categories of limits:
1. **Processing limits**
- These affect the dependency graph displayed within {% data variables.product.prodname_dotcom %} and also prevent {% data variables.product.prodname_dependabot_short %} alerts being created.
+ These affect the dependency graph displayed within {% data variables.product.prodname_dotcom %} and also prevent {% data variables.product.prodname_dependabot_alerts %} being created.
- Manifests over 0.5 MB in size are only processed for enterprise accounts. For other accounts, manifests over 0.5 MB are ignored and will not create {% data variables.product.prodname_dependabot_short %} alerts.
+ Manifests over 0.5 MB in size are only processed for enterprise accounts. For other accounts, manifests over 0.5 MB are ignored and will not create {% data variables.product.prodname_dependabot_alerts %}.
- By default, {% data variables.product.prodname_dotcom %} will not process more than 20 manifests per repository. {% data variables.product.prodname_dependabot_short %} alerts are not be created for manifests beyond this limit. If you need to increase the limit, contact {% data variables.contact.contact_support %}.
+ By default, {% data variables.product.prodname_dotcom %} will not process more than 20 manifests per repository. {% data variables.product.prodname_dependabot_alerts %} are not be created for manifests beyond this limit. If you need to increase the limit, contact {% data variables.contact.contact_support %}.
2. **Visualization limits**
- These affect what's displayed in the dependency graph within {% data variables.product.prodname_dotcom %}. However, they don't affect the {% data variables.product.prodname_dependabot_short %} alerts that are created.
+ These affect what's displayed in the dependency graph within {% data variables.product.prodname_dotcom %}. However, they don't affect the {% data variables.product.prodname_dependabot_alerts %} that are created.
- The Dependencies view of the dependency graph for a repository only displays 100 manifests. Typically this is adequate as it is significantly higher than the processing limit described above. In situations where the processing limit is over 100, {% data variables.product.prodname_dependabot_short %} alerts are still created for any manifests that are not shown within {% data variables.product.prodname_dotcom %}.
+ The Dependencies view of the dependency graph for a repository only displays 100 manifests. Typically this is adequate as it is significantly higher than the processing limit described above. In situations where the processing limit is over 100, {% data variables.product.prodname_dependabot_alerts %} are still created for any manifests that are not shown within {% data variables.product.prodname_dotcom %}.
**Check**: Is the missing dependency in a manifest file that's over 0.5 MB, or in a repository with a large number of manifests?
-### Does {% data variables.product.prodname_dependabot_short %} generate alerts for vulnerabilities that have been known for many years?
+### Does {% data variables.product.prodname_dependabot %} generate alerts for vulnerabilities that have been known for many years?
The {% data variables.product.prodname_advisory_database %} was launched in November 2019, and initially back-filled to include vulnerability information for the supported ecosystems, starting from 2017. When adding CVEs to the database, we prioritize curating newer CVEs, and CVEs affecting newer versions of software.
@@ -77,19 +77,19 @@ Some information on older vulnerabilities is available, especially where these C
Some third-party tools use uncurated CVE data that isn't checked or filtered by a human. This means that CVEs with tagging or severity errors, or other quality issues, will cause more frequent, more noisy, and less useful alerts.
-Since {% data variables.product.prodname_dependabot_short %} uses curated data in the {% data variables.product.prodname_advisory_database %}, the volume of alerts may be lower, but the alerts you do receive will be accurate and relevant.
+Since {% data variables.product.prodname_dependabot %} uses curated data in the {% data variables.product.prodname_advisory_database %}, the volume of alerts may be lower, but the alerts you do receive will be accurate and relevant.
### Does each dependency vulnerability generate a separate alert?
When a dependency has multiple vulnerabilities, only one aggregated alert is generated for that dependency, instead of one alert per vulnerability.
-The {% data variables.product.prodname_dependabot_short %} alerts count in {% data variables.product.prodname_dotcom %} shows a total for the number of alerts, that is, the number of dependencies with vulnerabilities, not the number of vulnerabilities.
+The {% data variables.product.prodname_dependabot_alerts %} count in {% data variables.product.prodname_dotcom %} shows a total for the number of alerts, that is, the number of dependencies with vulnerabilities, not the number of vulnerabilities.
-
+
When you click to display the alert details, you can see how many vulnerabilities are included in the alert.
-
+
**Check**: If there is a discrepancy in the totals you are seeing, check that you are not comparing alert numbers with vulnerability numbers.
@@ -98,4 +98,4 @@ When you click to display the alert details, you can see how many vulnerabilitie
- "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)"
- "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)"
- "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)"
-- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)"
+- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)"
diff --git a/translations/ko-KR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/translations/ko-KR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
index 8ec482d88a..78e10421af 100644
--- a/translations/ko-KR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
+++ b/translations/ko-KR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
@@ -11,11 +11,11 @@ versions:
Your repository's {% data variables.product.prodname_dependabot %} alerts tab lists all open and closed {% data variables.product.prodname_dependabot_alerts %} and corresponding {% data variables.product.prodname_dependabot_security_updates %}. You can sort the list of alerts using the drop-down menu, and you can click into specific alerts for more details. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)."
-You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."
+You can enable automatic security updates for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
### About updates for vulnerable dependencies in your repository
-{% data variables.product.product_name %} generates {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency {% data variables.product.prodname_dependabot_short %} creates a pull request to fix it. The pull request will upgrade the dependency to the minimum possible secure version needed to avoid the vulnerability.
+{% data variables.product.product_name %} generates {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. For repositories where {% data variables.product.prodname_dependabot_security_updates %} are enabled, when {% data variables.product.product_name %} detects a vulnerable dependency {% data variables.product.prodname_dependabot %} creates a pull request to fix it. The pull request will upgrade the dependency to the minimum possible secure version needed to avoid the vulnerability.
### Viewing and updating vulnerable dependencies
@@ -24,14 +24,14 @@ You can enable automatic security updates for any repository that uses {% data v
{% data reusables.repositories.sidebar-dependabot-alerts %}
1. Click the alert you'd like to view. 
1. Review the details of the vulnerability and, if available, the pull request containing the automated security update.
-1. Optionally, if there isn't already a {% data variables.product.prodname_dependabot_security_updates %} update for the alert, to create a pull request to resolve the vulnerability, click **Create {% data variables.product.prodname_dependabot_short %} security update**. 
-1. When you're ready to update your dependency and resolve the vulnerability, merge the pull request. Each pull request raised by {% data variables.product.prodname_dependabot_short %} includes information on commands you can use to control {% data variables.product.prodname_dependabot_short %}. For more information, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates#managing-github-dependabot-pull-requests-with-comment-commands)."
+1. Optionally, if there isn't already a {% data variables.product.prodname_dependabot_security_updates %} update for the alert, to create a pull request to resolve the vulnerability, click **Create {% data variables.product.prodname_dependabot %} security update**. 
+1. When you're ready to update your dependency and resolve the vulnerability, merge the pull request. Each pull request raised by {% data variables.product.prodname_dependabot %} includes information on commands you can use to control {% data variables.product.prodname_dependabot %}. For more information, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates#managing-dependabot-pull-requests-with-comment-commands)."
1. Optionally, if the alert is being fixed, if it's incorrect, or located in unused code, use the "Dismiss" drop-down, and click a reason for dismissing the alert. 
### 더 읽을거리
- "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)"
-- "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)"
+- "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)"
- "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)"
- "[Troubleshooting the detection of vulnerable dependencies](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)"
-- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)"
+- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)"
diff --git a/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md b/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md
index 8400944715..4a9b49d8a6 100644
--- a/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md
+++ b/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md
@@ -122,7 +122,7 @@ Email notifications from {% data variables.product.product_name %} contain the f
3. On the notifications settings page, choose how you receive notifications when:
- There are updates in repositories or team discussions you're watching or in a conversation you're participating in. For more information, see "[About participating and watching notifications](#about-participating-and-watching-notifications)."
- You gain access to a new repository or you've joined a new team. For more information, see "[Automatic watching](#automatic-watching)."{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
- - There are new {% data variables.product.prodname_dependabot_alerts %} in your repository. For more information, see "[{% data variables.product.prodname_dependabot_alerts %} notification options](#github-dependabot-alerts-notification-options)." {% endif %}{% if currentVersion == "enterprise-server@2.21" %}
+ - There are new {% data variables.product.prodname_dependabot_alerts %} in your repository. For more information, see "[{% data variables.product.prodname_dependabot_alerts %} notification options](#dependabot-alerts-notification-options)." {% endif %}{% if currentVersion == "enterprise-server@2.21" %}
- There are new security alerts in your repository. For more information, see "[Security alert notification options](#security-alert-notification-options)." {% endif %} {% if currentVersion == "free-pro-team@latest" %}
- There are workflow runs updates on repositories set up with {% data variables.product.prodname_actions %}. For more information, see "[{% data variables.product.prodname_actions %} notification options](#github-actions-notification-options)."{% endif %}
diff --git a/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md b/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
index 5abb165700..313b384904 100644
--- a/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
+++ b/translations/ko-KR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
@@ -82,6 +82,7 @@ Custom filters do not currently support:
- Distinguishing between the `is:issue`, `is:pr`, and `is:pull-request` query filters. These queries will return both issues and pull requests.
- Creating more than 15 custom filters.
- Changing the default filters or their order.
+ - Search [exclusion](/github/searching-for-information-on-github/understanding-the-search-syntax#exclude-certain-results) using `NOT` or `-QUALIFIER`.
### Supported queries for custom filters
@@ -113,7 +114,7 @@ To filter notifications by why you've received an update, you can use the `reaso
#### Supported `is:` queries
-To filter notifications for specific activity on {% data variables.product.product_name %}, you can use the `is` query. For example, to only see repository invitation updates, use `is:repository-invitation`{% if currentVersion != "github-ae@latest" %}, and to only see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts, use `is:repository-vulnerability-alert`.{% endif %}
+To filter notifications for specific activity on {% data variables.product.product_name %}, you can use the `is` query. For example, to only see repository invitation updates, use `is:repository-invitation`{% if currentVersion != "github-ae@latest" %}, and to only see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %} security{% endif %} alerts, use `is:repository-vulnerability-alert`.{% endif %}
- `is:check-suite`
- `is:commit`
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md
index 399fddf4f4..d2060a62d2 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md
@@ -59,7 +59,7 @@ You can disable all workflows for an organization or set a policy that configure
{% data reusables.profile.access_org %}
{% data reusables.organizations.org_settings %}
{% data reusables.organizations.settings-sidebar-actions %}
-1. Under **Policies**, select **Allow specific actions** and add your required actions to the list. 
+1. Under **Policies**, select **Allow select actions** and add your required actions to the list. 
1. Click **Save**.
{% endif %}
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md
index 1b6842cf8d..8eceee1248 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md
@@ -18,7 +18,7 @@ When code owners are automatically requested for review, the team is still remov
### Routing algorithms
-Code review assignments automatically choose and assign reviewers based on one of two possible alogrithms.
+Code review assignments automatically choose and assign reviewers based on one of two possible algorithms.
The round robin algorithm chooses reviewers based on who's received the least recent review request, focusing on alternating between all members of the team regardless of the number of outstanding reviews they currently have.
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md
index 7d011cdeb0..ca9d809a86 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md
@@ -64,7 +64,7 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late
| Purchase, install, manage billing for, and cancel {% data variables.product.prodname_marketplace %} apps | **X** | | |
| List apps in {% data variables.product.prodname_marketplace %} | **X** | | |{% if currentVersion != "github-ae@latest" %}
| Receive [{% data variables.product.prodname_dependabot_alerts %} about vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) for all of an organization's repositories | **X** | | |
-| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)") | **X** | | |{% endif %}
+| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)") | **X** | | |{% endif %}
| [Manage the forking policy](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization) | **X** | | |
| [Limit activity in public repositories in an organization](/articles/limiting-interactions-in-your-organization) | **X** | | |
| Pull (read), push (write), and clone (copy) *all repositories* in the organization | **X** | | |
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
index 3bda0d9251..cd5421ea48 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
@@ -47,7 +47,7 @@ To search for specific events, use the `action` qualifier in your query. Actions
| `repo` | Contains all activities related to the repositories owned by your organization.{% if currentVersion == "free-pro-team@latest" %}
| `repository_content_analysis` | Contains all activities related to [enabling or disabling data use for a private repository](/articles/about-github-s-use-of-your-data). |
| `repository_dependency_graph` | Contains all activities related to [enabling or disabling the dependency graph for a private repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository).{% endif %}{% if currentVersion != "github-ae@latest" %}
-| `repository_vulnerability_alert` | Contains all activities related to [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% endif %}{% if currentVersion == "free-pro-team@latest" %}
+| `repository_vulnerability_alert` | Contains all activities related to [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% endif %}{% if currentVersion == "free-pro-team@latest" %}
| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %}
| `팀` | Contains all activities related to teams in your organization.{% endif %}
| `team_discussions` | Contains activities related to managing team discussions for an organization. |
@@ -352,13 +352,13 @@ For more information, see "[Restricting publication of {% data variables.product
{% if currentVersion != "github-ae@latest" %}
##### The `repository_vulnerability_alert` category
-| 동작 | 설명 |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `create` | Triggered when {% data variables.product.product_name %} creates a [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alert for a vulnerable dependency](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a particular repository. |
-| `해결` | Triggered when someone with write access to a repository [pushes changes to update and resolve a vulnerability](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a project dependency. |
-| `해제` | Triggered when an organization owner or person with admin access to the repository dismisses a |
-| {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alert about a vulnerable dependency.{% if currentVersion == "free-pro-team@latest" %} | |
-| `authorized_users_teams` | Triggered when an organization owner or a member with admin permissions to the repository [updates the list of people or teams authorized to receive {% data variables.product.prodname_dependabot_short %} alerts](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts) for vulnerable dependencies in the repository.{% endif %}
+| 동작 | 설명 |
+| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `create` | Triggered when {% data variables.product.product_name %} creates a [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alert for a vulnerable dependency](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a particular repository. |
+| `해결` | Triggered when someone with write access to a repository [pushes changes to update and resolve a vulnerability](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a project dependency. |
+| `해제` | Triggered when an organization owner or person with admin access to the repository dismisses a |
+| {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alert about a vulnerable dependency.{% if currentVersion == "free-pro-team@latest" %} | |
+| `authorized_users_teams` | Triggered when an organization owner or a member with admin permissions to the repository [updates the list of people or teams authorized to receive {% data variables.product.prodname_dependabot_alerts %}](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-dependabot-alerts) for vulnerable dependencies in the repository.{% endif %}
{% endif %}
{% if currentVersion == "free-pro-team@latest" %}
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md
index 4d8d0051aa..71c8284af1 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md
@@ -36,7 +36,7 @@ With dependency insights you can view vulnerabilities, licenses, and other impor
3. Under your organization name, click {% octicon "graph" aria-label="The bar graph icon" %} **Insights**. 
4. To view dependencies for this organization, click **Dependencies**. 
5. To view dependency insights for all your {% data variables.product.prodname_ghe_cloud %} organizations, click **My organizations**. 
-6. You can click the results in the **Open security advisories** and **Licenses** graphs to filter by a vulnerability status, a license, or a combination of the two. 
+6. You can click the results in the **Open security advisories** and **Licenses** graphs to filter by a vulnerability status, a license, or a combination of the two. 
7. You can click on {% octicon "package" aria-label="The package icon" %} **dependents** next to each vulnerability to see which dependents in your organization are using each library. 
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md
index 3b2d6509e9..bedbb2ace5 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/about-github-business-accounts/
- /articles/about-enterprise-accounts
+ - /github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts
versions:
free-pro-team: '*'
enterprise-server: '*'
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md
index 9659ee5d59..5e93949972 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md
@@ -4,6 +4,7 @@ intro: You can create new organizations to manage within your enterprise account
product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/adding-organizations-to-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/adding-organizations-to-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md
index 72a581aa1d..f6026095da 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md
@@ -4,6 +4,7 @@ intro: 'You can use Security Assertion Markup Language (SAML) single sign-on (SS
product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /github/setting-up-and-managing-your-enterprise/configuring-single-sign-on-and-scim-for-your-enterprise-account-using-okta
+ - /github/setting-up-and-managing-your-enterprise-account/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta
versions:
free-pro-team: '*'
---
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md
index 7a75d8c7a3..2bd1d3b766 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md
@@ -2,6 +2,8 @@
title: Configuring the retention period for GitHub Actions artifacts and logs in your enterprise account
intro: 'Enterprise owners can configure the retention period for {% data variables.product.prodname_actions %} artifacts and logs in an enterprise account.'
product: '{% data reusables.gated-features.enterprise-accounts %}'
+redirect_from:
+ - /github/setting-up-and-managing-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account
miniTocMaxHeadingLevel: 4
versions:
free-pro-team: '*'
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md
index 23d3b3b562..70cff22ee3 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/configuring-webhooks-for-organization-events-in-your-business-account/
- /articles/configuring-webhooks-for-organization-events-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/configuring-webhooks-for-organization-events-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md
index 9737015137..940bb147e3 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/enforcing-a-policy-on-dependency-insights/
- /articles/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md
index de71be296c..8c94f0422f 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md
@@ -2,6 +2,8 @@
title: Enforcing GitHub Actions policies in your enterprise account
intro: 'Enterprise owners can disable, enable, and limit {% data variables.product.prodname_actions %} for an enterprise account.'
product: '{% data reusables.gated-features.enterprise-accounts %}'
+redirect_from:
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-github-actions-policies-in-your-enterprise-account
miniTocMaxHeadingLevel: 4
versions:
free-pro-team: '*'
@@ -32,7 +34,7 @@ You can disable all workflows for an enterprise or set a policy that configures
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.policies-tab %}
{% data reusables.enterprise-accounts.actions-tab %}
-1. Under **Policies**, select **Allow specific actions** and add your required actions to the list. 
+1. Under **Policies**, select **Allow select actions** and add your required actions to the list. 
### Enabling workflows for private repository forks
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md
index 9074b7ce30..6980c4a9ee 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md
@@ -6,6 +6,7 @@ redirect_from:
- /articles/enforcing-project-board-settings-for-organizations-in-your-business-account/
- /articles/enforcing-project-board-policies-for-organizations-in-your-enterprise-account/
- /articles/enforcing-project-board-policies-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-project-board-policies-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md
index 84fa6806b0..5a46eebf7c 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md
@@ -6,6 +6,7 @@ redirect_from:
- /articles/enforcing-repository-management-settings-for-organizations-in-your-business-account/
- /articles/enforcing-repository-management-policies-for-organizations-in-your-enterprise-account/
- /articles/enforcing-repository-management-policies-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-repository-management-policies-in-your-enterprise-account
versions:
free-pro-team: '*'
---
@@ -48,8 +49,7 @@ Across all organizations owned by your enterprise account, you can allow members
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.policies-tab %}
3. On the **Repository policies** tab, under "Repository invitations", review the information about changing the setting. {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
-4. Under "Repository invitations", use the drop-down menu and choose a policy.
- 
+4. Under "Repository invitations", use the drop-down menu and choose a policy. 
### Enforcing a policy on changing repository visibility
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md
index fb3a07488c..dbcff8becf 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md
@@ -8,6 +8,7 @@ redirect_from:
- /articles/enforcing-security-settings-for-organizations-in-your-enterprise-account/
- /articles/enforcing-security-settings-in-your-enterprise-account
- /github/articles/managing-allowed-ip-addresses-for-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-security-settings-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md
index fe4252f131..47a4c3552e 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md
@@ -6,6 +6,7 @@ redirect_from:
- /articles/enforcing-team-settings-for-organizations-in-your-business-account/
- /articles/enforcing-team-policies-for-organizations-in-your-enterprise-account/
- /articles/enforcing-team-policies-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-team-policies-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md
index 78cda30a30..5713a073bc 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md
@@ -5,6 +5,7 @@ redirect_from:
- /github/setting-up-and-managing-your-enterprise/managing-licenses-for-the-github-enterprise-and-visual-studio-bundle
- /github/articles/about-the-github-and-visual-studio-bundle
- /articles/about-the-github-and-visual-studio-bundle
+ - /github/setting-up-and-managing-your-enterprise-account/managing-licenses-for-visual-studio-subscription-with-github-enterprise
versions:
free-pro-team: '*'
---
@@ -21,7 +22,7 @@ For more information about {% data variables.product.prodname_enterprise %}, see
1. After you buy {% data variables.product.prodname_vss_ghe %}, contact {% data variables.contact.contact_enterprise_sales %} and mention "{% data variables.product.prodname_vss_ghe %}." You'll work with the Sales team to create an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. If you already have an enterprise account on {% data variables.product.prodname_dotcom_the_website %}, or if you're not sure, please tell our Sales team.
-2. Assign licenses for {% data variables.product.prodname_vss_ghe %} to subscribers in {% data variables.product.prodname_vss_admin_portal_with_url %}. For more information about assigning licenses, see [Manage {% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/en-us/visualstudio/subscriptions/assign-github) in the Microsoft Docs.
+2. Assign licenses for {% data variables.product.prodname_vss_ghe %} to subscribers in {% data variables.product.prodname_vss_admin_portal_with_url %}. For more information about assigning licenses, see [Manage {% data variables.product.prodname_vs %} subscriptions with {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/visualstudio/subscriptions/assign-github) in the Microsoft Docs.
3. On {% data variables.product.prodname_dotcom_the_website %}, create at least one organization owned by your enterprise account. For more information, see "[Adding organizations to your enterprise account](/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account)."
@@ -39,4 +40,4 @@ You can also see pending {% data variables.product.prodname_enterprise %} invita
### 더 읽을거리
-- [Introducing Visual Studio subscriptions with GitHub Enterprise](https://docs.microsoft.com/en-us/visualstudio/subscriptions/access-github) in the Microsoft Docs
+- [Introducing Visual Studio subscriptions with GitHub Enterprise](https://docs.microsoft.com/visualstudio/subscriptions/access-github) in the Microsoft Docs
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md
index 9bce247ef1..4ce340ce4e 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md
@@ -4,6 +4,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
mapTopic: true
redirect_from:
- /articles/managing-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md
index 5f85efd341..20b9ebbda5 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md
@@ -3,6 +3,8 @@ title: Managing unowned organizations in your enterprise account
intro: You can become an owner of an organization in your enterprise account that currently has no owners.
product: '{% data reusables.gated-features.enterprise-accounts %}'
permissions: Enterprise owners can manage unowned organizations in an enterprise account.
+redirect_from:
+ - /github/setting-up-and-managing-your-enterprise-account/managing-unowned-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md
index 97c906ecd0..fa870c537f 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md
@@ -4,6 +4,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
mapTopic: true
redirect_from:
- /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/managing-users-in-your-enterprise-account
- /articles/managing-users-in-your-enterprise-account
- /articles/managing-users-in-your-enterprise
versions:
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md
index 4d664620ad..19cd2898db 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md
@@ -4,6 +4,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
mapTopic: true
redirect_from:
- /articles/setting-policies-for-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
index d1e7931fa3..e887ccc08c 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
@@ -5,6 +5,7 @@ permissions: Enterprise owners can view and manage a member's SAML access to an
product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/viewing-and-managing-a-users-saml-access-to-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md
index 661d9c5cb1..b63394ccd3 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/viewing-the-audit-logs-for-organizations-in-your-business-account/
- /articles/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/ko-KR/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md b/translations/ko-KR/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md
index 22bbf0cb0a..312f0c0909 100644
--- a/translations/ko-KR/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md
+++ b/translations/ko-KR/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md
@@ -29,6 +29,8 @@ In the left sidebar of your dashboard, you can access the top repositories and t

+The list of top repositories is automatically generated, and can include any repository you have interacted with, whether it's owned directly by your account or not. Interactions include making commits and opening or commenting on issues and pull requests. The list of top repositories cannot be edited, but repositories will drop off the list 4 months after you last interacted with them.
+
You can also find a list of your recently visited repositories, teams, and project boards when you click into the search bar at the top of any page on {% data variables.product.product_name %}.
### Staying updated with activity from the community
diff --git a/translations/ko-KR/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md b/translations/ko-KR/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
index 6b1c3afe84..52a69a7135 100644
--- a/translations/ko-KR/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
+++ b/translations/ko-KR/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
@@ -5,9 +5,7 @@ product: '{% data reusables.gated-features.github-insights %}'
redirect_from:
- /github/installing-and-configuring-github-insights/github-insights-and-data-protection-for-your-organization
versions:
- free-pro-team: '*'
enterprise-server: '*'
- github-ae: '*'
---
For more information about the terms that govern {% data variables.product.prodname_insights %}, see your {% data variables.product.prodname_ghe_one %} subscription agreement.
diff --git a/translations/ko-KR/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md b/translations/ko-KR/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
index 93de2eb6f4..57ba08fe00 100644
--- a/translations/ko-KR/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
+++ b/translations/ko-KR/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
@@ -141,7 +141,8 @@ Please note that the information available will vary from case to case. Some of
- Communications or documentation (such as Issues or Wikis) in private repositories
- Any security keys used for authentication or encryption
-- **Under exigent circumstances** — If we receive a request for information under certain exigent circumstances (where we believe the disclosure is necessary to prevent an emergency involving danger of death or serious physical injury to a person), we may disclose limited information that we determine necessary to enable law enforcement to address the emergency. For any information beyond that, we would require a subpoena, search warrant, or court order, as described above. For example, we will not disclose contents of private repositories without a search warrant. Before disclosing information, we confirm that the request came from a law enforcement agency, an authority sent an official notice summarizing the emergency, and how the information requested will assist in addressing the emergency.
+-
+**Under exigent circumstances** — If we receive a request for information under certain exigent circumstances (where we believe the disclosure is necessary to prevent an emergency involving danger of death or serious physical injury to a person), we may disclose limited information that we determine necessary to enable law enforcement to address the emergency. For any information beyond that, we would require a subpoena, search warrant, or court order, as described above. For example, we will not disclose contents of private repositories without a search warrant. Before disclosing information, we confirm that the request came from a law enforcement agency, an authority sent an official notice summarizing the emergency, and how the information requested will assist in addressing the emergency.
### Cost reimbursement
diff --git a/translations/ko-KR/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md b/translations/ko-KR/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md
index e92ca97cd9..3a8fdee790 100644
--- a/translations/ko-KR/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md
+++ b/translations/ko-KR/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md
@@ -10,7 +10,7 @@ versions:
### About data use for your private repository
-When you enable data use for your private repository, you'll be able to access the dependency graph, where you can track your repository's dependencies and receive {% data variables.product.prodname_dependabot_short %} alerts when {% data variables.product.product_name %} detects vulnerable dependencies. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies#github-dependabot-alerts-for-vulnerable-dependencies)."
+When you enable data use for your private repository, you'll be able to access the dependency graph, where you can track your repository's dependencies and receive {% data variables.product.prodname_dependabot_alerts %} when {% data variables.product.product_name %} detects vulnerable dependencies. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies#dependabot-alerts-for-vulnerable-dependencies)."
### Enabling or disabling data use features
diff --git a/translations/ko-KR/content/github/using-git/about-git-subtree-merges.md b/translations/ko-KR/content/github/using-git/about-git-subtree-merges.md
index f932a42ea2..f430c8f7f8 100644
--- a/translations/ko-KR/content/github/using-git/about-git-subtree-merges.md
+++ b/translations/ko-KR/content/github/using-git/about-git-subtree-merges.md
@@ -105,5 +105,5 @@ $ git pull -s subtree spoon-knife main
### 더 읽을거리
-- [The "Subtree Merging" chapter from the _Pro Git_ book](https://git-scm.com/book/en/Git-Tools-Subtree-Merging)
+- [The "Advanced Merging" chapter from the _Pro Git_ book](https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging)
- "[How to use the subtree merge strategy](https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html)"
diff --git a/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md b/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md
index c6d15949ba..a77f8603ba 100644
--- a/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md
+++ b/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md
@@ -47,7 +47,7 @@ You can use the dependency graph to:
{% if currentVersion == "free-pro-team@latest" %}To generate a dependency graph, {% data variables.product.product_name %} needs read-only access to the dependency manifest and lock files for a repository. The dependency graph is automatically generated for all public repositories and you can choose to enable it for private repositories. For information about enabling or disabling it for private repositories, see "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)."{% endif %}
-{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
+{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_alerts %}. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."
diff --git a/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md b/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md
index 72eb0a08a8..6cc777d54a 100644
--- a/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md
+++ b/translations/ko-KR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md
@@ -37,7 +37,7 @@ If vulnerabilities have been detected in the repository, these are shown at the
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}
Any direct and indirect dependencies that are specified in the repository's manifest or lock files are listed, grouped by ecosystem. If vulnerabilities have been detected in the repository, these are shown at the top of the view for users with access to
-{% data variables.product.prodname_dependabot_short %} alerts.
+{% data variables.product.prodname_dependabot_alerts %}.
{% note %}
diff --git a/translations/ko-KR/content/github/working-with-github-pages/about-github-pages.md b/translations/ko-KR/content/github/working-with-github-pages/about-github-pages.md
index 538d0c7b4a..3745adbb18 100644
--- a/translations/ko-KR/content/github/working-with-github-pages/about-github-pages.md
+++ b/translations/ko-KR/content/github/working-with-github-pages/about-github-pages.md
@@ -36,9 +36,9 @@ Organization owners can disable the publication of
There are three types of {% data variables.product.prodname_pages %} sites: project, user, and organization. Project sites are connected to a specific project hosted on {% data variables.product.product_name %}, such as a JavaScript library or a recipe collection. User and organization sites are connected to a specific {% data variables.product.product_name %} account.
-To publish a user site, you must create a repository owned by your user account that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. To publish an organization site, you must create a repository owned by an organization that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, user and organization sites are available at `http(s)://.github.io` or `http(s)://.github.io`.{% elsif currentVersion == "github-ae@latest" %}User and organization sites are available at `http(s)://pages./` or `http(s)://pages./`.{% endif %}
+To publish a user site, you must create a repository owned by your user account that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. To publish an organization site, you must create a repository owned by an organization that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, user and organization sites are available at `http(s)://.github.io` or `http(s)://.github.io`.{% elsif currentVersion == "github-ae@latest" %}User and organization sites are available at `http(s)://pages./` or `http(s)://pages./`.{% endif %}
-The source files for a project site are stored in the same repository as their project. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, project sites are available at `http(s)://.github.io/` or `http(s)://.github.io/`.{% elsif currentVersion == "github-ae@latest" %}Project sites are available at `http(s)://pages.///` or `http(s)://pages.///`.{% endif %}
+The source files for a project site are stored in the same repository as their project. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, project sites are available at `http(s)://.github.io/` or `http(s)://.github.io/`.{% elsif currentVersion == "github-ae@latest" %}Project sites are available at `http(s)://pages.///` or `http(s)://pages.///`.{% endif %}
{% if currentVersion == "free-pro-team@latest" %}
For more information about how custom domains affect the URL for your site, see "[About custom domains and {% data variables.product.prodname_pages %}](/articles/about-custom-domains-and-github-pages)."
@@ -63,7 +63,7 @@ For more information, see "[Enabling subdomain isolation](/enterprise/{{ current
{% if currentVersion == "free-pro-team@latest" %}
{% note %}
-**Note:** Repositories using the legacy `.github.com` naming scheme will still be published, but visitors will be redirected from `http(s)://.github.com` to `http(s)://.github.io`. If both a `.github.com` and `.github.io` repository exist, only the `.github.io` repository will be published.
+**Note:** Repositories using the legacy `.github.com` naming scheme will still be published, but visitors will be redirected from `http(s)://.github.com` to `http(s)://.github.io`. If both a `.github.com` and `.github.io` repository exist, only the `.github.io` repository will be published.
{% endnote %}
{% endif %}
diff --git a/translations/ko-KR/content/github/working-with-github-pages/creating-a-github-pages-site.md b/translations/ko-KR/content/github/working-with-github-pages/creating-a-github-pages-site.md
index 6ff1d27245..676ed08e1d 100644
--- a/translations/ko-KR/content/github/working-with-github-pages/creating-a-github-pages-site.md
+++ b/translations/ko-KR/content/github/working-with-github-pages/creating-a-github-pages-site.md
@@ -2,6 +2,9 @@
title: Creating a GitHub Pages site
intro: 'You can create a {% data variables.product.prodname_pages %} site in a new or existing repository.'
redirect_from:
+ - /articles/creating-pages-manually/
+ - /articles/creating-project-pages-manually/
+ - /articles/creating-project-pages-from-the-command-line/
- /articles/creating-project-pages-using-the-command-line/
- /articles/creating-a-github-pages-site
product: '{% data reusables.gated-features.pages %}'
diff --git a/translations/ko-KR/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md b/translations/ko-KR/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md
index bd0ce93566..8ff575aad3 100644
--- a/translations/ko-KR/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md
+++ b/translations/ko-KR/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md
@@ -41,7 +41,7 @@ To set up a `www` or custom subdomain, such as `www.example.com` or `blog.exampl
{% data reusables.repositories.sidebar-settings %}
{% data reusables.pages.save-custom-domain %}
5. Navigate to your DNS provider and create a `CNAME` record that points your subdomain to the default domain for your site. For example, if you want to use the subdomain `www.example.com` for your user site, create a `CNAME` record that points `www.example.com` to `.github.io`. If you want to use the subdomain `www.anotherexample.com` for your organization site, create a `CNAME` record that points `www.anotherexample.com` to `.github.io`. The `CNAME` file should always point to `.github.io` or `.github.io`, excluding the repository name.
-{% data reusables.pages.contact-dns-provider %}{% data reusables.pages.default-domain-information %}
+{% data reusables.pages.contact-dns-provider %} {% data reusables.pages.default-domain-information %}
{% data reusables.command_line.open_the_multi_os_terminal %}
6. To confirm that your DNS record configured correctly, use the `dig` command, replacing _WWW.EXAMPLE.COM_ with your subdomain.
```shell
diff --git a/translations/ko-KR/content/github/working-with-github-pages/troubleshooting-jekyll-build-errors-for-github-pages-sites.md b/translations/ko-KR/content/github/working-with-github-pages/troubleshooting-jekyll-build-errors-for-github-pages-sites.md
index 62457004f9..3b2bb2212b 100644
--- a/translations/ko-KR/content/github/working-with-github-pages/troubleshooting-jekyll-build-errors-for-github-pages-sites.md
+++ b/translations/ko-KR/content/github/working-with-github-pages/troubleshooting-jekyll-build-errors-for-github-pages-sites.md
@@ -183,6 +183,6 @@ To troubleshoot, make sure all output tags in the file in the error message are
This error means that your code contains an unrecognized Liquid tag.
-To troubleshoot, make sure all Liquid tags in the file in the error message match Jekyll's default variables and there are no typos in the tag names. For a list of default varibles, see "[Variables](https://jekyllrb.com/docs/variables/)" in the Jekyll documentation.
+To troubleshoot, make sure all Liquid tags in the file in the error message match Jekyll's default variables and there are no typos in the tag names. For a list of default variables, see "[Variables](https://jekyllrb.com/docs/variables/)" in the Jekyll documentation.
Unsupported plugins are a common source of unrecognized tags. If you use an unsupported plugin in your site by generating your site locally and pushing your static files to {% data variables.product.product_name %}, make sure the plugin is not introducing tags that are not in Jekyll's default variables. For a list of supported plugins, see "[About {% data variables.product.prodname_pages %} and Jekyll](/articles/about-github-pages-and-jekyll#plugins)."
diff --git a/translations/ko-KR/content/graphql/guides/managing-enterprise-accounts.md b/translations/ko-KR/content/graphql/guides/managing-enterprise-accounts.md
index b5f9d80e62..4b002a1c85 100644
--- a/translations/ko-KR/content/graphql/guides/managing-enterprise-accounts.md
+++ b/translations/ko-KR/content/graphql/guides/managing-enterprise-accounts.md
@@ -203,6 +203,6 @@ For more information about getting started with GraphQL, see "[Introduction to G
Here's an overview of the new queries, mutations, and schema defined types available for use with the Enterprise Accounts API.
-For more details about the new queries, mutations, and schema defined types available for use with the Enterprise Accounts API, see the sdiebar with detailed GraphQL definitions from any [GraphQL reference page](/v4/).
+For more details about the new queries, mutations, and schema defined types available for use with the Enterprise Accounts API, see the sidebar with detailed GraphQL definitions from any [GraphQL reference page](/v4/).
You can access the reference docs from within the GraphQL explorer on GitHub. For more information, see "[Using the explorer](/v4/guides/using-the-explorer#accessing-the-sidebar-docs)." For other information, such as authentication and rate limit details, check out the [guides](/v4/guides).
diff --git a/translations/ko-KR/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md b/translations/ko-KR/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md
index a26e1b4aba..12be82871c 100644
--- a/translations/ko-KR/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md
+++ b/translations/ko-KR/content/insights/installing-and-configuring-github-insights/managing-contributors-and-teams.md
@@ -90,7 +90,7 @@ You can create and manage custom teams in {% data variables.product.prodname_ins
{% data reusables.github-insights.settings-tab %}
{% data reusables.github-insights.teams-tab %}
{% data reusables.github-insights.edit-team %}
-3. Under "Contributors", use the drop-down menu and select a contributor. 
+3. Under "Contributors", use the drop-down menu and select a contributor. 
4. Click **Done**.
#### Removing a contributor from a custom team
diff --git a/translations/ko-KR/content/packages/publishing-and-managing-packages/about-github-packages.md b/translations/ko-KR/content/packages/publishing-and-managing-packages/about-github-packages.md
index d9c5d5c1c5..f86a9d046c 100644
--- a/translations/ko-KR/content/packages/publishing-and-managing-packages/about-github-packages.md
+++ b/translations/ko-KR/content/packages/publishing-and-managing-packages/about-github-packages.md
@@ -83,7 +83,7 @@ For more information about the container support offered by
#### Support for package registries
{% if currentVersion == "free-pro-team@latest" %}
-Package registries use `PACKAGE-TYPE.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` as the package host URL, replacing `PACKAGE-TYPE` with the Package namespace. For example, your Gemfile will be hosted at `rubygem.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME`.
+Package registries use `PACKAGE-TYPE.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` as the package host URL, replacing `PACKAGE-TYPE` with the Package namespace. For example, your Gemfile will be hosted at `rubygems.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME`.
{% else %}
@@ -98,8 +98,8 @@ If {% data variables.product.product_location %} has subdomain isolation disable
| ---------- | ------------------------------------------------------ | ------------------------------------ | -------------- | ----------------------------------------------------- |
| JavaScript | Node package manager | `package.json` | `npm` | `npm.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
| Ruby | RubyGems package manager | `Gemfile` | `gem` | `rubygems.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
-| Java | Apache Maven project management and comprehension tool | `pom.xml` | `mvn` | `maven.HOSTNAME/OWNER/REPOSITORY/IMAGE-NAME` |
-| Java | Gradle build automation tool for Java | `build.gradle` or `build.gradle.kts` | `gradle` | `maven.HOSTNAME/OWNER/REPOSITORY/IMAGE-NAME` |
+| Java | Apache Maven project management and comprehension tool | `pom.xml` | `mvn` | `maven.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
+| Java | Gradle build automation tool for Java | `build.gradle` or `build.gradle.kts` | `gradle` | `maven.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
| .NET | NuGet package management for .NET | `nupkg` | `dotnet` CLI | `nuget.pkg.github.com/OWNER/REPOSITORY/IMAGE-NAME` |
{% else %}
@@ -161,15 +161,15 @@ For more information, see "[Creating a personal access token](/github/authentica
To use or manage a package hosted by a package registry, you must use a token with the appropriate scope, and your user account must have appropriate permissions for that repository.
예시:
-- To download and install packages from a repository, your token must have the `read:packages` scope, and your user account must have read permissions for the repository. If the repository is private, your token must also have the `repo` scope.
+- To download and install packages from a repository, your token must have the `read:packages` scope, and your user account must have read permissions for the repository.
- To delete a specified version of a private package on {% data variables.product.product_name %}, your token must have the `delete:packages` and `repo` scope. Public packages cannot be deleted. For more information, see "[Deleting a package](/packages/publishing-and-managing-packages/deleting-a-package)."
-| 범위 | 설명 | Repository permissions |
-| ----------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ---------------------- |
-| `read:packages` | Download and install packages from {% data variables.product.prodname_registry %} | read |
-| `write:packages` | Upload and publish packages to {% data variables.product.prodname_registry %} | write |
-| `delete:packages` | Delete specified versions of private packages from {% data variables.product.prodname_registry %} | admin |
-| `repo` | Install, upload, and delete certain packages in private repositories (along with `read:packages`, `write:packages`, or `delete:packages`) | read, write, or admin |
+| 범위 | 설명 | Repository permissions |
+| ----------------- | ------------------------------------------------------------------------------------------------- | ---------------------- |
+| `read:packages` | Download and install packages from {% data variables.product.prodname_registry %} | read |
+| `write:packages` | Upload and publish packages to {% data variables.product.prodname_registry %} | write |
+| `delete:packages` | Delete specified versions of private packages from {% data variables.product.prodname_registry %} | admin |
+| `repo` | Upload and delete packages (along with `write:packages`, or `delete:packages`) | write, or admin |
When you create a {% data variables.product.prodname_actions %} workflow, you can use the `GITHUB_TOKEN` to publish and install packages in {% data variables.product.prodname_registry %} without needing to store and manage a personal access token.
diff --git a/translations/ko-KR/content/packages/publishing-and-managing-packages/publishing-a-package.md b/translations/ko-KR/content/packages/publishing-and-managing-packages/publishing-a-package.md
index fbc13a6a79..d016cc2ba7 100644
--- a/translations/ko-KR/content/packages/publishing-and-managing-packages/publishing-a-package.md
+++ b/translations/ko-KR/content/packages/publishing-and-managing-packages/publishing-a-package.md
@@ -22,7 +22,7 @@ You can help people understand and use your package by providing a description a
{% if currentVersion == "free-pro-team@latest" %}
If a new version of a package fixes a security vulnerability, you should publish a security advisory in your repository.
-{% data variables.product.prodname_dotcom %} reviews each published security advisory and may use it to send {% data variables.product.prodname_dependabot_short %} alerts to affected repositories. For more information, see "[About GitHub Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)."
+{% data variables.product.prodname_dotcom %} reviews each published security advisory and may use it to send {% data variables.product.prodname_dependabot_alerts %} to affected repositories. For more information, see "[About GitHub Security Advisories](/github/managing-security-vulnerabilities/about-github-security-advisories)."
{% endif %}
### Publishing a package
diff --git a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md
index 75a8d2a919..1b04ca8d34 100644
--- a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md
+++ b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md
@@ -27,7 +27,7 @@ You can authenticate to {% data variables.product.prodname_registry %} with Apac
In the `servers` tag, add a child `server` tag with an `id`, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, and *TOKEN* with your personal access token.
-In the `repositories` tag, configure a repository by mapping the `id` of the repository to the `id` you added in the `server` tag containing your credentials. Replace {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}*REPOSITORY* with the name of the repository you'd like to publish a package to or install a package from, and *OWNER* with the name of the user or organization account that owns the repository. {% data reusables.package_registry.lowercase-name-field %}
+In the `repositories` tag, configure a repository by mapping the `id` of the repository to the `id` you added in the `server` tag containing your credentials. Replace {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %}*REPOSITORY* with the name of the repository you'd like to publish a package to or install a package from, and *OWNER* with the name of the user or organization account that owns the repository. Because uppercase letters aren't supported, you must use lowercase letters for the repository owner even if the {% data variables.product.prodname_dotcom %} user or organization name contains uppercase letters.
If you want to interact with multiple repositories, you can add each repository to separate `repository` children in the `repositories` tag, mapping the `id` of each to the credentials in the `servers` tag.
diff --git a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md
index a0767ba3c9..215e7117c7 100644
--- a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md
+++ b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md
@@ -65,13 +65,17 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen
{% data reusables.package_registry.package-registry-with-github-tokens %}
-### Publishing a package
+### Publishing an image
{% data reusables.package_registry.docker_registry_deprecation_status %}
-{% data variables.product.prodname_registry %} supports multiple top-level Docker images per repository. A repository can have any number of image tags. You may experience degraded service publishing or installing Docker images larger than 10GB, layers are capped at 5GB each. For more information, see "[Docker tag](https://docs.docker.com/engine/reference/commandline/tag/)" in the Docker documentation.
+{% note %}
-{% data reusables.package_registry.lowercase-name-field %}
+**Note:** Image names must only use lowercase letters.
+
+{% endnote %}
+
+{% data variables.product.prodname_registry %} supports multiple top-level Docker images per repository. A repository can have any number of image tags. You may experience degraded service publishing or installing Docker images larger than 10GB, layers are capped at 5GB each. For more information, see "[Docker tag](https://docs.docker.com/engine/reference/commandline/tag/)" in the Docker documentation.
{% data reusables.package_registry.viewing-packages %}
@@ -181,11 +185,11 @@ $ docker push docker.HOSTNAME/octocat/octo-app/monalisa:1.0
```
{% endif %}
-### Installing a package
+### Downloading an image
{% data reusables.package_registry.docker_registry_deprecation_status %}
-You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %}
+You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install.
{% if currentVersion == "free-pro-team@latest" %}
```shell
diff --git a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md
index 84ea3515d0..b3333a8969 100644
--- a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md
+++ b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages.md
@@ -77,7 +77,7 @@ If your instance has subdomain isolation disabled:
### Publishing a package
-You can publish a package to {% data variables.product.prodname_registry %} by authenticating with a *nuget.config* file. When publishing, you need to use the same value for `OWNER` in your *csproj* file that you use in your *nuget.config* authentication file. Specify or increment the version number in your *.csproj* file, then use the `dotnet pack` command to create a *.nuspec* file for that version. For more information on creating your package, see "[Create and publish a package](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package-using-the-dotnet-cli)" in the Microsoft documentation.
+You can publish a package to {% data variables.product.prodname_registry %} by authenticating with a *nuget.config* file. When publishing, you need to use the same value for `OWNER` in your *csproj* file that you use in your *nuget.config* authentication file. Specify or increment the version number in your *.csproj* file, then use the `dotnet pack` command to create a *.nuspec* file for that version. For more information on creating your package, see "[Create and publish a package](https://docs.microsoft.com/nuget/quickstart/create-and-publish-a-package-using-the-dotnet-cli)" in the Microsoft documentation.
{% data reusables.package_registry.viewing-packages %}
@@ -159,7 +159,7 @@ For example, the *OctodogApp* and *OctocatApp* projects will publish to the same
### Installing a package
-Using packages from {% data variables.product.prodname_dotcom %} in your project is similar to using packages from *nuget.org*. Add your package dependencies to your *.csproj* file, specifying the package name and version. For more information on using a *.csproj* file in your project, see "[Working with NuGet packages](https://docs.microsoft.com/en-us/nuget/consume-packages/overview-and-workflow)" in the Microsoft documentation.
+Using packages from {% data variables.product.prodname_dotcom %} in your project is similar to using packages from *nuget.org*. Add your package dependencies to your *.csproj* file, specifying the package name and version. For more information on using a *.csproj* file in your project, see "[Working with NuGet packages](https://docs.microsoft.com/nuget/consume-packages/overview-and-workflow)" in the Microsoft documentation.
{% data reusables.package_registry.authenticate-step %}
diff --git a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md
index c3a614d19d..fa9d65c7f3 100644
--- a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md
+++ b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages.md
@@ -30,7 +30,7 @@ Replace *REGISTRY-URL* with the URL for your instance's Maven registry. If your
{% data variables.product.prodname_ghe_server %} instance.
{% endif %}
-Replace *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, *REPOSITORY* with the name of the repository containing the package you want to publish, and *OWNER* with the name of the user or organization account on {% data variables.product.prodname_dotcom %} that owns the repository. {% data reusables.package_registry.lowercase-name-field %}
+Replace *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, *REPOSITORY* with the name of the repository containing the package you want to publish, and *OWNER* with the name of the user or organization account on {% data variables.product.prodname_dotcom %} that owns the repository. Because uppercase letters aren't supported, you must use lowercase letters for the repository owner even if the {% data variables.product.prodname_dotcom %} user or organization name contains uppercase letters.
{% note %}
diff --git a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md
index 7f1e63aabb..65153a6bd9 100644
--- a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md
+++ b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages.md
@@ -73,6 +73,12 @@ $ npm login --registry=https://HOSTNAME/_registry/npm/
### Publishing a package
+{% note %}
+
+**Note:** Package names and scopes must only use lowercase letters.
+
+{% endnote %}
+
By default, {% data variables.product.prodname_registry %} publishes a package in the {% data variables.product.prodname_dotcom %} repository you specify in the name field of the *package.json* file. For example, you would publish a package named `@my-org/test` to the `my-org/test` {% data variables.product.prodname_dotcom %} repository. You can add a summary for the package listing page by including a *README.md* file in your package directory. For more information, see "[Working with package.json](https://docs.npmjs.com/getting-started/using-a-package.json)" and "[How to create Node.js Modules](https://docs.npmjs.com/getting-started/creating-node-modules)" in the npm documentation.
You can publish multiple packages to the same {% data variables.product.prodname_dotcom %} repository by including a `URL` field in the *package.json* file. For more information, see "[Publishing multiple packages to the same repository](#publishing-multiple-packages-to-the-same-repository)."
@@ -83,12 +89,12 @@ You can set up the scope mapping for your project using either a local *.npmrc*
#### Publishing a package using a local *.npmrc* file
-You can use an *.npmrc* file to configure the scope mapping for your project. In the *.npmrc* file, use the {% data variables.product.prodname_registry %} URL and account owner so {% data variables.product.prodname_registry %} knows where to route package requests. Using an *.npmrc* file prevents other developers from accidentally publishing the package to npmjs.org instead of {% data variables.product.prodname_registry %}. {% data reusables.package_registry.lowercase-name-field %}
+You can use an *.npmrc* file to configure the scope mapping for your project. In the *.npmrc* file, use the {% data variables.product.prodname_registry %} URL and account owner so {% data variables.product.prodname_registry %} knows where to route package requests. Using an *.npmrc* file prevents other developers from accidentally publishing the package to npmjs.org instead of {% data variables.product.prodname_registry %}.
{% data reusables.package_registry.authenticate-step %}
{% data reusables.package_registry.create-npmrc-owner-step %}
{% data reusables.package_registry.add-npmrc-to-repo-step %}
-4. Verify the name of your package in your project's *package.json*. The `name` field must contain the scope and the name of the package. For example, if your package is called "test", and you are publishing to the "My-org"
+1. Verify the name of your package in your project's *package.json*. The `name` field must contain the scope and the name of the package. For example, if your package is called "test", and you are publishing to the "My-org"
{% data variables.product.prodname_dotcom %} organization, the `name` field in your *package.json* should be `@my-org/test`.
{% data reusables.package_registry.verify_repository_field %}
{% data reusables.package_registry.publish_package %}
@@ -167,7 +173,7 @@ You also need to add the *.npmrc* file to your project so all requests to instal
#### Installing packages from other organizations
-By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project. {% data reusables.package_registry.lowercase-name-field %}
+By default, you can only use {% data variables.product.prodname_registry %} packages from one organization. If you'd like to route package requests to multiple organizations and users, you can add additional lines to your *.npmrc* file, replacing {% if enterpriseServerVersions contains currentVersion %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance and {% endif %}*OWNER* with the name of the user or organization account that owns the repository containing your project.
{% if enterpriseServerVersions contains currentVersion %}
If your instance has subdomain isolation enabled:
@@ -175,8 +181,8 @@ If your instance has subdomain isolation enabled:
```shell
registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME{% endif %}/OWNER
-@OWNER:registry={% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}
-@OWNER:registry={% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}
+@OWNER:registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}
+@OWNER:registry=https://{% if currentVersion == "free-pro-team@latest" %}npm.pkg.github.com{% else %}npm.HOSTNAME/{% endif %}
```
{% if enterpriseServerVersions contains currentVersion %}
@@ -184,8 +190,8 @@ If your instance has subdomain isolation disabled:
```shell
registry=https://HOSTNAME/_registry/npm/OWNER
-@OWNER:registry=HOSTNAME/_registry/npm/
-@OWNER:registry=HOSTNAME/_registry/npm/
+@OWNER:registry=https://HOSTNAME/_registry/npm/
+@OWNER:registry=https://HOSTNAME/_registry/npm/
```
{% endif %}
diff --git a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md
index 7f347260b1..8c76789a70 100644
--- a/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md
+++ b/translations/ko-KR/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-rubygems-for-use-with-github-packages.md
@@ -76,8 +76,6 @@ If you don't have a *~/.gemrc* file, create a new *~/.gemrc* file using this exa
To authenticate with Bundler, configure Bundler to use your personal access token, replacing *USERNAME* with your {% data variables.product.prodname_dotcom %} username, *TOKEN* with your personal access token, and *OWNER* with the name of the user or organization account that owns the repository containing your project.{% if enterpriseServerVersions contains currentVersion %} Replace `REGISTRY-URL` with the URL for your instance's Rubygems registry. If your instance has subdomain isolation enabled, use `rubygems.HOSTNAME`. If your instance has subdomain isolation disabled, use `HOSTNAME/_registry/rubygems`. In either case, replace *HOSTNAME* with the hostname of your {% data variables.product.prodname_ghe_server %} instance.{% endif %}
-{% data reusables.package_registry.lowercase-name-field %}
-
```shell
$ bundle config https://{% if currentVersion == "free-pro-team@latest" %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER USERNAME:TOKEN
```
diff --git a/translations/ko-KR/content/rest/overview/api-previews.md b/translations/ko-KR/content/rest/overview/api-previews.md
index 352b690cbd..831db32f25 100644
--- a/translations/ko-KR/content/rest/overview/api-previews.md
+++ b/translations/ko-KR/content/rest/overview/api-previews.md
@@ -70,14 +70,6 @@ Manage [projects](/v3/projects/).
**Custom media type:** `cloak-preview` **Announced:** [2017-01-05](https://developer.github.com/changes/2017-01-05-commit-search-api/)
-{% if currentVersion == "free-pro-team@latest" %}
-### Community profile metrics
-
-Retrieve [community profile metrics](/v3/repos/community/) (also known as community health) for any public repository.
-
-**Custom media type:** `black-panther-preview` **Announced:** [2017-02-09](https://developer.github.com/changes/2017-02-09-community-health/)
-{% endif %}
-
{% if currentVersion == "free-pro-team@latest" %}
### User blocking
@@ -206,16 +198,6 @@ You can now provide more information in GitHub for URLs that link to registered
**Custom media types:** `corsair-preview` **Announced:** [2018-12-10](https://developer.github.com/changes/2018-12-10-content-attachments-api/)
-{% if currentVersion == "free-pro-team@latest" %}
-
-### Interaction restrictions for repositories and organizations
-
-Allows you to temporarily restrict interactions, such as commenting, opening issues, and creating pull requests, for {% data variables.product.product_name %} repositories or organizations. When enabled, only the specified group of {% data variables.product.product_name %} users will be able to participate in these interactions. See the [Repository interactions](/v3/interactions/repos/) and [Organization interactions](/v3/interactions/orgs/) APIs for more details.
-
-**Custom media type:** `sombra-preview` **Announced:** [2018-12-18](https://developer.github.com/changes/2018-12-18-interactions-preview/)
-
-{% endif %}
-
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.21" %}
### Draft pull requests
diff --git a/translations/ko-KR/content/rest/overview/libraries.md b/translations/ko-KR/content/rest/overview/libraries.md
index e673a1e4df..169441d839 100644
--- a/translations/ko-KR/content/rest/overview/libraries.md
+++ b/translations/ko-KR/content/rest/overview/libraries.md
@@ -11,13 +11,12 @@ versions:
- Octokit comes in
- many flavors
+ Octokit comes in many flavors
Use the official Octokit library, or choose between any of the available third party libraries.
-
@@ -25,138 +24,64 @@ versions:
### Clojure
-* [Tentacles][tentacles]
+Library name | Repository |---|---| **Tentacles**| [Raynes/tentacles](https://github.com/Raynes/tentacles)
### Dart
-* [github.dart][github.dart]
+Library name | Repository |---|---| **github.dart** | [DirectMyFile/github.dart](https://github.com/DirectMyFile/github.dart)
### Emacs Lisp
-* [gh.el][gh.el]
+Library name | Repository |---|---| **gh.el** | [sigma/gh.el](https://github.com/sigma/gh.el)
### Erlang
-* [octo.erl][octo-erl]
+Library name | Repository |---|---| **octo-erl** | [sdepold/octo.erl](https://github.com/sdepold/octo.erl)
### Go
-* [go-github][]
+Library name | Repository |---|---| **go-github**| [google/go-github](https://github.com/google/go-github)
### Haskell
-* [github][haskell-github]
+Library name | Repository |---|---| **haskell-github** | [fpco/Github](https://github.com/fpco/GitHub)
### Java
-* The [GitHub Java API (org.eclipse.egit.github.core)](https://github.com/eclipse/egit-github/tree/master/org.eclipse.egit.github.core) library is part of the [GitHub Mylyn Connector](https://github.com/eclipse/egit-github) and aims to support the entire GitHub v3 API. Builds are available in [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22org.eclipse.egit.github.core%22).
-* [GitHub API for Java (org.kohsuke.github)](http://github-api.kohsuke.org/) defines an object oriented representation of the GitHub API.
-* [JCabi GitHub API](http://github.jcabi.com) is based on Java7 JSON API (JSR-353), simplifies tests with a runtime GitHub stub, and covers the entire API.
+Library name | Repository | More information |---|---|---| **GitHub Java API**| [org.eclipse.egit.github.core](https://github.com/eclipse/egit-github/tree/master/org.eclipse.egit.github.core) | Is part of the [GitHub Mylyn Connector](https://github.com/eclipse/egit-github) and aims to support the entire GitHub v3 API. Builds are available in [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22org.eclipse.egit.github.core%22). **GitHub API for Java**| [org.kohsuke.github (From github-api)](http://github-api.kohsuke.org/)|defines an object oriented representation of the GitHub API. **JCabi GitHub API**|[github.jcabi.com (Personal Website)](http://github.jcabi.com)|is based on Java7 JSON API (JSR-353), simplifies tests with a runtime GitHub stub, and covers the entire API.
### JavaScript
-* [NodeJS GitHub library][octonode]
-* [gh3 client-side API v3 wrapper][gh3]
-* [GitHub.js wrapper around the GitHub API][github]
-* [Promise-Based CoffeeScript library for the browser or NodeJS][github-client]
+Library name | Repository | |---|---| **NodeJS GitHub library**| [pksunkara/octonode](https://github.com/pksunkara/octonode) **gh3 client-side API v3 wrapper**| [k33g/gh3](https://github.com/k33g/gh3) **Github.js wrapper around the GitHub API**|[michael/github](https://github.com/michael/github) **Promise-Based CoffeeScript library for the Browser or NodeJS**|[philschatz/github-client](https://github.com/philschatz/github-client)
### Julia
-* [GitHub.jl][github.jl]
+Library name | Repository | |---|---| **Github.jl**|[WestleyArgentum/Github.jl](https://github.com/WestleyArgentum/GitHub.jl)
### OCaml
-* [ocaml-github][ocaml-github]
+Library name | Repository | |---|---| **ocaml-github**|[mirage/ocaml-github](https://github.com/mirage/ocaml-github)
### Perl
-* [Pithub][pithub-github] ([CPAN][pithub-cpan])
-* [Net::GitHub][net-github-github] ([CPAN][net-github-cpan])
+Library name | Repository | metacpan Website for the Library |---|---|---| **Pithub**|[plu/Pithub](https://github.com/plu/Pithub)|[Pithub CPAN](http://metacpan.org/module/Pithub) **Net::Github**|[fayland/perl-net-github](https://github.com/fayland/perl-net-github)|[Net:Github CPAN](https://metacpan.org/pod/Net::GitHub)
### PHP
-* [GitHub PHP Client][github-php-client]
-* [PHP GitHub API][php-github-api]
-* [GitHub API][github-api]
-* [GitHub Joomla! Package][joomla]
-* [Github Nette Extension][kdyby-github]
-* [GitHub API Easy Access][milo-github-api]
-* [GitHub bridge for Laravel][github-laravel]
-* [PHP5.6|PHP7 Client & WebHook wrapper][flexyproject-githubapi]
+Library name | Repository |---|---| **GitHub PHP Client**|[tan-tan-kanarek/github-php-client](https://github.com/tan-tan-kanarek/github-php-client) **PHP GitHub API**|[KnpLabs/php-github-api](https://github.com/KnpLabs/php-github-api) **GitHub API**|[yiiext/github-api](https://github.com/yiiext/github-api) **GitHub Joomla! Package**|[joomla-framework/github-api](https://github.com/joomla-framework/github-api) **GitHub Nette Extension**|[kdyby/github](https://github.com/kdyby/github) **GitHub API Easy Access**|[milo/github-api](https://github.com/milo/github-api) **GitHub bridge for Laravel**|[GrahamCampbell/Laravel-Github](https://github.com/GrahamCampbell/Laravel-GitHub) **PHP7 Client & WebHook wrapper**|[FlexyProject/GithubAPI](https://github.com/FlexyProject/GitHubAPI)
### Python
-* [PyGithub][jacquev6_pygithub]
-* [libsaas][libsaas]
-* [github3.py][github3py]
-* [sanction][sanction]
-* [agithub][agithub]
-* [octohub][octohub]
-* [Github-Flask][github-flask]
-* [torngithub][torngithub]
+Library name | Repository |---|---| **PyGithub**|[PyGithub/PyGithub](https://github.com/PyGithub/PyGithub) **libsaas**|[duckboard/libsaas](https://github.com/ducksboard/libsaas) **github3.py**|[sigmavirus24/github3.py](https://github.com/sigmavirus24/github3.py) **sanction**|[demianbrecht/sanction](https://github.com/demianbrecht/sanction) **agithub**|[jpaugh/agithub](https://github.com/jpaugh/agithub) **octohub**|[turnkeylinux/octohub](https://github.com/turnkeylinux/octohub) **github-flask**|[github-flask (Oficial Website)](http://github-flask.readthedocs.org) **torngithub**|[jkeylu/torngithub](https://github.com/jkeylu/torngithub)
### Ruby
-* [GitHub API Gem][ghapi]
-* [Ghee][ghee]
+Library name | Repository |---|---| **GitHub API Gem**|[peter-murach/github](https://github.com/peter-murach/github) **Ghee**|[rauhryan/ghee](https://github.com/rauhryan/ghee)
### Scala
-* [Hubcat][hubcat]
-* [Github4s][github4s]
+Library name | Repository |---|---| **Hubcat**|[softprops/hubcat](https://github.com/softprops/hubcat) **Github4s**|[47deg/github4s](https://github.com/47deg/github4s)
### Shell
-* [ok.sh][ok.sh]
-
-[tentacles]: https://github.com/Raynes/tentacles
-
-[github.dart]: https://github.com/DirectMyFile/github.dart
-
-[gh.el]: https://github.com/sigma/gh.el
-
-[octo-erl]: https://github.com/sdepold/octo.erl
-
-[go-github]: https://github.com/google/go-github
-
-[haskell-github]: https://github.com/fpco/GitHub
-
-[octonode]: https://github.com/pksunkara/octonode
-[gh3]: https://github.com/k33g/gh3
-[github]: https://github.com/michael/github
-[github-client]: https://github.com/philschatz/github-client
-
-[github.jl]: https://github.com/WestleyArgentum/GitHub.jl
-
-[ocaml-github]: https://github.com/mirage/ocaml-github
-
-[net-github-github]: https://github.com/fayland/perl-net-github
-[net-github-cpan]: https://metacpan.org/pod/Net::GitHub
-[pithub-github]: https://github.com/plu/Pithub
-[pithub-cpan]: http://metacpan.org/module/Pithub
-
-[github-php-client]: https://github.com/tan-tan-kanarek/github-php-client
-[php-github-api]: https://github.com/KnpLabs/php-github-api
-[github-api]: https://github.com/yiiext/github-api
-[joomla]: https://github.com/joomla-framework/github-api
-[kdyby-github]: https://github.com/kdyby/github
-[milo-github-api]: https://github.com/milo/github-api
-[github-laravel]: https://github.com/GrahamCampbell/Laravel-GitHub
-[flexyproject-githubapi]: https://github.com/FlexyProject/GitHubAPI
-
-[jacquev6_pygithub]: https://github.com/PyGithub/PyGithub
-[libsaas]: https://github.com/ducksboard/libsaas
-[github3py]: https://github.com/sigmavirus24/github3.py
-[sanction]: https://github.com/demianbrecht/sanction
-[agithub]: https://github.com/jpaugh/agithub "Agnostic GitHub"
-[octohub]: https://github.com/turnkeylinux/octohub
-[github-flask]: http://github-flask.readthedocs.org
-[torngithub]: https://github.com/jkeylu/torngithub
-
-[ghapi]: https://github.com/peter-murach/github
-[ghee]: https://github.com/rauhryan/ghee
-
-[hubcat]: https://github.com/softprops/hubcat
-[github4s]: https://github.com/47deg/github4s
-
-[ok.sh]: https://github.com/whiteinge/ok.sh
+Library name | Repository |---|---| **ok.sh**|[whiteinge/ok.sh](https://github.com/whiteinge/ok.sh)
diff --git a/translations/ko-KR/content/rest/reference/actions.md b/translations/ko-KR/content/rest/reference/actions.md
index 989347dfa2..f6a82d2cfe 100644
--- a/translations/ko-KR/content/rest/reference/actions.md
+++ b/translations/ko-KR/content/rest/reference/actions.md
@@ -24,6 +24,7 @@ The Artifacts API allows you to download, delete, and retrieve information about
{% if operation.subcategory == 'artifacts' %}{% include rest_operation %}{% endif %}
{% endfor %}
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}
## Permissions
The Permissions API allows you to set permissions for what organizations and repositories are allowed to run {% data variables.product.prodname_actions %}, and what actions are allowed to run. For more information, see "[Usage limits, billing, and administration](/actions/reference/usage-limits-billing-and-administration#disabling-or-limiting-github-actions-for-your-repository-or-organization)."
@@ -33,6 +34,7 @@ You can manage self-hosted runners for an enterprise. For more information, see
{% for operation in currentRestOperations %}
{% if operation.subcategory == 'permissions' %}{% include rest_operation %}{% endif %}
{% endfor %}
+{% endif %}
## Secrets
diff --git a/translations/ko-KR/content/rest/reference/permissions-required-for-github-apps.md b/translations/ko-KR/content/rest/reference/permissions-required-for-github-apps.md
index 83a8189cdf..85b9c15d64 100644
--- a/translations/ko-KR/content/rest/reference/permissions-required-for-github-apps.md
+++ b/translations/ko-KR/content/rest/reference/permissions-required-for-github-apps.md
@@ -186,7 +186,7 @@ _Branches_
- [`POST /repos/:owner/:repo/branches/:branch/protection/required_signatures`](/v3/repos/branches/#create-commit-signature-protection) (:write)
- [`DELETE /repos/:owner/:repo/branches/:branch/protection/required_signatures`](/v3/repos/branches/#delete-commit-signature-protection) (:write)
- [`GET /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/v3/repos/branches/#get-status-checks-protection) (:read)
-- [`PATCH /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/v3/repos/branches/#update-status-check-potection) (:write)
+- [`PATCH /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/v3/repos/branches/#update-status-check-protection) (:write)
- [`DELETE /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/v3/repos/branches/#remove-status-check-protection) (:write)
- [`GET /repos/:owner/:repo/branches/:branch/protection/required_status_checks/contexts`](/v3/repos/branches/#get-all-status-check-contexts) (:read)
- [`POST /repos/:owner/:repo/branches/:branch/protection/required_status_checks/contexts`](/v3/repos/branches/#add-status-check-contexts) (:write)
diff --git a/translations/ko-KR/data/glossaries/external.yml b/translations/ko-KR/data/glossaries/external.yml
index 533d7c41ad..acba35cda9 100644
--- a/translations/ko-KR/data/glossaries/external.yml
+++ b/translations/ko-KR/data/glossaries/external.yml
@@ -61,7 +61,7 @@
-
term: 분기
description: >-
- 분기는 리포지토리의 병렬 버전입니다. 리포지토리 내에 포함되어 있지만 기본 또는 마스터 브랜치에 영향을 주지 않으므로 "라이브" 버전을 방해하지 않고 자유롭게 작업할 수 있습니다. 변경한 경우 분기를 다시 마스터 브랜치에 병합하여 변경 내용을 게시할 수 있습니다.
+ A branch is a parallel version of a repository. It is contained within the repository, but does not affect the primary or main branch allowing you to work freely without disrupting the "live" version. When you've made the changes you want to make, you can merge your branch back into the main branch to publish your changes.
-
term: 분기 제한
description: >-
@@ -140,7 +140,8 @@
커밋을 수반하고 커밋이 도입하는 변경 내용을 전달하는 짧고 설명적인 텍스트입니다.
-
term: 비교 브랜치
- description: 끌어오기 요청을 만드는 데 사용하는 분기입니다. 이 분기는 끌어오기 요청에 대해 선택한 베이스 브랜치와 비교되며 변경 내용이 식별됩니다. 끌어오기 요청이 병합되면 베이스 브랜치가 비교 브랜치의 변경 내용으로 업데이트됩니다. 끌어오기 요청의 "헤드 브랜치"라고도 합니다.
+ description: >-
+ 끌어오기 요청을 만드는 데 사용하는 분기입니다. 이 분기는 끌어오기 요청에 대해 선택한 베이스 브랜치와 비교되며 변경 내용이 식별됩니다. 끌어오기 요청이 병합되면 베이스 브랜치가 비교 브랜치의 변경 내용으로 업데이트됩니다. 끌어오기 요청의 "헤드 브랜치"라고도 합니다.
-
term: 연속 통합
description: >-
@@ -386,10 +387,14 @@
-
term: 마크업
description: 문서에 주석을 달고 서식을 지정하는 시스템입니다.
+-
+ term: main
+ description: >-
+ The default development branch. Whenever you create a Git repository, a branch named "main" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required.
-
term: master
description: >-
- 기본 개발 분기입니다. Git 리포지토리를 만들 때마다 "master"라는 분기가 만들어지고 활성 분기가 됩니다. 대부분의 경우 순전히 관례적인 것이고 필수는 아니지만 로컬 개발을 포함합니다.
+ The default branch in many Git repositories. By default, when you create a new Git repository on the command line a branch called `master` is created. Many tools now use an alternative name for the default branch. For example, when you create a new repository on GitHub the default branch is called `main`.
-
term: 구성원 그래프
description: 리포지토리의 모든 포크를 표시하는 리포지토리 그래프입니다.
diff --git a/translations/ko-KR/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml b/translations/ko-KR/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
index 92b91f6add..7ad2acba59 100644
--- a/translations/ko-KR/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
+++ b/translations/ko-KR/data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml
@@ -70,20 +70,6 @@ upcoming_changes:
date: '2020-10-01T00:00:00+00:00'
criticality: breaking
owner: mikesea
- -
- location: RepositoryCollaboratorEdge.permission
- description: Type for `permission` will change from `RepositoryPermission!` to `String`.
- reason: This field may return additional values
- date: '2020-10-01T00:00:00+00:00'
- criticality: breaking
- owner: oneill38
- -
- location: RepositoryInvitation.permission
- description: Type for `permission` will change from `RepositoryPermission!` to `String`.
- reason: This field may return additional values
- date: '2020-10-01T00:00:00+00:00'
- criticality: breaking
- owner: oneill38
-
location: RepositoryInvitationOrderField.INVITEE_LOGIN
description: "`INVITEE_LOGIN` will be removed."
@@ -98,13 +84,6 @@ upcoming_changes:
date: '2020-10-01T00:00:00+00:00'
criticality: breaking
owner: nholden
- -
- location: TeamRepositoryEdge.permission
- description: Type for `permission` will change from `RepositoryPermission!` to `String`.
- reason: This field may return additional values
- date: '2020-10-01T00:00:00+00:00'
- criticality: breaking
- owner: oneill38
-
location: EnterpriseMemberEdge.isUnlicensed
description: "`isUnlicensed` will be removed."
diff --git a/translations/ko-KR/data/graphql/graphql_upcoming_changes.public.yml b/translations/ko-KR/data/graphql/graphql_upcoming_changes.public.yml
index 767445fd44..c8040777f1 100644
--- a/translations/ko-KR/data/graphql/graphql_upcoming_changes.public.yml
+++ b/translations/ko-KR/data/graphql/graphql_upcoming_changes.public.yml
@@ -77,20 +77,6 @@ upcoming_changes:
date: '2020-10-01T00:00:00+00:00'
criticality: breaking
owner: mikesea
- -
- location: RepositoryCollaboratorEdge.permission
- description: Type for `permission` will change from `RepositoryPermission!` to `String`.
- reason: This field may return additional values
- date: '2020-10-01T00:00:00+00:00'
- criticality: breaking
- owner: oneill38
- -
- location: RepositoryInvitation.permission
- description: Type for `permission` will change from `RepositoryPermission!` to `String`.
- reason: This field may return additional values
- date: '2020-10-01T00:00:00+00:00'
- criticality: breaking
- owner: oneill38
-
location: RepositoryInvitationOrderField.INVITEE_LOGIN
description: "`INVITEE_LOGIN` will be removed."
@@ -105,13 +91,6 @@ upcoming_changes:
date: '2020-10-01T00:00:00+00:00'
criticality: breaking
owner: nholden
- -
- location: TeamRepositoryEdge.permission
- description: Type for `permission` will change from `RepositoryPermission!` to `String`.
- reason: This field may return additional values
- date: '2020-10-01T00:00:00+00:00'
- criticality: breaking
- owner: oneill38
-
location: EnterpriseMemberEdge.isUnlicensed
description: "`isUnlicensed` will be removed."
diff --git a/translations/ko-KR/data/reusables/actions/actions-use-policy-settings.md b/translations/ko-KR/data/reusables/actions/actions-use-policy-settings.md
index b25cd5eb26..02de83e2ef 100644
--- a/translations/ko-KR/data/reusables/actions/actions-use-policy-settings.md
+++ b/translations/ko-KR/data/reusables/actions/actions-use-policy-settings.md
@@ -1,3 +1,3 @@
-If you choose the option to **Allow specific actions**, there are additional options that you can configure. For more information, see "[Allowing specific actions to run](#allowing-specific-actions-to-run)."
+If you choose **Allow select actions**, local actions are allowed, and there are additional options for allowing other specific actions. For more information, see "[Allowing specific actions to run](#allowing-specific-actions-to-run)."
When you allow local actions only, the policy blocks all access to actions authored by {% data variables.product.prodname_dotcom %}. For example, the [`actions/checkout`](https://github.com/actions/checkout) would not be accessible.
\ No newline at end of file
diff --git a/translations/ko-KR/data/reusables/actions/allow-specific-actions-intro.md b/translations/ko-KR/data/reusables/actions/allow-specific-actions-intro.md
index 248668d773..d94816467d 100644
--- a/translations/ko-KR/data/reusables/actions/allow-specific-actions-intro.md
+++ b/translations/ko-KR/data/reusables/actions/allow-specific-actions-intro.md
@@ -1,4 +1,4 @@
-When you select the **Allow select actions**, there are additional options that you need to choose to configure the allowed actions:
+When you choose **Allow select actions**, local actions are allowed, and there are additional options for allowing other specific actions:
- **Allow actions created by {% data variables.product.prodname_dotcom %}:** You can allow all actions created by {% data variables.product.prodname_dotcom %} to be used by workflows. Actions created by {% data variables.product.prodname_dotcom %} are located in the `actions` and `github` organization. For more information, see the [`actions`](https://github.com/actions) and [`github`](https://github.com/github) organizations.
- **Allow Marketplace actions by verified creators:** You can allow all {% data variables.product.prodname_marketplace %} actions created by verified creators to be used by workflows. When GitHub has verified the creator of the action as a partner organization, the {% octicon "verified" aria-label="The verified badge" %} badge is displayed next to the action in {% data variables.product.prodname_marketplace %}.
diff --git a/translations/ko-KR/data/reusables/community/interaction-limits-duration.md b/translations/ko-KR/data/reusables/community/interaction-limits-duration.md
new file mode 100644
index 0000000000..fb858accd8
--- /dev/null
+++ b/translations/ko-KR/data/reusables/community/interaction-limits-duration.md
@@ -0,0 +1 @@
+When you enable an interaction limit, you can choose a duration for the limit: 24 hours, 3 days, 1 week, 1 month, or 6 months.
\ No newline at end of file
diff --git a/translations/ko-KR/data/reusables/community/interaction-limits-restrictions.md b/translations/ko-KR/data/reusables/community/interaction-limits-restrictions.md
new file mode 100644
index 0000000000..1be2648d16
--- /dev/null
+++ b/translations/ko-KR/data/reusables/community/interaction-limits-restrictions.md
@@ -0,0 +1 @@
+Enabling an interaction limit for a repository restricts certain users from commenting, opening issues, creating pull requests, reacting with emojis, editing existing comments, and editing titles of issues and pull requests.
\ No newline at end of file
diff --git a/translations/ko-KR/data/reusables/community/set-interaction-limit.md b/translations/ko-KR/data/reusables/community/set-interaction-limit.md
new file mode 100644
index 0000000000..468a068f70
--- /dev/null
+++ b/translations/ko-KR/data/reusables/community/set-interaction-limit.md
@@ -0,0 +1 @@
+5. Under "Temporary interaction limits", to the right of the type of interaction limit you want to set, use the **Enable** drop-down menu, then click the duration you want for your interaction limit.
\ No newline at end of file
diff --git a/translations/ko-KR/data/reusables/community/types-of-interaction-limits.md b/translations/ko-KR/data/reusables/community/types-of-interaction-limits.md
new file mode 100644
index 0000000000..67967a2fa2
--- /dev/null
+++ b/translations/ko-KR/data/reusables/community/types-of-interaction-limits.md
@@ -0,0 +1,4 @@
+There are three types of interaction limits.
+ - **Limit to existing users**: Limits activity for users with accounts that are less than 24 hours old who do not have prior contributions and are not collaborators.
+ - **Limit to prior contributors**: Limits activity for users who have not previously contributed to the default branch of the repository and are not collaborators.
+ - **Limit to repository collaborators**: Limits activity for users who do not have write access to the repository.
\ No newline at end of file
diff --git a/translations/ko-KR/data/reusables/dependabot/click-dependabot-tab.md b/translations/ko-KR/data/reusables/dependabot/click-dependabot-tab.md
index 2708240be3..90cff3fc19 100644
--- a/translations/ko-KR/data/reusables/dependabot/click-dependabot-tab.md
+++ b/translations/ko-KR/data/reusables/dependabot/click-dependabot-tab.md
@@ -1 +1 @@
-4. Under "Dependency graph", click **{% data variables.product.prodname_dependabot_short %}**. 
+4. Under "Dependency graph", click **{% data variables.product.prodname_dependabot %}**. 
diff --git a/translations/ko-KR/data/reusables/dependabot/default-labels.md b/translations/ko-KR/data/reusables/dependabot/default-labels.md
index 00fa428e67..9294fb86c1 100644
--- a/translations/ko-KR/data/reusables/dependabot/default-labels.md
+++ b/translations/ko-KR/data/reusables/dependabot/default-labels.md
@@ -1 +1 @@
-By default, {% data variables.product.prodname_dependabot %} raises all pull requests with the `dependencies` label. If more than one package manager is defined, {% data variables.product.prodname_dependabot_short %} includes an additional label on each pull request. This indicates which language or ecosystem the pull request will update, for example: `java` for Gradle updates and `submodules` for git submodule updates. {% data variables.product.prodname_dependabot %} creates these default labels automatically, as necessary in your repository.
+By default, {% data variables.product.prodname_dependabot %} raises all pull requests with the `dependencies` label. If more than one package manager is defined, {% data variables.product.prodname_dependabot %} includes an additional label on each pull request. This indicates which language or ecosystem the pull request will update, for example: `java` for Gradle updates and `submodules` for git submodule updates. {% data variables.product.prodname_dependabot %} creates these default labels automatically, as necessary in your repository.
diff --git a/translations/ko-KR/data/reusables/dependabot/initial-updates.md b/translations/ko-KR/data/reusables/dependabot/initial-updates.md
index 869d31ff84..fe4154576b 100644
--- a/translations/ko-KR/data/reusables/dependabot/initial-updates.md
+++ b/translations/ko-KR/data/reusables/dependabot/initial-updates.md
@@ -1,3 +1,3 @@
When you first enable version updates, you may have many dependencies that are outdated and some may be many versions behind the latest version. {% data variables.product.prodname_dependabot %} checks for outdated dependencies as soon as it's enabled. You may see new pull requests for version updates within minutes of adding the configuration file, depending on the number of manifest files for which you configure updates.
-To keep pull requests manageable and easy to review, {% data variables.product.prodname_dependabot_short %} raises a maximum of five pull requests to start bringing dependencies up to the latest version. If you merge some of these first pull requests before the next scheduled update, then further pull requests are opened up to a maximum of five (you can change this limit).
+To keep pull requests manageable and easy to review, {% data variables.product.prodname_dependabot %} raises a maximum of five pull requests to start bringing dependencies up to the latest version. If you merge some of these first pull requests before the next scheduled update, then further pull requests are opened up to a maximum of five (you can change this limit).
diff --git a/translations/ko-KR/data/reusables/dependabot/private-dependencies.md b/translations/ko-KR/data/reusables/dependabot/private-dependencies.md
index dfcbae9c73..717f1dbb97 100644
--- a/translations/ko-KR/data/reusables/dependabot/private-dependencies.md
+++ b/translations/ko-KR/data/reusables/dependabot/private-dependencies.md
@@ -1 +1 @@
-Currently, {% data variables.product.prodname_dependabot_version_updates %} doesn't support manifest or lock files that contain any private git dependencies or private git registries. This is because, when running version updates, {% data variables.product.prodname_dependabot_short %} must be able to resolve all dependencies from their source to verify that version updates have been successful.
+Currently, {% data variables.product.prodname_dependabot_version_updates %} doesn't support manifest or lock files that contain any private git dependencies or private git registries. This is because, when running version updates, {% data variables.product.prodname_dependabot %} must be able to resolve all dependencies from their source to verify that version updates have been successful.
diff --git a/translations/ko-KR/data/reusables/dependabot/pull-request-introduction.md b/translations/ko-KR/data/reusables/dependabot/pull-request-introduction.md
index 7494d21059..86b8dd0cf3 100644
--- a/translations/ko-KR/data/reusables/dependabot/pull-request-introduction.md
+++ b/translations/ko-KR/data/reusables/dependabot/pull-request-introduction.md
@@ -1 +1 @@
-{% data variables.product.prodname_dependabot %} raises pull requests to update dependencies. Depending on how your repository is configured, {% data variables.product.prodname_dependabot_short %} may raise pull requests for version updates and/or for security updates. You manage these pull requests in the same way as any other pull request, but there are also some extra commands available. For information about enabling {% data variables.product.prodname_dependabot %} dependency updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)" and "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)."
\ No newline at end of file
+{% data variables.product.prodname_dependabot %} raises pull requests to update dependencies. Depending on how your repository is configured, {% data variables.product.prodname_dependabot %} may raise pull requests for version updates and/or for security updates. You manage these pull requests in the same way as any other pull request, but there are also some extra commands available. For information about enabling {% data variables.product.prodname_dependabot %} dependency updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)" and "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)."
\ No newline at end of file
diff --git a/translations/ko-KR/data/reusables/dependabot/supported-package-managers.md b/translations/ko-KR/data/reusables/dependabot/supported-package-managers.md
index 4d60df37bb..fc99299bc2 100644
--- a/translations/ko-KR/data/reusables/dependabot/supported-package-managers.md
+++ b/translations/ko-KR/data/reusables/dependabot/supported-package-managers.md
@@ -18,12 +18,12 @@
{% note %}
-**Note**: {% data variables.product.prodname_dependabot_short %} also supports the following package managers:
+**Note**: {% data variables.product.prodname_dependabot %} also supports the following package managers:
-`yarn` (v1 only) (specify `npm`)
-`pipenv`, `pip-compile`, and `poetry` (specify `pip`)
-For example, if you use `poetry` to manage your Python dependencies and want {% data variables.product.prodname_dependabot_short %} to monitor your dependency manifest file for new versions, use `package-ecosystem: "pip"` in your *dependabot.yml* file.
+For example, if you use `poetry` to manage your Python dependencies and want {% data variables.product.prodname_dependabot %} to monitor your dependency manifest file for new versions, use `package-ecosystem: "pip"` in your *dependabot.yml* file.
{% endnote %}
diff --git a/translations/ko-KR/data/reusables/dependabot/version-updates-for-actions.md b/translations/ko-KR/data/reusables/dependabot/version-updates-for-actions.md
index 3b63e3586d..f00b76cfe2 100644
--- a/translations/ko-KR/data/reusables/dependabot/version-updates-for-actions.md
+++ b/translations/ko-KR/data/reusables/dependabot/version-updates-for-actions.md
@@ -1 +1 @@
-You can also enable {% data variables.product.prodname_dependabot_version_updates %} for the actions that you add to your workflow. For more information, see "[Keeping your actions up to date with {% data variables.product.prodname_dependabot %}](/github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot)."
+You can also enable {% data variables.product.prodname_dependabot_version_updates %} for the actions that you add to your workflow. For more information, see "[Keeping your actions up to date with {% data variables.product.prodname_dependabot %}](/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot)."
diff --git a/translations/ko-KR/data/reusables/github-actions/enabled-local-github-actions.md b/translations/ko-KR/data/reusables/github-actions/enabled-local-github-actions.md
index 2eedbc2de9..0043c8e960 100644
--- a/translations/ko-KR/data/reusables/github-actions/enabled-local-github-actions.md
+++ b/translations/ko-KR/data/reusables/github-actions/enabled-local-github-actions.md
@@ -1 +1 @@
-When you enable local actions only, workflows can only run actions located in your repository or organization.
+When you enable local actions only, workflows can only run actions located in your repository, organization, or enterprise.
diff --git a/translations/ko-KR/data/reusables/github-insights/contributors-tab.md b/translations/ko-KR/data/reusables/github-insights/contributors-tab.md
index f9d40b9246..d5d49a3ddf 100644
--- a/translations/ko-KR/data/reusables/github-insights/contributors-tab.md
+++ b/translations/ko-KR/data/reusables/github-insights/contributors-tab.md
@@ -1 +1 @@
-1. Under **{% octicon "gear" aria-label="The gear icon" %} Settings**, click **Contibutors**. 
+1. Under **{% octicon "gear" aria-label="The gear icon" %} Settings**, click **Contributors**. 
diff --git a/translations/ko-KR/data/reusables/marketplace/downgrade-marketplace-only.md b/translations/ko-KR/data/reusables/marketplace/downgrade-marketplace-only.md
index fe5ba60c5c..aac9c98294 100644
--- a/translations/ko-KR/data/reusables/marketplace/downgrade-marketplace-only.md
+++ b/translations/ko-KR/data/reusables/marketplace/downgrade-marketplace-only.md
@@ -1 +1 @@
-Canceling an app or downgrading an app to free does not affect your [other paid subcriptions](/articles/about-billing-on-github) on {% data variables.product.prodname_dotcom %}. If you want to cease all of your paid subscriptions on {% data variables.product.prodname_dotcom %}, you must downgrade each paid subscription separately.
+Canceling an app or downgrading an app to free does not affect your [other paid subscriptions](/articles/about-billing-on-github) on {% data variables.product.prodname_dotcom %}. If you want to cease all of your paid subscriptions on {% data variables.product.prodname_dotcom %}, you must downgrade each paid subscription separately.
diff --git a/translations/ko-KR/data/reusables/project-management/resync-automation.md b/translations/ko-KR/data/reusables/project-management/resync-automation.md
index a5281a26ff..38b2f7a9e8 100644
--- a/translations/ko-KR/data/reusables/project-management/resync-automation.md
+++ b/translations/ko-KR/data/reusables/project-management/resync-automation.md
@@ -1 +1 @@
-When you close a project board, any workflow automation configured for the project board will pause. If you reopen a project board, you have the option to sync automation, which updates the positon of the cards on the board according to the automation settings configured for the board. For more information, see "[Reopening a closed project board](/articles/reopening-a-closed-project-board)" or "[Closing a project board](/articles/closing-a-project-board)."
+When you close a project board, any workflow automation configured for the project board will pause. If you reopen a project board, you have the option to sync automation, which updates the position of the cards on the board according to the automation settings configured for the board. For more information, see "[Reopening a closed project board](/articles/reopening-a-closed-project-board)" or "[Closing a project board](/articles/closing-a-project-board)."
diff --git a/translations/ko-KR/data/reusables/pull_requests/re-request-review.md b/translations/ko-KR/data/reusables/pull_requests/re-request-review.md
new file mode 100644
index 0000000000..b04a7a46ce
--- /dev/null
+++ b/translations/ko-KR/data/reusables/pull_requests/re-request-review.md
@@ -0,0 +1 @@
+You can re-request a review, for example, after you've made substantial changes to your pull request. To request a fresh review from a reviewer, in the sidebar of the **Conversation** tab, click the {% octicon "sync" aria-label="The sync icon" %} icon.
diff --git a/translations/ko-KR/data/reusables/repositories/enable-security-alerts.md b/translations/ko-KR/data/reusables/repositories/enable-security-alerts.md
index 0a180f73ee..5381a8c1d1 100644
--- a/translations/ko-KR/data/reusables/repositories/enable-security-alerts.md
+++ b/translations/ko-KR/data/reusables/repositories/enable-security-alerts.md
@@ -1,4 +1,4 @@
{% if enterpriseServerVersions contains currentVersion %}
Your site administrator must enable
-{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies for {% data variables.product.product_location %} before you can use this feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."
+{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies for {% data variables.product.product_location %} before you can use this feature. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."
{% endif %}
diff --git a/translations/ko-KR/data/reusables/repositories/sidebar-dependabot-alerts.md b/translations/ko-KR/data/reusables/repositories/sidebar-dependabot-alerts.md
index b7eadd335c..58d37a45ad 100644
--- a/translations/ko-KR/data/reusables/repositories/sidebar-dependabot-alerts.md
+++ b/translations/ko-KR/data/reusables/repositories/sidebar-dependabot-alerts.md
@@ -1 +1 @@
-1. In the security sidebar, click **{% data variables.product.prodname_dependabot_short %} alerts**. 
+1. In the security sidebar, click **{% data variables.product.prodname_dependabot_alerts %}**. 
diff --git a/translations/ko-KR/data/reusables/support/ghae-priorities.md b/translations/ko-KR/data/reusables/support/ghae-priorities.md
index 5800af4b20..960a13b3b3 100644
--- a/translations/ko-KR/data/reusables/support/ghae-priorities.md
+++ b/translations/ko-KR/data/reusables/support/ghae-priorities.md
@@ -1,6 +1,6 @@
-| Priority | 설명 | 예시 |
-|:---------------------------------------------------------------------:| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| {% data variables.product.support_ticket_priority_urgent %} - Sev A | {% data variables.product.product_name %} is inaccessible or failing entirely, and the failure directly impacts the operation of your business.
_After you file a support ticket, reach out to {% data variables.contact.github_support %} via phone._ | - Errors or outages that affect core Git or web application functionality for all users
- Severe network or performance degradation for majority of users
- Full or rapidly filling storage
- Known security incidents or a breach of access
|
-| {% data variables.product.support_ticket_priority_high %} - Sev B | {% data variables.product.product_name %} is failing in a production environment, with limited impact to your business processes, or only affecting certain customers. | - Performance degradation that reduces productivity for many users
- Reduced redundancy concerns from failures or service degradation
- Production-impacting bugs or errors
- {% data variables.product.product_name %} configuraton security concerns
|
-| {% data variables.product.support_ticket_priority_normal %} - Sev C | {% data variables.product.product_name %} is experiencing limited or moderate issues and errors with {% data variables.product.product_name %}, or you have general concerns or questions about the operation of {% data variables.product.product_name %}. | - Problems in a test or staging environment
- Advice on using {% data variables.product.prodname_dotcom %} APIs and features, or questions about integrating business workflows
- Issues with user tools and data collection methods
- 업그레이드
- Bug reports, general security questions, or other feature related questions
|
-| {% data variables.product.support_ticket_priority_low %} - Sev D | {% data variables.product.product_name %} is functioning as expected, however, you have a question or suggestion about {% data variables.product.product_name %} that is not time-sensitive, or does not otherwise block the productivity of your team. | - Feature requests and product feedback
- General questions on overall configuration or use of {% data variables.product.product_name %}
- Notifying {% data variables.contact.github_support %} of any planned changes
|
+| Priority | 설명 | 예시 |
+|:---------------------------------------------------------------------:| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| {% data variables.product.support_ticket_priority_urgent %} - Sev A | {% data variables.product.product_name %} is inaccessible or failing entirely, and the failure directly impacts the operation of your business.
_After you file a support ticket, reach out to {% data variables.contact.github_support %} via phone._ | - Errors or outages that affect core Git or web application functionality for all users
- Severe network or performance degradation for majority of users
- Full or rapidly filling storage
- Known security incidents or a breach of access
|
+| {% data variables.product.support_ticket_priority_high %} - Sev B | {% data variables.product.product_name %} is failing in a production environment, with limited impact to your business processes, or only affecting certain customers. | - Performance degradation that reduces productivity for many users
- Reduced redundancy concerns from failures or service degradation
- Production-impacting bugs or errors
- {% data variables.product.product_name %} configuraton security concerns
|
+| {% data variables.product.support_ticket_priority_normal %} - Sev C | {% data variables.product.product_name %} is experiencing limited or moderate issues and errors with {% data variables.product.product_name %}, or you have general concerns or questions about the operation of {% data variables.product.product_name %}. | - Advice on using {% data variables.product.prodname_dotcom %} APIs and features, or questions about integrating business workflows
- Issues with user tools and data collection methods
- 업그레이드
- Bug reports, general security questions, or other feature related questions
|
+| {% data variables.product.support_ticket_priority_low %} - Sev D | {% data variables.product.product_name %} is functioning as expected, however, you have a question or suggestion about {% data variables.product.product_name %} that is not time-sensitive, or does not otherwise block the productivity of your team. | - Feature requests and product feedback
- General questions on overall configuration or use of {% data variables.product.product_name %}
- Notifying {% data variables.contact.github_support %} of any planned changes
|
diff --git a/translations/ko-KR/data/reusables/webhooks/installation_properties.md b/translations/ko-KR/data/reusables/webhooks/installation_properties.md
index 3fcb44fc5b..e07e5367d5 100644
--- a/translations/ko-KR/data/reusables/webhooks/installation_properties.md
+++ b/translations/ko-KR/data/reusables/webhooks/installation_properties.md
@@ -1,4 +1,4 @@
| 키 | 유형 | 설명 |
| -------------- | ------- | ---------------------------------------------------------------------- |
| `동작` | `문자열` | The action that was performed. Can be one of:- `created` - Someone installs a {% data variables.product.prodname_github_app %}.
- `deleted` - Someone uninstalls a {% data variables.product.prodname_github_app %}
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" or currentVersion == "github-ae@latest" %}- `suspend` - Someone suspends a {% data variables.product.prodname_github_app %} installation.
- `unsuspend` - Someone unsuspends a {% data variables.product.prodname_github_app %} installation.
{% endif %}- `new_permissions_accepted` - Someone accepts new permissions for a {% data variables.product.prodname_github_app %} installation. When a {% data variables.product.prodname_github_app %} owner requests new permissions, the person who installed the {% data variables.product.prodname_github_app %} must accept the new permissions request.
|
-| `repositories` | `array` | An array of repository objects that the insatllation can access. |
+| `repositories` | `array` | An array of repository objects that the installation can access. |
diff --git a/translations/ko-KR/data/reusables/webhooks/member_webhook_properties.md b/translations/ko-KR/data/reusables/webhooks/member_webhook_properties.md
index d03ca487bd..fc28741215 100644
--- a/translations/ko-KR/data/reusables/webhooks/member_webhook_properties.md
+++ b/translations/ko-KR/data/reusables/webhooks/member_webhook_properties.md
@@ -1,3 +1,3 @@
| 키 | 유형 | 설명 |
| ---- | ----- | ---------------------------------------------------------------------- |
-| `동작` | `문자열` | The action that was performed. Can be one of:- `added` - A user accepts an invitation to a repository.
- `removed` - A user is removed as a collaborator in a repository.
- `edited` - A user's collaborator permissios have changed.
|
+| `동작` | `문자열` | The action that was performed. Can be one of:- `added` - A user accepts an invitation to a repository.
- `removed` - A user is removed as a collaborator in a repository.
- `edited` - A user's collaborator permissions have changed.
|
diff --git a/translations/ko-KR/data/reusables/webhooks/ping_short_desc.md b/translations/ko-KR/data/reusables/webhooks/ping_short_desc.md
index 139c6735e2..4ef916b7b9 100644
--- a/translations/ko-KR/data/reusables/webhooks/ping_short_desc.md
+++ b/translations/ko-KR/data/reusables/webhooks/ping_short_desc.md
@@ -1 +1 @@
-When you create a new webhook, we'll send you a simple `ping` event to let you know you've set up the webhook correctly. This event isnt stored so it isn't retrievable via the [Events API](/rest/reference/activity#ping-a-repository-webhook) endpoint.
+When you create a new webhook, we'll send you a simple `ping` event to let you know you've set up the webhook correctly. This event isn't stored so it isn't retrievable via the [Events API](/rest/reference/activity#ping-a-repository-webhook) endpoint.
diff --git a/translations/ko-KR/data/reusables/webhooks/repo_desc.md b/translations/ko-KR/data/reusables/webhooks/repo_desc.md
index 27cc4f74c0..df26fb3e7a 100644
--- a/translations/ko-KR/data/reusables/webhooks/repo_desc.md
+++ b/translations/ko-KR/data/reusables/webhooks/repo_desc.md
@@ -1 +1 @@
-`repository` | `object` | The [`repository`](/v3/repos/#get-a-repository) where the event occured.
+`repository` | `object` | The [`repository`](/v3/repos/#get-a-repository) where the event occurred.
diff --git a/translations/ko-KR/data/reusables/webhooks/repository_vulnerability_alert_short_desc.md b/translations/ko-KR/data/reusables/webhooks/repository_vulnerability_alert_short_desc.md
index 635c979d78..00324e3dc1 100644
--- a/translations/ko-KR/data/reusables/webhooks/repository_vulnerability_alert_short_desc.md
+++ b/translations/ko-KR/data/reusables/webhooks/repository_vulnerability_alert_short_desc.md
@@ -1 +1 @@
-Activity related to security vulnerability alerts in a repository. {% data reusables.webhooks.action_type_desc %} For more information, see the "[About security alerts for vulerable dependencies](/github/managing-security-vulnerabilities/about-security-alerts-for-vulnerable-dependencies)".
+Activity related to security vulnerability alerts in a repository. {% data reusables.webhooks.action_type_desc %} For more information, see the "[About security alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-security-alerts-for-vulnerable-dependencies)".
diff --git a/translations/ko-KR/data/ui.yml b/translations/ko-KR/data/ui.yml
index 128a395bf1..678ce9a66a 100644
--- a/translations/ko-KR/data/ui.yml
+++ b/translations/ko-KR/data/ui.yml
@@ -15,8 +15,9 @@ homepage:
version_picker: 버전
toc:
getting_started: 시작하기
- popular_articles: 인기 문서
+ popular_articles: Popular
guides: 안내서
+ whats_new: What's new
pages:
article_version: "문서 버전:"
miniToc: 기사 내용
@@ -118,3 +119,6 @@ footer:
careers: 채용
press: 보도 자료
shop: 쇼핑
+product_landing:
+ quick_start: Quickstart
+ reference_guides: Reference guides
diff --git a/translations/ko-KR/data/variables/product.yml b/translations/ko-KR/data/variables/product.yml
index 6ceff481ea..987063a361 100644
--- a/translations/ko-KR/data/variables/product.yml
+++ b/translations/ko-KR/data/variables/product.yml
@@ -118,11 +118,10 @@ prodname_vscode: 'Visual Studio Code'
prodname_vss_ghe: 'Visual Studio subscription with GitHub Enterprise'
prodname_vss_admin_portal_with_url: 'the [administrator portal for Visual Studio subscriptions](https://visualstudio.microsoft.com/subscriptions-administration/)'
#GitHub Dependabot
-prodname_dependabot: 'GitHub Dependabot'
-prodname_dependabot_short: 'Dependabot'
-prodname_dependabot_alerts: 'GitHub Dependabot alerts'
-prodname_dependabot_security_updates: 'GitHub Dependabot security updates'
-prodname_dependabot_version_updates: 'GitHub Dependabot version updates'
+prodname_dependabot: 'Dependabot'
+prodname_dependabot_alerts: 'Dependabot alerts'
+prodname_dependabot_security_updates: 'Dependabot security updates'
+prodname_dependabot_version_updates: 'Dependabot version updates'
#GitHub Archive Program
prodname_archive: 'GitHub Archive Program'
prodname_arctic_vault: 'Arctic Code Vault'
diff --git a/translations/pt-BR/content/actions/guides/building-and-testing-nodejs.md b/translations/pt-BR/content/actions/guides/building-and-testing-nodejs.md
index a7fa1605cc..2c2dad9f3a 100644
--- a/translations/pt-BR/content/actions/guides/building-and-testing-nodejs.md
+++ b/translations/pt-BR/content/actions/guides/building-and-testing-nodejs.md
@@ -34,28 +34,28 @@ Para iniciar rapidamente, adicione o modelo ao diretório `.github/workflows` do
{% raw %}
```yaml{:copy}
-Nome: Node.js CI
+name: Node.js CI
-em: [push]
+on: [push]
-trabalhos:
- criar:
+jobs:
+ build:
runs-on: ubuntu-latest
- estratégia:
- matriz:
+ strategy:
+ matrix:
node-version: [8.x, 10.x, 12.x]
- etapas:
- - usa: actions/checkout@v2
- - nome: Use Node.js ${{ matrix.node-version }}
- usa: actions/setup-node@v1
- com:
+ steps:
+ - uses: actions/checkout@v2
+ - name: Use Node.js ${{ matrix.node-version }}
+ uses: actions/setup-node@v1
+ with:
node-version: ${{ matrix.node-version }}
- - executa: npm install
- - executa: npm run build --if-present
- - executa: npm test
+ - run: npm install
+ - run: npm run build --if-present
+ - run: npm test
env:
CI: true
```
@@ -75,15 +75,15 @@ Cada trabalho pode acessar o valor definido na matriz `node-version` usando o co
{% raw %}
```yaml
-estratégia:
- matriz:
+strategy:
+ matrix:
node-version: [8.x, 10.x, 12.x]
-etapas:
-- usa: actions/checkout@v2
-- Nome: Use Node.js ${{ matrix.node-version }}
- usa: actions/setup-node@v1
- com:
+steps:
+- uses: actions/checkout@v2
+- name: Use Node.js ${{ matrix.node-version }}
+ uses: actions/setup-node@v1
+ with:
node-version: ${{ matrix.node-version }}
```
{% endraw %}
@@ -100,24 +100,24 @@ Você também pode criar e testar usando uma versão única do Node.js.
{% raw %}
```yaml
-Nome: Node.js CI
+name: Node.js CI
-em: [push]
+on: [push]
-trabalhos:
- criar:
+jobs:
+ build:
runs-on: ubuntu-latest
- etapas:
- - usa: actions/checkout@v2
- - Nome: Usa o Node.js
- usa: actions/setup-node@v1
- com:
+ steps:
+ - uses: actions/checkout@v2
+ - name: Use Node.js
+ uses: actions/setup-node@v1
+ with:
node-version: '12.x'
- - executar: npm install
- - executar: npm run build --if-present
- - executar: npm test
+ - run: npm install
+ - run: npm run build --if-present
+ - run: npm test
env:
CI: true
```
@@ -136,28 +136,28 @@ Você também pode memorizar as dependências para acelerar seu fluxo de trabalh
Este exemplo instala as dependências definidas no arquivo *package.json*. Para obter mais informações, consulte [`instalação do npm`](https://docs.npmjs.com/cli/install).
```yaml
-etapas:
-- usa: actions/checkout@v2
-- nome: Use Node.js
- usa: actions/setup-node@v1
- com:
+steps:
+- uses: actions/checkout@v2
+- name: Use Node.js
+ uses: actions/setup-node@v1
+ with:
node-version: '12.x'
-- nome: Instalar dependências
- executar: npm install
+- name: Install dependencies
+ run: npm install
```
O uso do `npm ci` instala as versões no arquivo *package-lock.json* ou *npm-shrinkwrap.json* e impede as atualizações do arquivo de bloqueio. Usar `npm ci` geralmente é mais rápido que executar a `instalação do npm`. Para obter mais informações, consulte [`npm ci`](https://docs.npmjs.com/cli/ci.html) e "[Introduzindo `npm` para criações mais rápidas e confiáveis](https://blog.npmjs.org/post/171556855892/introducing-npm-ci-for-faster-more-reliable)".
{% raw %}
```yaml
-etapas:
-- usa: actions/checkout@v2
-- nome: Use Node.js
- usa: actions/setup-node@v1
- com:
+steps:
+- uses: actions/checkout@v2
+- name: Use Node.js
+ uses: actions/setup-node@v1
+ with:
node-version: '12.x'
-- nome: Instalar dependências
- executar: npm ci
+- name: Install dependencies
+ run: npm ci
```
{% endraw %}
@@ -166,27 +166,27 @@ etapas:
Este exemplo instala as dependências definidas no arquivo *package.json*. Para obter mais informações, consulte [`instalação do yarn`](https://yarnpkg.com/en/docs/cli/install).
```yaml
-etapas:
-- usa: actions/checkout@v2
-- nome: Use Node.js
- usa: actions/setup-node@v1
- com:
+steps:
+- uses: actions/checkout@v2
+- name: Use Node.js
+ uses: actions/setup-node@v1
+ with:
node-version: '12.x'
-- nome: Instalar dependências
- executar: yarn
+- name: Install dependencies
+ run: yarn
```
Como alternativa, você pode aprovar o `--frozen-lockfile` para instalar as versões no arquivo *yarn.lock* e impedir atualizações no arquivo *yarn.lock*.
```yaml
-etapas:
-- usa: actions/checkout@v2
-- nome: Use Node.js
- usa: actions/setup-node@v1
- com:
+steps:
+- uses: actions/checkout@v2
+- name: Use Node.js
+ uses: actions/setup-node@v1
+ with:
node-version: '12.x'
-- nome: Instalar dependências
- executar: yarn --frozen-lockfile
+- name: Install dependencies
+ run: yarn --frozen-lockfile
```
#### Exemplo do uso de um registro privado e de criação o arquivo .npmrc
@@ -201,17 +201,17 @@ Antes de instalar as dependências, use a ação `setup-node` para criar o arqui
{% raw %}
```yaml
-etapas:
-- usa: actions/checkout@v2
-- nome: Use Node.js
- usa: actions/setup-node@v1
- com:
+steps:
+- uses: actions/checkout@v2
+- name: Use Node.js
+ uses: actions/setup-node@v1
+ with:
always-auth: true
node-version: '12.x'
registry-url: https://registry.npmjs.org
- escopo: '@octocat'
-- nome: Instalar dependências
- executar: npm ci
+ scope: '@octocat'
+- name: Install dependencies
+ run: npm ci
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
```
@@ -231,23 +231,23 @@ Você pode memorizar dependências usando uma chave única e restaurar as depend
{% raw %}
```yaml
-etapas:
-- usa: actions/checkout@v2
-- nome: Use Node.js
- usa: actions/setup-node@v1
- com:
+steps:
+- uses: actions/checkout@v2
+- name: Use Node.js
+ uses: actions/setup-node@v1
+ with:
node-version: '12.x'
-- nome: Cache Node.js modules
- usa: actions/cache@v2
- com:
- # Os arquivos da cache do npm estão armazenados em `~/.npm` no Linux/macOS
- caminho: ~/.npm
- chave: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
+- name: Cache Node.js modules
+ uses: actions/cache@v2
+ with:
+ # npm cache files are stored in `~/.npm` on Linux/macOS
+ path: ~/.npm
+ key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-
-- nome: Instalar dependências
- executar: npm ci
+- name: Install dependencies
+ run: npm ci
```
{% endraw %}
@@ -256,15 +256,15 @@ etapas:
Você pode usar os mesmos comandos usados localmente para criar e testar seu código. Por exemplo, se você executar `criação da execução do npm` para executar os passos de compilação definidos no seu arquivo *package.json* e o `teste do npm` para executar seu conjunto de testes, você adicionaria esses comandos no seu arquivo de fluxo de trabalho.
```yaml
-etapas:
-- usa: actions/checkout@v2
-- nome: Use Node.js
- usa: actions/setup-node@v1
- com:
+steps:
+- uses: actions/checkout@v2
+- name: Use Node.js
+ uses: actions/setup-node@v1
+ with:
node-version: '12.x'
-- executar: npm install
-- executar: npm run build --if-present
-- executar: npm test
+- run: npm install
+- run: npm run build --if-present
+- run: npm test
```
### Empacotar dados do fluxo de trabalho como artefatos
diff --git a/translations/pt-BR/content/actions/guides/building-and-testing-powershell.md b/translations/pt-BR/content/actions/guides/building-and-testing-powershell.md
new file mode 100644
index 0000000000..f1edb036d5
--- /dev/null
+++ b/translations/pt-BR/content/actions/guides/building-and-testing-powershell.md
@@ -0,0 +1,236 @@
+---
+title: Building and testing PowerShell
+intro: You can create a continuous integration (CI) workflow to build and test your PowerShell project.
+product: '{% data reusables.gated-features.actions %}'
+versions:
+ free-pro-team: '*'
+ enterprise-server: '>=2.22'
+---
+
+{% data reusables.actions.enterprise-beta %}
+{% data reusables.actions.enterprise-github-hosted-runners %}
+
+### Introdução
+
+This guide shows you how to use PowerShell for CI. It describes how to use Pester, install dependencies, test your module, and publish to the PowerShell Gallery.
+
+{% data variables.product.prodname_dotcom %}-hosted runners have a tools cache with pre-installed software, which includes PowerShell and Pester. For a full list of up-to-date software and the pre-installed versions of PowerShell and Pester, see "[Specifications for {% data variables.product.prodname_dotcom %}-hosted runners](/actions/reference/specifications-for-github-hosted-runners/#supported-software)".
+
+### Pré-requisitos
+
+Você deve estar familiarizado com o YAML e a sintaxe do {% data variables.product.prodname_actions %}. Para obter mais informações, consulte "[Aprenda {% data variables.product.prodname_actions %}](/actions/learn-github-actions)".
+
+We recommend that you have a basic understanding of PowerShell and Pester. Para obter mais informações, consulte:
+- [Getting started with PowerShell](https://docs.microsoft.com/powershell/scripting/learn/ps101/01-getting-started)
+- [Pester](https://pester.dev)
+
+{% data reusables.actions.enterprise-setup-prereq %}
+
+### Adding a workflow for Pester
+
+To automate your testing with PowerShell and Pester, you can add a workflow that runs every time a change is pushed to your repository. In the following example, `Test-Path` is used to check that a file called `resultsfile.log` is present.
+
+This example workflow file must be added to your repository's `.github/workflows/` directory:
+
+{% raw %}
+```yaml
+name: Test PowerShell on Ubuntu
+on: push
+
+jobs:
+ pester-test:
+ name: Pester test
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check out repository code
+ uses: actions/checkout@v2
+ - name: Perform a Pester test from the command-line
+ shell: pwsh
+ run: Test-Path resultsfile.log | Should -Be $true
+ - name: Perform a Pester test from the Tests.ps1 file
+ shell: pwsh
+ run: |
+ Invoke-Pester Unit.Tests.ps1 -Passthru
+```
+{% endraw %}
+
+* `shell: pwsh` - Configures the job to use PowerShell when running the `run` commands.
+* `run: Test-Path resultsfile.log` - Check whether a file called `resultsfile.log` is present in the repository's root directory.
+* `Should -Be $true` - Uses Pester to define an expected result. If the result is unexpected, then {% data variables.product.prodname_actions %} flags this as a failed test. Por exemplo:
+
+ 
+
+* `Invoke-Pester Unit.Tests.ps1 -Passthru` - Uses Pester to execute tests defined in a file called `Unit.Tests.ps1`. For example, to perform the same test described above, the `Unit.Tests.ps1` will contain the following:
+ ```
+ Describe "Check results file is present" {
+ It "Check results file is present" {
+ Test-Path resultsfile.log | Should -Be $true
+ }
+ }
+ ```
+
+### PowerShell module locations
+
+The table below describes the locations for various PowerShell modules in each {% data variables.product.prodname_dotcom %}-hosted runner.
+
+| | Ubuntu | macOS | Windows |
+| ----------------------------- | ------------------------------------------------ | ------------------------------------------------- | ------------------------------------------------------------ |
+| **PowerShell system modules** | `/opt/microsoft/powershell/7/Modules/*` | `/usr/local/microsoft/powershell/7/Modules/*` | `C:\program files\powershell\7\Modules\*` |
+| **PowerShell add-on modules** | `/usr/local/share/powershell/Modules/*` | `/usr/local/share/powershell/Modules/*` | `C:\Modules\*` |
+| **User-installed modules** | `/home/runner/.local/share/powershell/Modules/*` | `/Users/runner/.local/share/powershell/Modules/*` | `C:\Users\runneradmin\Documents\PowerShell\Modules\*` |
+
+### Instalar dependências
+
+{% data variables.product.prodname_dotcom %}-hosted runners have PowerShell 7 and Pester installed. You can use `Install-Module` to install additional dependencies from the PowerShell Gallery before building and testing your code.
+
+{% note %}
+
+**Note:** The pre-installed packages (such as Pester) used by {% data variables.product.prodname_dotcom %}-hosted runners are regularly updated, and can introduce significant changes. As a result, it is recommended that you always specify the required package versions by using `Install-Module` with `-MaximumVersion`.
+
+{% endnote %}
+
+Você também pode memorizar as dependências para acelerar seu fluxo de trabalho. Para obter mais informações, consulte "[Memorizando dependências para acelerar seu fluxo de trabalho](/actions/automating-your-workflow-with-github-actions/caching-dependencies-to-speed-up-workflows)".
+
+For example, the following job installs the `SqlServer` and `PSScriptAnalyzer` modules:
+
+{% raw %}
+```yaml
+jobs:
+ install-dependencies:
+ name: Install dependencies
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Install from PSGallery
+ shell: pwsh
+ run: |
+ Set-PSRepository PSGallery -InstallationPolicy Trusted
+ Install-Module SqlServer, PSScriptAnalyzer
+```
+{% endraw %}
+
+{% note %}
+
+**Note:** By default, no repositories are trusted by PowerShell. When installing modules from the PowerShell Gallery, you must explicitly set the installation policy for `PSGallery` to `Trusted`.
+
+{% endnote %}
+
+#### Memorizar dependências
+
+You can cache PowerShell dependencies using a unique key, which allows you to restore the dependencies for future workflows with the [`cache`](https://github.com/marketplace/actions/cache) action. Para obter mais informações, consulte "[Memorizando dependências para acelerar fluxos de trabalho](/actions/automating-your-workflow-with-github-actions/caching-dependencies-to-speed-up-workflows)".
+
+PowerShell caches its dependencies in different locations, depending on the runner's operating system. For example, the `path` location used in the following Ubuntu example will be different for a Windows operating system.
+
+{% raw %}
+```yaml
+steps:
+ - uses: actions/checkout@v2
+ - name: Setup PowerShell module cache
+ id: cacher
+ uses: actions/cache@v2
+ with:
+ path: "~/.local/share/powershell/Modules"
+ key: ${{ runner.os }}-SqlServer-PSScriptAnalyzer
+ - name: Install required PowerShell modules
+ if: steps.cacher.outputs.cache-hit != 'true'
+ shell: pwsh
+ run: |
+ Set-PSRepository PSGallery -InstallationPolicy Trusted
+ Install-Module SqlServer, PSScriptAnalyzer -ErrorAction Stop
+```
+{% endraw %}
+
+### Testar seu código
+
+Você pode usar os mesmos comandos usados localmente para criar e testar seu código.
+
+#### Using PSScriptAnalyzer to lint code
+
+The following example installs `PSScriptAnalyzer` and uses it to lint all `ps1` files in the repository. For more information, see [PSScriptAnalyzer on GitHub](https://github.com/PowerShell/PSScriptAnalyzer).
+
+{% raw %}
+```yaml
+ lint-with-PSScriptAnalyzer:
+ name: Install and run PSScriptAnalyzer
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Install PSScriptAnalyzer module
+ shell: pwsh
+ run: |
+ Set-PSRepository PSGallery -InstallationPolicy Trusted
+ Install-Module PSScriptAnalyzer -ErrorAction Stop
+ - name: Lint with PSScriptAnalyzer
+ shell: pwsh
+ run: |
+ Invoke-ScriptAnalyzer -Path *.ps1 -Recurse -Outvariable issues
+ $errors = $issues.Where({$_.Severity -eq 'Error'})
+ $warnings = $issues.Where({$_.Severity -eq 'Warning'})
+ if ($errors) {
+ Write-Error "There were $($errors.Count) errors and $($warnings.Count) warnings total." -ErrorAction Stop
+ } else {
+ Write-Output "There were $($errors.Count) errors and $($warnings.Count) warnings total."
+ }
+```
+{% endraw %}
+
+### Empacotar dados do fluxo de trabalho como artefatos
+
+Você pode fazer o upload de artefatos para visualização após a conclusão de um fluxo de trabalho. Por exemplo, é possível que você precise salvar os arquivos de registro, os despejos de núcleo, os resultados de teste ou capturas de tela. Para obter mais informações, consulte "[Dados recorrentes do fluxo de trabalho que usam artefatos](/github/automating-your-workflow-with-github-actions/persisting-workflow-data-using-artifacts)".
+
+The following example demonstrates how you can use the `upload-artifact` action to archive the test results received from `Invoke-Pester`. Para obter mais informações, consulte a ação <[`upload-artifact`](https://github.com/actions/upload-artifact).
+
+{% raw %}
+```yaml
+name: Upload artifact from Ubuntu
+
+on: [push]
+
+jobs:
+ upload-pester-results:
+ name: Run Pester and upload results
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Test with Pester
+ shell: pwsh
+ run: Invoke-Pester Unit.Tests.ps1 -Passthru | Export-CliXml -Path Unit.Tests.xml
+ - name: Upload test results
+ uses: actions/upload-artifact@v2
+ with:
+ name: ubuntu-Unit-Tests
+ path: Unit.Tests.xml
+ if: ${{ always() }}
+```
+{% endraw %}
+
+The `always()` function configures the job to continue processing even if there are test failures. For more information, see "[always](/actions/reference/context-and-expression-syntax-for-github-actions#always)."
+
+### Publishing to PowerShell Gallery
+
+You can configure your workflow to publish your PowerShell module to the PowerShell Gallery when your CI tests pass. You can use repository secrets to store any tokens or credentials needed to publish your package. Para obter mais informações, consulte "[Criando e usando segredos encriptados](/github/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)".
+
+The following example creates a package and uses `Publish-Module` to publish it to the PowerShell Gallery:
+
+{% raw %}
+```yaml
+name: Publish PowerShell Module
+
+on:
+ release:
+ types: [created]
+
+jobs:
+ publish-to-gallery:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Build and publish
+ env:
+ NUGET_KEY: ${{ secrets.NUGET_KEY }}
+ shell: pwsh
+ run: |
+ ./build.ps1 -Path /tmp/samplemodule
+ Publish-Module -Path /tmp/samplemodule -NuGetApiKey $env:NUGET_KEY -Verbose
+```
+{% endraw %}
diff --git a/translations/pt-BR/content/actions/guides/index.md b/translations/pt-BR/content/actions/guides/index.md
index 4f418b8601..f7e40ce2e9 100644
--- a/translations/pt-BR/content/actions/guides/index.md
+++ b/translations/pt-BR/content/actions/guides/index.md
@@ -29,6 +29,7 @@ Você pode usar o {% data variables.product.prodname_actions %} para criar fluxo
{% link_in_list /about-continuous-integration %}
{% link_in_list /setting-up-continuous-integration-using-workflow-templates %}
{% link_in_list /building-and-testing-nodejs %}
+{% link_in_list /building-and-testing-powershell %}
{% link_in_list /building-and-testing-python %}
{% link_in_list /building-and-testing-java-with-maven %}
{% link_in_list /building-and-testing-java-with-gradle %}
diff --git a/translations/pt-BR/content/actions/guides/storing-workflow-data-as-artifacts.md b/translations/pt-BR/content/actions/guides/storing-workflow-data-as-artifacts.md
index bf6b137692..2add474fe8 100644
--- a/translations/pt-BR/content/actions/guides/storing-workflow-data-as-artifacts.md
+++ b/translations/pt-BR/content/actions/guides/storing-workflow-data-as-artifacts.md
@@ -171,12 +171,12 @@ Os trabalhos que são dependentes de artefatos de um trabalho anterior devem agu
O Job 1 (Trabalho 1) executa estas etapas:
- Realiza um cálculo de correspondência e salva o resultado em um arquivo de texto denominado `math-homework.txt`.
-- Usa a ação `upload-artifact` para fazer upload do arquivo `math-homework.txt` com o nome `homework`. A ação coloca o arquivo em um diretório denominado `homework`.
+- Uses the `upload-artifact` action to upload the `math-homework.txt` file with the artifact name `homework`.
O Job 2 (Trabalho 2) usa o resultado do trabalho anterior:
- Baixa o artefato `homework` carregado no trabalho anterior. Por padrão, a ação `download-artifact` baixa artefatos no diretório da área de trabalho no qual a etapa está sendo executada. Você pode usar o parâmetro da entrada do `caminho` para especificar um diretório diferente para o download.
-- Lê o valor no arquivo `homework/math-homework.txt`, efetua um cálculo matemático e salva o resultado em `math-homework.txt`.
-- Faz upload do arquivo `math-homework.txt`. Esse upload sobrescreve o upload anterior, pois ambos compartilham o mesmo nome.
+- Reads the value in the `math-homework.txt` file, performs a math calculation, and saves the result to `math-homework.txt` again, overwriting its contents.
+- Faz upload do arquivo `math-homework.txt`. This upload overwrites the previously uploaded artifact because they share the same name.
O Job 3 (Trabalho 3) mostra o resultado carregado no trabalho anterior:
- Baixa o artefato `homework`.
diff --git a/translations/pt-BR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/translations/pt-BR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md
index 0bb625f174..b150d1d2b1 100644
--- a/translations/pt-BR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md
+++ b/translations/pt-BR/content/actions/hosting-your-own-runners/about-self-hosted-runners.md
@@ -111,6 +111,7 @@ Você deve garantir que a máquina tenha acesso adequado à rede para comunicar-
github.com
api.github.com
*.actions.githubusercontent.com
+codeload.github.com
```
Se você usar uma lista de endereços IP permitida para a sua a sua organização ou conta corporativa do {% data variables.product.prodname_dotcom %}, você deverá adicionar o endereço IP do executor auto-hospedado à lista de permissões. Para obter mais informações consulte "[Gerenciar endereços IP permitidos para a sua organização](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)" ou "[Aplicar as configurações de segurança na sua conta corporativa](/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account#using-github-actions-with-an-ip-allow-list)".
diff --git a/translations/pt-BR/content/actions/index.md b/translations/pt-BR/content/actions/index.md
index 727fb718a5..573d92de1a 100644
--- a/translations/pt-BR/content/actions/index.md
+++ b/translations/pt-BR/content/actions/index.md
@@ -4,17 +4,34 @@ shortTitle: GitHub Actions
intro: 'Automatize, personalize e execute seus fluxos de trabalho de desenvolvimento do software diretamente no seu repositório com o {% data variables.product.prodname_actions %}. Você pode descobrir, criar e compartilhar ações para realizar qualquer trabalho que desejar, incluindo CI/CD, bem como combinar ações em um fluxo de trabalho completamente personalizado.'
introLinks:
quickstart: /actions/quickstart
- learn: /actions/learn-github-actions
+ reference: /actions/reference
featuredLinks:
+ guides:
+ - /actions/guides/setting-up-continuous-integration-using-workflow-templates
+ - /actions/guides/about-packaging-with-github-actions
gettingStarted:
- /actions/managing-workflow-runs
- /actions/hosting-your-own-runners
- guide:
- - /actions/guides/setting-up-continuous-integration-using-workflow-templates
- - /actions/guides/about-packaging-with-github-actions
popular:
- /actions/reference/workflow-syntax-for-github-actions
- /actions/reference/events-that-trigger-workflows
+changelog:
+ -
+ title: Self-Hosted Runner Group Access Changes
+ date: '2020-10-16'
+ href: https://github.blog/changelog/2020-10-16-github-actions-self-hosted-runner-group-access-changes/
+ -
+ title: Ability to change retention days for artifacts and logs
+ date: '2020-10-08'
+ href: https://github.blog/changelog/2020-10-08-github-actions-ability-to-change-retention-days-for-artifacts-and-logs
+ -
+ title: Deprecating set-env and add-path commands
+ date: '2020-10-01'
+ href: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands
+ -
+ title: Fine-tune access to external actions
+ date: '2020-10-01'
+ href: https://github.blog/changelog/2020-10-01-github-actions-fine-tune-access-to-external-actions
redirect_from:
- /articles/automating-your-workflow-with-github-actions/
- /articles/customizing-your-project-with-github-actions/
@@ -36,44 +53,8 @@ versions:
-
-
-
-
- {% data ui.toc.guides %}
-
-
- {% for link in featuredLinks.guide %}
- - {% include featured-link %}
- {% endfor %}
-
-
-
-
-
- {% data ui.toc.popular_articles %}
-
-
- {% for link in featuredLinks.popular %}
- - {% include featured-link %}
- {% endfor %}
-
-
-
-
-
- Gerenciar fluxos de trabalho
-
-
- {% for link in featuredLinks.gettingStarted %}
- - {% include featured-link %}
- {% endfor %}
-
-
-
-
-
+
Mais guias
diff --git a/translations/pt-BR/content/actions/learn-github-actions/finding-and-customizing-actions.md b/translations/pt-BR/content/actions/learn-github-actions/finding-and-customizing-actions.md
index 27acef164a..7c7d0bac96 100644
--- a/translations/pt-BR/content/actions/learn-github-actions/finding-and-customizing-actions.md
+++ b/translations/pt-BR/content/actions/learn-github-actions/finding-and-customizing-actions.md
@@ -87,7 +87,7 @@ Para obter mais informações, consulte "[Usar o gerenciamento de versões para
### Usar entradas e saídas com uma ação
-Uma ação geralmente aceita ou exige entradas e gera saídas que você pode usar. Por exemplo, uma ação pode exigir que você especifique um caminho para um arquivo, o nome de uma etiqueta ou outros dados que usará como parte do processamento da ação.
+Uma ação geralmente aceita ou exige entradas e gera saídas que você pode usar. For example, an action might require you to specify a path to a file, the name of a label, or other data it will use as part of the action processing.
Para ver as entradas e saídas de uma ação, verifique a `action.yml` ou `action.yaml` no diretório-raiz do repositório.
diff --git a/translations/pt-BR/content/actions/learn-github-actions/index.md b/translations/pt-BR/content/actions/learn-github-actions/index.md
index 3d2262a1e5..d73bd6f854 100644
--- a/translations/pt-BR/content/actions/learn-github-actions/index.md
+++ b/translations/pt-BR/content/actions/learn-github-actions/index.md
@@ -36,7 +36,8 @@ versions:
{% link_with_intro /managing-complex-workflows %}
{% link_with_intro /sharing-workflows-with-your-organization %}
{% link_with_intro /security-hardening-for-github-actions %}
+{% link_with_intro /migrating-from-azure-pipelines-to-github-actions %}
{% link_with_intro /migrating-from-circleci-to-github-actions %}
{% link_with_intro /migrating-from-gitlab-cicd-to-github-actions %}
-{% link_with_intro /migrating-from-azure-pipelines-to-github-actions %}
{% link_with_intro /migrating-from-jenkins-to-github-actions %}
+{% link_with_intro /migrating-from-travis-ci-to-github-actions %}
\ No newline at end of file
diff --git a/translations/pt-BR/content/actions/learn-github-actions/introduction-to-github-actions.md b/translations/pt-BR/content/actions/learn-github-actions/introduction-to-github-actions.md
index 7e35c3df9a..e7ebf1d5c6 100644
--- a/translations/pt-BR/content/actions/learn-github-actions/introduction-to-github-actions.md
+++ b/translations/pt-BR/content/actions/learn-github-actions/introduction-to-github-actions.md
@@ -34,7 +34,7 @@ O fluxo de trabalho é um procedimento automatizado que você adiciona ao seu re
#### Eventos
-Um evento é uma atividade específica que aciona um fluxo de trabalho. Por exemplo, uma atividade pode originar de {% data variables.product.prodname_dotcom %} quando alguém faz o push de um commit em um repositório ou quando são criados um problema ou um pull request. Também é possível usar o webhook de envio de repositório para acionar um fluxo de trabalho quando ocorrer um evento externo. Para obter uma lista completa de eventos que podem ser usados para acionar fluxos de trabalho, consulte [Eventos que acionam fluxos de trabalho](/actions/reference/events-that-trigger-workflows).
+Um evento é uma atividade específica que aciona um fluxo de trabalho. Por exemplo, uma atividade pode originar de {% data variables.product.prodname_dotcom %} quando alguém faz o push de um commit em um repositório ou quando são criados um problema ou um pull request. You can also use the [repository dispatch webhook](/rest/reference/repos#create-a-repository-dispatch-event) to trigger a workflow when an external event occurs. Para obter uma lista completa de eventos que podem ser usados para acionar fluxos de trabalho, consulte [Eventos que acionam fluxos de trabalho](/actions/reference/events-that-trigger-workflows).
#### Trabalhos
diff --git a/translations/pt-BR/content/actions/learn-github-actions/managing-complex-workflows.md b/translations/pt-BR/content/actions/learn-github-actions/managing-complex-workflows.md
index 3f0a3b30be..95fa953742 100644
--- a/translations/pt-BR/content/actions/learn-github-actions/managing-complex-workflows.md
+++ b/translations/pt-BR/content/actions/learn-github-actions/managing-complex-workflows.md
@@ -24,12 +24,13 @@ Esta ação de exemplo demonstra como fazer referência a um segredo existente c
```yaml
jobs:
example-job:
+ runs-on: ubuntu-latest
steps:
- name: Retrieve secret
env:
super_secret: ${{ secrets.SUPERSECRET }}
run: |
- example-command "$SUPER_SECRET"
+ example-command "$super_secret"
```
{% endraw %}
@@ -49,6 +50,7 @@ jobs:
- run: ./setup_server.sh
build:
needs: setup
+ runs-on: ubuntu-latest
steps:
- run: ./build_server.sh
test:
@@ -141,7 +143,7 @@ Este exemplo mostra como um fluxo de trabalho pode usar etiquetas para especific
```yaml
jobs:
example-job:
- runs-on: [self-hosted, linux, x64, gpu]
+ runs-on: [self-hosted, linux, x64, gpu]
```
Para obter mais informações, consulte ["Usar etiquetas com executores auto-hospedados](/actions/hosting-your-own-runners/using-labels-with-self-hosted-runners)".
diff --git a/translations/pt-BR/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md b/translations/pt-BR/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md
index 6749f22026..8a1c8107ae 100644
--- a/translations/pt-BR/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md
+++ b/translations/pt-BR/content/actions/learn-github-actions/migrating-from-azure-pipelines-to-github-actions.md
@@ -41,7 +41,7 @@ Os trabalhos e as etapas no Azure Pipelines são muito semelhantes a trabalhos e
### Migrar etapas de script
-Você pode executar um script ou um comando de shell como uma etapa em um fluxo de trabalho. No Azure Pipelines, as etapas do script podem ser especificadas usando a chave `script`, ou usando as chaves `bash`, `powershell`, ou `pwsh`. É possível especificar os scripts como entrada para uma [tarefa de Bash](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/utility/bash?view=azure-devops) ou a como uma [tarefa de PowerShell](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/utility/powershell?view=azure-devops).
+Você pode executar um script ou um comando de shell como uma etapa em um fluxo de trabalho. No Azure Pipelines, as etapas do script podem ser especificadas usando a chave `script`, ou usando as chaves `bash`, `powershell`, ou `pwsh`. É possível especificar os scripts como entrada para uma [tarefa de Bash](https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/bash?view=azure-devops) ou a como uma [tarefa de PowerShell](https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/powershell?view=azure-devops).
Em {% data variables.product.prodname_actions %}, todos os scripts são especificados usando a chave `executar`. Para selecionar um shell específico, você pode especificar a chave `shell` ao fornecer o script. Para obter mais informações, consulte "[Sintaxe de fluxo de trabalho para o {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun)".
diff --git a/translations/pt-BR/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md b/translations/pt-BR/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
index 113166500d..19a18a6325 100644
--- a/translations/pt-BR/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
+++ b/translations/pt-BR/content/actions/learn-github-actions/migrating-from-gitlab-cicd-to-github-actions.md
@@ -180,7 +180,7 @@ GitLab CI/CD
deploy_prod:
stage: deploy
script:
- - echo "Deply to production server"
+ - echo "Deploy to production server"
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
```
@@ -194,7 +194,7 @@ jobs:
if: contains( github.ref, 'master')
runs-on: ubuntu-latest
steps:
- - run: echo "Deply to production server"
+ - run: echo "Deploy to production server"
```
{% endraw %}
diff --git a/translations/pt-BR/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md b/translations/pt-BR/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md
index 1bf9327f95..5fd8f915ad 100644
--- a/translations/pt-BR/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md
+++ b/translations/pt-BR/content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md
@@ -232,12 +232,19 @@ Fluxo de trabalho do {% data variables.product.prodname_actions %}
```yaml
pipeline {
- agent none
- stages {
- stage('Run Tests') {
- parallel {
- stage('Test On MacOS') {
- agent { label "macos" }
+agent none
+stages {
+ stage('Run Tests') {
+ matrix {
+ axes {
+ axis {
+ name: 'PLATFORM'
+ values: 'macos', 'linux'
+ }
+ }
+ agent { label "${PLATFORM}" }
+ stages {
+ stage('test') {
tools { nodejs "node-12" }
steps {
dir("scripts/myapp") {
@@ -246,19 +253,10 @@ pipeline {
}
}
}
- stage('Test On Linux') {
- agent { label "linux" }
- tools { nodejs "node-12" }
- steps {
- dir("script/myapp") {
- sh(script: "npm install -g bats")
- sh(script: "bats tests")
- }
- }
- }
}
}
}
+}
}
```
diff --git a/translations/pt-BR/content/actions/learn-github-actions/migrating-from-travis-ci-to-github-actions.md b/translations/pt-BR/content/actions/learn-github-actions/migrating-from-travis-ci-to-github-actions.md
new file mode 100644
index 0000000000..3f2ec972ac
--- /dev/null
+++ b/translations/pt-BR/content/actions/learn-github-actions/migrating-from-travis-ci-to-github-actions.md
@@ -0,0 +1,408 @@
+---
+title: Migrating from Travis CI to GitHub Actions
+intro: '{% data variables.product.prodname_actions %} and Travis CI share multiple similarities, which helps make it relatively straightforward to migrate to {% data variables.product.prodname_actions %}.'
+redirect_from:
+ - /actions/migrating-to-github-actions/migrating-from-travis-ci-to-github-actions
+versions:
+ free-pro-team: '*'
+ enterprise-server: '>=2.22'
+---
+
+### Introdução
+
+This guide helps you migrate from Travis CI to {% data variables.product.prodname_actions %}. It compares their concepts and syntax, describes the similarities, and demonstrates their different approaches to common tasks.
+
+### Before you start
+
+Before starting your migration to {% data variables.product.prodname_actions %}, it would be useful to become familiar with how it works:
+
+- For a quick example that demonstrates a {% data variables.product.prodname_actions %} job, see "[Quickstart for {% data variables.product.prodname_actions %}](/actions/quickstart)."
+- To learn the essential {% data variables.product.prodname_actions %} concepts, see "[Introduction to GitHub Actions](/actions/learn-github-actions/introduction-to-github-actions)."
+
+### Comparing job execution
+
+To give you control over when CI tasks are executed, a {% data variables.product.prodname_actions %} _workflow_ uses _jobs_ that run in parallel by default. Each job contains _steps_ that are executed in a sequence that you define. If you need to run setup and cleanup actions for a job, you can define steps in each job to perform these.
+
+### Key similarities
+
+{% data variables.product.prodname_actions %} and Travis CI share certain similarities, and understanding these ahead of time can help smooth the migration process.
+
+#### Using YAML syntax
+
+Travis CI and {% data variables.product.prodname_actions %} both use YAML to create jobs and workflows, and these files are stored in the code's repository. For more information on how {% data variables.product.prodname_actions %} uses YAML, see ["Creating a workflow file](/actions/learn-github-actions/introduction-to-github-actions#create-an-example-workflow)."
+
+#### Custom environment variables
+
+Travis CI lets you set environment variables and share them between stages. Similarly, {% data variables.product.prodname_actions %} lets you define environment variables for a step, job, or workflow. For more information, see ["Environment variables](/actions/reference/environment-variables)."
+
+#### Variáveis padrão de ambiente
+
+Travis CI and {% data variables.product.prodname_actions %} both include default environment variables that you can use in your YAML files. For {% data variables.product.prodname_actions %}, you can see these listed in "[Default environment variables](/actions/reference/environment-variables#default-environment-variables)."
+
+#### Processamento paralelo do trabalho
+
+Travis CI can use `stages` to run jobs in parallel. Similarly, {% data variables.product.prodname_actions %} runs `jobs` in parallel. For more information, see "[Creating dependent jobs](/actions/learn-github-actions/managing-complex-workflows#creating-dependent-jobs)."
+
+#### Status badges
+
+Travis CI and {% data variables.product.prodname_actions %} both support status badges, which let you indicate whether a build is passing or failing. For more information, see ["Adding a workflow status badge to your repository](/actions/managing-workflow-runs/adding-a-workflow-status-badge)."
+
+#### Usar uma matriz de criação
+
+Travis CI and {% data variables.product.prodname_actions %} both support a build matrix, allowing you to perform testing using combinations of operating systems and software packages. For more information, see "[Using a build matrix](/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix)."
+
+Below is an example comparing the syntax for each system:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+matrix:
+ include:
+ - rvm: 2.5
+ - rvm: 2.6.3
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+jobs:
+ build:
+ strategy:
+ matrix:
+ ruby: [2.5, 2.6.3]
+```
+{% endraw %}
+
+
+
+
+#### Targeting specific branches
+
+Travis CI and {% data variables.product.prodname_actions %} both allow you to target your CI to a specific branch. Para obter mais informações, consulte "[Sintaxe do fluxo de trabalho para o GitHub Actions](/actions/reference/workflow-syntax-for-github-actions#onpushpull_requestbranchestags)".
+
+Abaixo, há um exemplo da sintaxe para cada sistema:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+branches:
+ only:
+ - main
+ - 'mona/octocat'
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+on:
+ push:
+ branches:
+ - main
+ - 'mona/octocat'
+```
+{% endraw %}
+
+
+
+
+#### Checking out submodules
+
+Travis CI and {% data variables.product.prodname_actions %} both allow you to control whether submodules are included in the repository clone.
+
+Abaixo, há um exemplo da sintaxe para cada sistema:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+git:
+ submodules: false
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+ - uses: actions/checkout@v2
+ with:
+ submodules: false
+```
+{% endraw %}
+
+
+
+
+### Key features in {% data variables.product.prodname_actions %}
+
+When migrating from Travis CI, consider the following key features in {% data variables.product.prodname_actions %}:
+
+#### Armazenar segredos
+
+{% data variables.product.prodname_actions %} allows you to store secrets and reference them in your jobs. {% data variables.product.prodname_actions %} also includes policies that allow you to limit access to secrets at the repository and organization level. For more information, see "[Encrypted secrets](/actions/reference/encrypted-secrets)."
+
+#### Sharing files between jobs and workflows
+
+{% data variables.product.prodname_actions %} includes integrated support for artifact storage, allowing you to share files between jobs in a workflow. You can also save the resulting files and share them with other workflows. For more information, see "[Sharing data between jobs](/actions/learn-github-actions/essential-features-of-github-actions#sharing-data-between-jobs)."
+
+#### Hospedar seus próprios executores
+
+If your jobs require specific hardware or software, {% data variables.product.prodname_actions %} allows you to host your own runners and send your jobs to them for processing. {% data variables.product.prodname_actions %} also lets you use policies to control how these runners are accessed, granting access at the organization or repository level. For more information, see ["Hosting your own runners](/actions/hosting-your-own-runners)."
+
+#### Concurrent jobs and execution time
+
+The concurrent jobs and workflow execution times in {% data variables.product.prodname_actions %} can vary depending on your {% data variables.product.company_short %} plan. Para obter mais informações, consulte "[Limites de uso, cobrança e administração](/actions/reference/usage-limits-billing-and-administration)."
+
+#### Using different languages in {% data variables.product.prodname_actions %}
+
+When working with different languages in {% data variables.product.prodname_actions %}, you can create a step in your job to set up your language dependencies. For more information about working with a particular language, see the specific guide:
+ - [Criar e testar Node.js](/actions/guides/building-and-testing-nodejs)
+ - [Building and testing PowerShell](/actions/guides/building-and-testing-powershell)
+ - [Criar e testar o Python](/actions/guides/building-and-testing-python)
+ - [Criar e estar o Java com o Maven](/actions/guides/building-and-testing-java-with-maven)
+ - [Criar e estar o Java com o Gradle](/actions/guides/building-and-testing-java-with-gradle)
+ - [Criar e estar o Java com o Ant](/actions/guides/building-and-testing-java-with-ant)
+
+### Executing scripts
+
+{% data variables.product.prodname_actions %} can use `run` steps to run scripts or shell commands. To use a particular shell, you can specify the `shell` type when providing the path to the script. Para obter mais informações, consulte "[Sintaxe de fluxo de trabalho para o {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsrun)".
+
+Por exemplo:
+
+```yaml
+ steps:
+ - name: Run build script
+ run: ./.github/scripts/build.sh
+ shell: bash
+```
+
+### Error handling in {% data variables.product.prodname_actions %}
+
+When migrating to {% data variables.product.prodname_actions %}, there are different approaches to error handling that you might need to be aware of.
+
+#### Script error handling
+
+{% data variables.product.prodname_actions %} stops a job immediately if one of the steps returns an error code. Para obter mais informações, consulte "[Sintaxe de fluxo de trabalho para o {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference)".
+
+#### Job error handling
+
+{% data variables.product.prodname_actions %} uses `if` conditionals to execute jobs or steps in certain situations. For example, you can run a step when another step results in a `failure()`. Para obter mais informações, consulte "[Sintaxe de fluxo de trabalho para o {% data variables.product.prodname_actions %}](/actions/reference/workflow-syntax-for-github-actions#example-using-status-check-functions)". You can also use [`continue-on-error`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontinue-on-error) to prevent a workflow run from stopping when a job fails.
+
+### Migrating syntax for conditionals and expressions
+
+To run jobs under conditional expressions, Travis CI and {% data variables.product.prodname_actions %} share a similar `if` condition syntax. {% data variables.product.prodname_actions %} lets you use the `if` conditional to prevent a job or step from running unless a condition is met. Para obter mais informações, consulte "[Contexto e sintaxe de expressão para {% data variables.product.prodname_actions %}](/actions/reference/context-and-expression-syntax-for-github-actions)".
+
+This example demonstrates how an `if` conditional can control whether a step is executed:
+
+```yaml
+jobs:
+ conditional:
+ runs-on: ubuntu-latest
+ steps:
+ - run: echo "This step runs with str equals 'ABC' and num equals 123"
+ if: env.str == 'ABC' && env.num == 123
+```
+
+### Migrating phases to steps
+
+Where Travis CI uses _phases_ to run _steps_, {% data variables.product.prodname_actions %} has _steps_ which execute _actions_. You can find prebuilt actions in the [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?type=actions), or you can create your own actions. Para obter mais informações, consulte "[Criar ações](/actions/building-actions)".
+
+Abaixo, há um exemplo da sintaxe para cada sistema:
+
+
+
+
+Travis CI
+
+
+{% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+```yaml
+language: python
+python:
+ - "3.7"
+
+script:
+ - python script.py
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+trabalhos:
+ run_python:
+ runs-on: ubuntu-latest
+ etapas:
+ - usa: actions/setup-python@v2
+ com:
+ python-version: '3.7'
+ arquitetura: 'x64'
+ - executar: python script.py
+```
+{% endraw %}
+
+
+
+
+### Memorizar dependências
+
+Travis CI and {% data variables.product.prodname_actions %} let you manually cache dependencies for later reuse. This example demonstrates the cache syntax for each system.
+
+
+
+
+Travis CI
+
+
+GitHub Actions
+
+
+
+
+{% raw %}
+```yaml
+language: node_js
+cache: npm
+```
+{% endraw %}
+
+
+{% raw %}
+```yaml
+- nome: Módulos do nó da cache
+ usa: actions/cache@v2
+ com:
+ caminho: ~/.npm
+ key: v1-npm-deps-${{ hashFiles('**/package-lock.json') }}
+ restore-keys: v1-npm-deps-
+```
+{% endraw %}
+
+
+
+
+Para obter mais informações, consulte "[Memorizar dependências para acelerar fluxos de trabalho](/actions/guides/caching-dependencies-to-speed-up-workflows)".
+
+### Exemplos de tarefas comuns
+
+This section compares how {% data variables.product.prodname_actions %} and Travis CI perform common tasks.
+
+#### Configuring environment variables
+
+You can create custom environment variables in a {% data variables.product.prodname_actions %} job. Por exemplo:
+
+
+
+
+Travis CI
+
+
+Fluxo de trabalho do {% data variables.product.prodname_actions %}
+
+
+
+
+
+ ```yaml
+env:
+ - MAVEN_PATH="/usr/local/maven"
+ ```
+
+
+
+
+ ```yaml
+ jobs:
+ maven-build:
+ env:
+ MAVEN_PATH: '/usr/local/maven'
+ ```
+
+
+
+
+
+#### Building with Node.js
+
+
+
+
+Travis CI
+
+
+Fluxo de trabalho do {% data variables.product.prodname_actions %}
+
+
+
+
+{% raw %}
+ ```yaml
+install:
+ - npm install
+script:
+ - npm run build
+ - npm test
+ ```
+{% endraw %}
+
+
+{% raw %}
+ ```yaml
+name: Node.js CI
+on: [push]
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Use Node.js
+ uses: actions/setup-node@v1
+ with:
+ node-version: '12.x'
+ - run: npm install
+ - run: npm run build
+ - run: npm test
+ ```
+{% endraw %}
+
+
+
+
+### Próximas etapas
+
+To continue learning about the main features of {% data variables.product.prodname_actions %}, see "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)."
diff --git a/translations/pt-BR/content/actions/learn-github-actions/security-hardening-for-github-actions.md b/translations/pt-BR/content/actions/learn-github-actions/security-hardening-for-github-actions.md
index 99a20f95f1..3f579e27c2 100644
--- a/translations/pt-BR/content/actions/learn-github-actions/security-hardening-for-github-actions.md
+++ b/translations/pt-BR/content/actions/learn-github-actions/security-hardening-for-github-actions.md
@@ -26,7 +26,7 @@ Os segredos usam [caixas fechadas de Libsodium](https://libsodium.gitbook.io/doc
Para ajudar a prevenir a divulgação acidental, o {% data variables.product.product_name %} usa um mecanismo que tenta redigir quaisquer segredos que aparecem nos registros de execução. Esta redação procura correspondências exatas de quaisquer segredos configurados, bem como codificações comuns dos valores, como Base64. No entanto, como há várias maneiras de transformar o valor de um segredo, essa anulação não é garantida. Como resultado, existem certas etapas proativas e boas práticas que você deve seguir para ajudar a garantir que os segredos sejam editados, e para limitar outros riscos associados aos segredos:
- **Nunca usar dados estruturados como um segredo**
- - Os dados não estruturados podem fazer com que ocorra uma falha na redação secreta nos registros, porque a redação depende, em grande parte, de encontrar uma correspondência exata para o valor específico do segredo. Por exemplo, não use um blob de JSON, XML, ou YAML (ou similar) para encapsular o valor de um segredo, já que isso reduz significativamente a probabilidade de os segredos serem devidamente redigidos. Em vez disso, crie segredos individuais para cada valor sensível.
+ - Structured data can cause secret redaction within logs to fail, because redaction largely relies on finding an exact match for the specific secret value. Por exemplo, não use um blob de JSON, XML, ou YAML (ou similar) para encapsular o valor de um segredo, já que isso reduz significativamente a probabilidade de os segredos serem devidamente redigidos. Em vez disso, crie segredos individuais para cada valor sensível.
- **Registre todos os segredos usados nos fluxos de trabalho**
- Se um segredo for usado para gerar outro valor sensível dentro de um fluxo de trabalho, esse valor gerado deve ser formalmente [registrado como um segredo](https://github.com/actions/toolkit/tree/main/packages/core#setting-a-secret) para que seja reproduzido se alguma vez aparecer nos registros. Por exemplo, se, ao usar uma chave privada para gerar um JWT assinado para acessar uma API web, certifique-se de registrar que JWT é um segredo ou não será redigido se entrar na saída de do registro.
- O registro de segredos também aplica-se a qualquer tipo de transformação/codificação. Se seu segredo foi transformado de alguma forma (como Base64 ou URL codificada), certifique-se de registrar o novo valor como um segredo também.
@@ -98,7 +98,7 @@ Você também deve considerar o ambiente das máquinas de executores auto-hosped
### Auditar eventos de {% data variables.product.prodname_actions %}
-Você pode usar o log de auditoria para monitorar tarefas administrativas em uma organização. O log de auditoria registra o tipo de ação, quando foi executado e qual conta de usuário realizou a ação.
+Você pode usar o log de auditoria para monitorar tarefas administrativas em uma organização. The audit log records the type of action, when it was run, and which user account performed the action.
Por exemplo, você pode usar o log de auditoria para monitorar o evento de `action:org.update_actions_secret`, que controla as alterações nos segredos da organização: 
diff --git a/translations/pt-BR/content/actions/managing-workflow-runs/manually-running-a-workflow.md b/translations/pt-BR/content/actions/managing-workflow-runs/manually-running-a-workflow.md
index 02f16e6dcb..75661c7e25 100644
--- a/translations/pt-BR/content/actions/managing-workflow-runs/manually-running-a-workflow.md
+++ b/translations/pt-BR/content/actions/managing-workflow-runs/manually-running-a-workflow.md
@@ -10,7 +10,9 @@ versions:
{% data reusables.actions.enterprise-beta %}
{% data reusables.actions.enterprise-github-hosted-runners %}
-Para executar um fluxo de trabalho manualmente, o fluxo de trabalho deve ser configurado para ser executado no evento `workflow_dispatch`. Para obter mais informações, consulte "[Eventos que acionam fluxos de trabalho](/actions/reference/events-that-trigger-workflows)".
+### Configuring a workflow to run manually
+
+Para executar um fluxo de trabalho manualmente, o fluxo de trabalho deve ser configurado para ser executado no evento `workflow_dispatch`. For more information about configuring the `workflow_dispatch` event, see "[Events that trigger workflows](/actions/reference/events-that-trigger-workflows#workflow_dispatch)".
### Executar um fluxo de trabalho em {% data variables.product.prodname_dotcom %}
diff --git a/translations/pt-BR/content/actions/reference/encrypted-secrets.md b/translations/pt-BR/content/actions/reference/encrypted-secrets.md
index 587155dbdd..5efcfc19b5 100644
--- a/translations/pt-BR/content/actions/reference/encrypted-secrets.md
+++ b/translations/pt-BR/content/actions/reference/encrypted-secrets.md
@@ -105,7 +105,7 @@ steps:
```
{% endraw %}
-Evite a transmissão de segredos entre processos da linha de comando sempre que possível. Os processos da linha de comando podem ser visíveis para outros usuários (usando o comando `ps`) ou capturado por [eventos de auditoria de segurança](https://docs.microsoft.com/en-us/windows-server/identity/ad-ds/manage/component-updates/command-line-process-auditing). Para ajudar a proteger os segredos, considere o uso de variáveis de ambiente, `STDIN`, ou outros mecanismos compatíveis com o processo de destino.
+Evite a transmissão de segredos entre processos da linha de comando sempre que possível. Os processos da linha de comando podem ser visíveis para outros usuários (usando o comando `ps`) ou capturado por [eventos de auditoria de segurança](https://docs.microsoft.com/windows-server/identity/ad-ds/manage/component-updates/command-line-process-auditing). Para ajudar a proteger os segredos, considere o uso de variáveis de ambiente, `STDIN`, ou outros mecanismos compatíveis com o processo de destino.
Se você passar segredos dentro de uma linha de comando, inclua-os dentro das regras de aspas corretas. Muitas vezes, os segredos contêm caracteres especiais que não intencionalmente podem afetar o seu shell. Para escapar desses caracteres especiais, use aspas com suas variáveis de ambiente. Por exemplo:
diff --git a/translations/pt-BR/content/actions/reference/events-that-trigger-workflows.md b/translations/pt-BR/content/actions/reference/events-that-trigger-workflows.md
index 012d100427..0cc799e2f7 100644
--- a/translations/pt-BR/content/actions/reference/events-that-trigger-workflows.md
+++ b/translations/pt-BR/content/actions/reference/events-that-trigger-workflows.md
@@ -98,30 +98,39 @@ Você pode acionar manualmente uma execução de fluxo de trabalho usando a API
Para acionar o evento do webhook `workflow_dispatch` usando a API REST, você deve enviar uma solicitação `POST` para um ponto de extremidade da API do {% data variables.product.prodname_dotcom %} e fornecer o `ref` e qualquer `entrada` necessária. Para obter mais informações, consulte o ponto de extremidade da API REST "[Criar um evento de envio de fluxo de trabalho](/rest/reference/actions/#create-a-workflow-dispatch-event)".
+##### Exemplo
+
+To use the `workflow_dispatch` event, you need to include it as a trigger in your GitHub Actions workflow file. The example below only runs the workflow when it's manually triggered:
+
+```yaml
+on: workflow_dispatch
+```
+
##### Exemplo de configuração de fluxo de trabalho
-Este exemplo define o nome `` e `entradas de` domésticas e as imprime usando os contextos `github.event.inputs.name` e `github.event.inputs.home` . Se um `nome` não for fornecido, o valor padrão 'Mona, o Octocat' será impresso.
+Este exemplo define o nome `` e `entradas de` domésticas e as imprime usando os contextos `github.event.inputs.name` e `github.event.inputs.home` . If a `home` isn't provided, the default value 'The Octoverse' is printed.
{% raw %}
```yaml
-nome: Fluxo de trabalho acionado manualmente
-em:
- workflow_dispatch: entradas
- :
- nome:
- descrição: 'Pessoa para cumprimentar'
- necessário: verdadeiro
- padrão: 'Mona, o Octocat '
- casa:
- descrição: 'localização'
- necessário: falsos trabalhos de
+name: Manually triggered workflow
+on:
+ workflow_dispatch:
+ inputs:
+ name:
+ description: 'Person to greet'
+ required: true
+ default: 'Mona the Octocat'
+ home:
+ description: 'location'
+ required: false
+ default: 'The Octoverse'
-:
+jobs:
say_hello:
- run-on: ubuntu-mais recente
- passos:
- - executar: |
- eco "Olá ${{ github.event.inputs.name }}!"
+ runs-on: ubuntu-latest
+ steps:
+ - run: |
+ echo "Hello ${{ github.event.inputs.name }}!"
eco "- em ${{ github.event.inputs.home }}!"
```
{% endraw %}
@@ -314,6 +323,33 @@ on:
types: [created, deleted]
```
+The `issue_comment` event occurs for comments on both issues and pull requests. To determine whether the `issue_comment` event was triggered from an issue or pull request, you can check the event payload for the `issue.pull_request` property and use it as a condition to skip a job.
+
+For example, you can choose to run the `pr_commented` job when comment events occur in a pull request, and the `issue_commented` job when comment events occur in an issue.
+
+```yaml
+on: issue_comment
+
+jobs:
+ pr_commented:
+ # This job only runs for pull request comments
+ name: PR comment
+ if: ${{ github.event.issue.pull_request }}
+ runs-on: ubuntu-latest
+ steps:
+ - run: |
+ echo "Comment on PR #${{ github.event.issue.number }}"
+
+ issue-commented:
+ # This job only runs for issue comments
+ name: Issue comment
+ if: ${{ !github.event.issue.pull_request }}
+ runs-on: ubuntu-latest
+ steps:
+ - run: |
+ echo "Comment on issue #${{ github.event.issue.number }}"
+```
+
#### `Problemas`
Executa o fluxo de trabalho sempre que o evento `issues` ocorre. {% data reusables.developer-site.multiple_activity_types %} Para obter informações sobre a API REST, consulte "[problemas](/v3/issues)".
@@ -376,7 +412,7 @@ on:
#### `page_build`
-Executa o fluxo de trabalho sempre que alguém faz push em um branch habilitado para o {% data variables.product.product_name %} Pages, o que aciona o evento `page_build`. Para obter informações sobre a API REST, consulte "[Páginas](/rest/reference/repos#pages)".
+Executa o fluxo de trabalho sempre que alguém faz push em um branch habilitado para o {% data variables.product.product_name %} Pages, o que aciona o evento `page_build`. For information about the REST API, see "[Pages](/rest/reference/repos#pages)."
{% data reusables.github-actions.branch-requirement %}
@@ -655,6 +691,10 @@ on:
{% data reusables.webhooks.workflow_run_desc %}
+| Carga de evento webhook | Tipos de atividade | `GITHUB_SHA` | `GITHUB_REF` |
+| -------------------------------------------------------- | ------------------ | ------------------------------ | ------------- |
+| [`workflow_run`](/webhooks/event-payloads/#workflow_run) | - n/a | Último commit no branch padrão | Branch padrão |
+
Se precisar filtrar os branches desse evento, você poderá usar `branches` ou `branches-ignore`.
Neste exemplo, um fluxo de trabalho está configurado para ser executado separadamente após o fluxo de trabalho "Executar testes".
diff --git a/translations/pt-BR/content/actions/reference/specifications-for-github-hosted-runners.md b/translations/pt-BR/content/actions/reference/specifications-for-github-hosted-runners.md
index 7d3320c747..a919016587 100644
--- a/translations/pt-BR/content/actions/reference/specifications-for-github-hosted-runners.md
+++ b/translations/pt-BR/content/actions/reference/specifications-for-github-hosted-runners.md
@@ -29,7 +29,7 @@ Você pode especificar o tipo de executor para cada trabalho em um fluxo de trab
#### Hosts da nuvem para os executores hospedados em {% data variables.product.prodname_dotcom %}
-O {% data variables.product.prodname_dotcom %} hospeda executores do Linux e Windows no Standard_DS2_v2 máquinas virtuais no Microsoft Azure com o aplicativo do executor {% data variables.product.prodname_actions %} instalado. A o aplicativo do executor hospedado no {% data variables.product.prodname_dotcom %} é uma bifurcação do agente do Azure Pipelines. Os pacotes ICMP de entrada estão bloqueados para todas as máquinas virtuais do Azure. Portanto, é possível que os comandos ping ou traceroute não funcionem. Para obter mais informações sobre os recursos da máquina Standard_DS2_v2, consulte "[Dv2 e DSv2-series](https://docs.microsoft.com/en-us/azure/virtual-machines/dv2-dsv2-series#dsv2-series)" na documentação do Microsoft Azure.
+O {% data variables.product.prodname_dotcom %} hospeda executores do Linux e Windows no Standard_DS2_v2 máquinas virtuais no Microsoft Azure com o aplicativo do executor {% data variables.product.prodname_actions %} instalado. A o aplicativo do executor hospedado no {% data variables.product.prodname_dotcom %} é uma bifurcação do agente do Azure Pipelines. Os pacotes ICMP de entrada estão bloqueados para todas as máquinas virtuais do Azure. Portanto, é possível que os comandos ping ou traceroute não funcionem. Para obter mais informações sobre os recursos da máquina Standard_DS2_v2, consulte "[Dv2 e DSv2-series](https://docs.microsoft.com/azure/virtual-machines/dv2-dsv2-series#dsv2-series)" na documentação do Microsoft Azure.
O {% data variables.product.prodname_dotcom %} usa [MacStadium](https://www.macstadium.com/) para hospedar os executores do macOS.
@@ -37,7 +37,7 @@ O {% data variables.product.prodname_dotcom %} usa [MacStadium](https://www.macs
As máquinas virtuais Linux e macOS executam usando autenticação sem senha `sudo`. Quando precisar executar comandos ou instalar ferramentas que exigem mais permissões que o usuário atual possui, você pode usar `sudo` sem a necessidade de fornecer uma senha. Para obter mais informações, consulte o "[Manual do Sudo](https://www.sudo.ws/man/1.8.27/sudo.man.html)".
-As máquinas virtuais do Windows estão configuradas para ser executadas como administradores com Controle de Conta de Usuário (UAC) desativado. Para obter mais informações, consulte "[Como funciona o Controle de Conta de Usuário](https://docs.microsoft.com/en-us/windows/security/identity-protection/user-account-control/how-user-account-control-works)" na documentação do Windows.
+As máquinas virtuais do Windows estão configuradas para ser executadas como administradores com Controle de Conta de Usuário (UAC) desativado. Para obter mais informações, consulte "[Como funciona o Controle de Conta de Usuário](https://docs.microsoft.com/windows/security/identity-protection/user-account-control/how-user-account-control-works)" na documentação do Windows.
### Executores e recursos de hardware compatíveis
diff --git a/translations/pt-BR/content/actions/reference/workflow-commands-for-github-actions.md b/translations/pt-BR/content/actions/reference/workflow-commands-for-github-actions.md
index 169068c62a..70980a1067 100644
--- a/translations/pt-BR/content/actions/reference/workflow-commands-for-github-actions.md
+++ b/translations/pt-BR/content/actions/reference/workflow-commands-for-github-actions.md
@@ -164,6 +164,25 @@ Cria uma mensagem de erro e a imprime no log. Cria uma mensagem de erro e a impr
echo "::error file=app.js,line=10,col=15::Something went wrong"
```
+### Grouping log lines
+
+```
+::group::{title}
+::endgroup::
+```
+
+Creates an expandable group in the log. To create a group, use the `group` command and specify a `title`. Anything you print to the log between the `group` and `endgroup` commands is nested inside an expandable entry in the log.
+
+#### Exemplo
+
+```bash
+echo "::group::My title"
+echo "Inside group"
+echo "::endgroup::"
+```
+
+
+
### Mascarar um valor no registro
`::add-mask::{value}`
@@ -259,7 +278,8 @@ echo "action_state=yellow" >> $GITHUB_ENV
Executar `$action_state` em uma etapa futura agora retornará `amarelo`
-#### Strings de linha múltipla
+#### Multiline strings
+
Para strings linha múltipla, você pode usar um delimitador com a seguinte sintaxe.
```
@@ -268,7 +288,8 @@ Para strings linha múltipla, você pode usar um delimitador com a seguinte sint
{delimiter}
```
-#### Exemplo
+##### Exemplo
+
Neste exemplo, usamos `EOF` como um delimitador e definimos a variável de ambiente `JSON_RESPONSE` como o valor da resposta de curl.
```
steps:
diff --git a/translations/pt-BR/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md b/translations/pt-BR/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
index f830493b30..bc52bd49c8 100644
--- a/translations/pt-BR/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
+++ b/translations/pt-BR/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md
@@ -10,7 +10,7 @@ versions:
### About authentication and user provisioning with Azure AD
-Azure Active Directory (Azure AD) is a service from Microsoft that allows you to centrally manage user accounts and access to web applications. For more information, see [What is Azure Active Directory?](https://docs.microsoft.com/en-us/azure/active-directory/fundamentals/active-directory-whatis) in the Microsoft Docs.
+Azure Active Directory (Azure AD) is a service from Microsoft that allows you to centrally manage user accounts and access to web applications. For more information, see [What is Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-whatis) in the Microsoft Docs.
To manage identity and access for {% data variables.product.product_name %}, you can use an Azure AD tenant as a SAML IdP for authentication. You can also configure Azure AD to automatically provision accounts and access with SCIM. This configuration allows you to assign or unassign the {% data variables.product.prodname_ghe_managed %} application for a user account in your Azure AD tenant to automatically create, grant access to, or deactivate a corresponding user account on {% data variables.product.product_name %}.
@@ -18,9 +18,9 @@ For more information about managing identity and access for your enterprise on {
### Pré-requisitos
-To configure authentication and user provisioning for {% data variables.product.product_name %} using Azure AD, you must have an Azure AD account and tenant. For more information, see the [Azure AD website](https://azure.microsoft.com/en-us/free/active-directory) and [Quickstart: Create an Azure Active Directory tenant](https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-create-new-tenant) in the Microsoft Docs.
+To configure authentication and user provisioning for {% data variables.product.product_name %} using Azure AD, you must have an Azure AD account and tenant. For more information, see the [Azure AD website](https://azure.microsoft.com/free/active-directory) and [Quickstart: Create an Azure Active Directory tenant](https://docs.microsoft.com/azure/active-directory/develop/quickstart-create-new-tenant) in the Microsoft Docs.
-{% data reusables.saml.assert-the-administrator-attribute %} For more information about including the `administrator` attribute in the SAML claim from Azure AD, see [How to: customize claims issued in the SAML token for enterprise applications](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-saml-claims-customization) in the Microsoft Docs.
+{% data reusables.saml.assert-the-administrator-attribute %} For more information about including the `administrator` attribute in the SAML claim from Azure AD, see [How to: customize claims issued in the SAML token for enterprise applications](https://docs.microsoft.com/azure/active-directory/develop/active-directory-saml-claims-customization) in the Microsoft Docs.
{% data reusables.saml.create-a-machine-user %}
diff --git a/translations/pt-BR/content/admin/authentication/using-saml.md b/translations/pt-BR/content/admin/authentication/using-saml.md
index 0b206097e6..c1c8230c9d 100644
--- a/translations/pt-BR/content/admin/authentication/using-saml.md
+++ b/translations/pt-BR/content/admin/authentication/using-saml.md
@@ -29,7 +29,7 @@ Cada nome de usuário do {% data variables.product.prodname_ghe_server %} é det
O elemento `NameID` é obrigatório, mesmo que os outros atributos estejam presentes.
-É criado um mapeamento entre `NameID` e o nome de usuário do {% data variables.product.prodname_ghe_server %}; assim, `NameID` deve ser persistente, exclusivo e não estar sujeito a alterações no ciclo de vida do usuário.
+A mapping is created between the `NameID` and the {% data variables.product.prodname_ghe_server %} username, so the `NameID` should be persistent, unique, and not subject to change for the lifecycle of the user.
{% note %}
diff --git a/translations/pt-BR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md b/translations/pt-BR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md
index d76d5be091..5c3243a4cf 100644
--- a/translations/pt-BR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md
+++ b/translations/pt-BR/content/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server.md
@@ -1,11 +1,11 @@
---
title: Habilitar alertas para dependências vulneráveis no GitHub Enterprise Server
-intro: 'Você pode conectar {% data variables.product.product_location %} a {% data variables.product.prodname_ghe_cloud %} e habilitar {% if currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot_short %}{% else %}alertas de segurança{% endif %} para dependências vulneráveis nos repositórios na sua instância.'
+intro: 'Você pode conectar {% data variables.product.product_location %} a {% data variables.product.prodname_ghe_cloud %} e habilitar {% if currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot %}{% else %}alertas de segurança{% endif %} para dependências vulneráveis nos repositórios na sua instância.'
redirect_from:
- /enterprise/admin/installation/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server
- /enterprise/admin/configuration/enabling-security-alerts-for-vulnerable-dependencies-on-github-enterprise-server
- /enterprise/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server
-permissions: 'Os administradores do site de {% data variables.product.prodname_ghe_server %} que também são proprietários da organização ou conta corporativa conectada {% data variables.product.prodname_ghe_cloud %} podem habilitar {% if currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot_short %}{% else %}alertas de segurança{% endif %} para dependências vulneráveis em {% data variables.product.prodname_ghe_server %}.'
+permissions: 'Os administradores do site de {% data variables.product.prodname_ghe_server %} que também são proprietários da organização ou conta corporativa conectada {% data variables.product.prodname_ghe_cloud %} podem habilitar {% if currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot %}{% else %}alertas de segurança{% endif %} para dependências vulneráveis em {% data variables.product.prodname_ghe_server %}.'
versions:
enterprise-server: '*'
---
@@ -14,11 +14,11 @@ versions:
{% data reusables.repositories.tracks-vulnerabilities %} Para obter mais informações, consulte "[Sobre alertas de dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)".
-Você pode conectar {% data variables.product.product_location %} a {% data variables.product.prodname_dotcom_the_website %} e, em seguida, sincronizar os dados de vulnerabilidade na instância e gerar {% if currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot_short %}{% else %}alertas de segurança{% endif %} em repositórios com uma dependência vulnerável.
+Você pode conectar {% data variables.product.product_location %} a {% data variables.product.prodname_dotcom_the_website %} e, em seguida, sincronizar os dados de vulnerabilidade na instância e gerar {% if currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot %}{% else %}alertas de segurança{% endif %} em repositórios com uma dependência vulnerável.
-Depois de conectar {% data variables.product.product_location %} a {% data variables.product.prodname_dotcom_the_website %} e habilitar {% if currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot_short %}{% else %}alertas de segurança{% endif %} para dependências vulneráveis, os dados de vulnerabilidade serão sincronizados de {% data variables.product.prodname_dotcom_the_website %} para a sua instância uma vez por hora. Também é possível sincronizar os dados de vulnerabilidade manualmente a qualquer momento. Nenhum código ou informações sobre o código da {% data variables.product.product_location %} são carregados para o {% data variables.product.prodname_dotcom_the_website %}.
+Depois de conectar {% data variables.product.product_location %} a {% data variables.product.prodname_dotcom_the_website %} e habilitar {% if currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot %}{% else %}alertas de segurança{% endif %} para dependências vulneráveis, os dados de vulnerabilidade serão sincronizados de {% data variables.product.prodname_dotcom_the_website %} para a sua instância uma vez por hora. Também é possível sincronizar os dados de vulnerabilidade manualmente a qualquer momento. Nenhum código ou informações sobre o código da {% data variables.product.product_location %} são carregados para o {% data variables.product.prodname_dotcom_the_website %}.
-{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate {% data variables.product.prodname_dependabot_short %} alerts. Você pode personalizar como receber alertas de {% data variables.product.prodname_dependabot_short %}. Para obter mais informações, consulte "[Configurar notificações para dependências vulneráveis](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-github-dependabot-alerts)".
+{% if currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate {% data variables.product.prodname_dependabot_alerts %}. You can customize how you receive {% data variables.product.prodname_dependabot_alerts %}. Para obter mais informações, consulte "[Configurar notificações para dependências vulneráveis](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-dependabot-alerts)".
{% endif %}
{% if currentVersion == "enterprise-server@2.21" %}When {% data variables.product.product_location %} receives information about a vulnerability, it will identify repositories in your instance that use the affected version of the dependency and generate security alerts. Você pode personalizar a forma como recebe os alertas de segurança. Para obter mais informações, consulte "[Configurar notificações para dependências vulneráveis](/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies/#configuring-notifications-for-security-alerts)".
@@ -28,23 +28,25 @@ Depois de conectar {% data variables.product.product_location %} a {% data varia
{% endif %}
{% if currentVersion ver_gt "enterprise-server@2.21" %}
-### Habilitar alertas de {% data variables.product.prodname_dependabot_short %} para dependências vulneráveis em {% data variables.product.prodname_ghe_server %}
+### Enabling {% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}
{% else %}
### Habilitar alertas de segurança para dependências vulneráveis no {% data variables.product.prodname_ghe_server %}
{% endif %}
-Antes de habilitar {% if currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot_short %}{% else %}alertas de segurança{% endif %} de dependências vulneráveis em {% data variables.product.product_location %}, você deve conectar {% data variables.product.product_location %} a {% data variables.product.prodname_dotcom_the_website %}. Para obter mais informações, consulte "[Conectar o {% data variables.product.prodname_ghe_server %} ao {% data variables.product.prodname_ghe_cloud %}](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)".
+Antes de habilitar {% if currentVersion ver_gt "enterprise-server@2. 1" %}{% data variables.product.prodname_dependabot %}{% else %}alertas de segurança{% endif %} de dependências vulneráveis em {% data variables.product.product_location %}, você deve conectar {% data variables.product.product_location %} a {% data variables.product.prodname_dotcom_the_website %}. Para obter mais informações, consulte "[Conectar o {% data variables.product.prodname_ghe_server %} ao {% data variables.product.prodname_ghe_cloud %}](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)".
{% if currentVersion ver_gt "enterprise-server@2.20" %}
-{% if currentVersion ver_gt "enterprise-server@2.21" %}Recomendamos configurar alertas de {% data variables.product.prodname_dependabot_short %} sem notificações para os primeiros dias a fim de evitar uma sobrecarga de e-mails. Após alguns dias, você poderá habilitar as notificações para receber alertas de {% data variables.product.prodname_dependabot_short %}, como de costume.{% endif %}
+{% if currentVersion ver_gt "enterprise-server@2.21" %}We recommend configuring {% data variables.product.prodname_dependabot_alerts %} without notifications for the first few days to avoid an overload of emails. After a few days, you can enable notifications to receive {% data variables.product.prodname_dependabot_alerts %} as usual.{% endif %}
{% if currentVersion == "enterprise-server@2.21" %}Recomendamos configurar alertas de segurança sem notificações nos primeiros dias para evitar uma sobrecarga de e-mails. Após alguns dias, você pode habilitar notificações para receber alertas de segurança como de costume.{% endif %}
{% endif %}
{% data reusables.enterprise_site_admin_settings.sign-in %}
-1. No shell administrativo, habilite os {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}alertas de segurança{% endif %} de dependências vulneráveis em {% data variables.product.product_location %}:
+
+1. No shell administrativo, habilite os {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}alertas de segurança{% endif %} de dependências vulneráveis em {% data variables.product.product_location %}:
+
``` shell
$ ghe-dep-graph-enable
```
diff --git a/translations/pt-BR/content/admin/enterprise-management/monitoring-cluster-nodes.md b/translations/pt-BR/content/admin/enterprise-management/monitoring-cluster-nodes.md
index 7a98efc59c..4043491892 100644
--- a/translations/pt-BR/content/admin/enterprise-management/monitoring-cluster-nodes.md
+++ b/translations/pt-BR/content/admin/enterprise-management/monitoring-cluster-nodes.md
@@ -34,26 +34,34 @@ admin@ghe-data-node-0:~$ status-ghe-cluster | grep erro
#### Configurar o host do Nagios
1. Gere uma chave SSH com a frase secreta em branco. O Nagios usa essa informação para fazer a autenticação ao cluster do {% data variables.product.prodname_ghe_server %}.
```shell
- nagiosuser@nagios:~$ ssh-keygen -t rsa -b 4096
- > Gerando par de chaves rsa pública/privada.
- > Digite o arquivo no qual salvar a chave (/home/nagiosuser/.ssh/id_rsa):
- > Digite a frase secreta (vazia para nenhuma frase secreta): deixe em branco pressionando enter
- > Digite a mesma frase secreta novamente: pressione enter novamente
- > Sua identificação foi salva em /home/nagiosuser/.ssh/id_rsa.
- > Sua chave pública foi salva no /home/nagiosuser/.ssh/id_rsa.pub.
+ nagiosuser@nagios:~$ ssh-keygen -t ed25519
+ > Generating public/private ed25519 key pair.
+ > Enter file in which to save the key (/home/nagiosuser/.ssh/id_ed25519):
+ > Enter passphrase (empty for no passphrase): leave blank by pressing enter
+ > Enter same passphrase again: press enter again
+ > Your identification has been saved in /home/nagiosuser/.ssh/id_ed25519.
+ > Your public key has been saved in /home/nagiosuser/.ssh/id_ed25519.pub.
```
{% danger %}
**Aviso de segurança:** chaves SSH sem senha podem representar um risco de segurança se tiverem permissão de acesso total a um host. Limite o acesso desse tipo de chave a comandos de somente leitura.
{% enddanger %}
-2. Copie a chave privada (`id_rsa`) para a pasta inicial `nagios` e defina a propriedade adequada.
+ {% note %}
+
+ **Note:** If you're using a distribution of Linux that doesn't support the Ed25519 algorithm, use the command:
```shell
- nagiosuser@nagios:~$ sudo cp .ssh/id_rsa /var/lib/nagios/.ssh/
- nagiosuser@nagios:~$ sudo chown nagios:nagios /var/lib/nagios/.ssh/id_rsa
+ nagiosuser@nagios:~$ ssh-keygen -t rsa -b 4096
```
-3. Para autorizar a chave pública a executar *somente* o comando `ghe-cluster-status-n`, use o prefixo `command=` no arquivo `/data/user/common/authorized_keys`. No shell administrativo de qualquer nó, modifique esse arquivo para incluir a chave pública gerada na etapa 1. Por exemplo: `command="/usr/local/bin/ghe-cluster-status -n" ssh-rsa AAAA....`
+ {% endnote %}
+2. Copy the private key (`id_ed25519`) to the `nagios` home folder and set the appropriate ownership.
+ ```shell
+ nagiosuser@nagios:~$ sudo cp .ssh/id_ed25519 /var/lib/nagios/.ssh/
+ nagiosuser@nagios:~$ sudo chown nagios:nagios /var/lib/nagios/.ssh/id_ed25519
+ ```
+
+3. Para autorizar a chave pública a executar *somente* o comando `ghe-cluster-status-n`, use o prefixo `command=` no arquivo `/data/user/common/authorized_keys`. No shell administrativo de qualquer nó, modifique esse arquivo para incluir a chave pública gerada na etapa 1. For example: `command="/usr/local/bin/ghe-cluster-status -n" ssh-ed25519 AAAA....`
4. Valide e copie a configuração para cada nó do cluster executando `ghe-cluster-config-apply` no nó em que você modificou o arquivo `/data/user/common/authorized_keys`.
diff --git a/translations/pt-BR/content/admin/enterprise-management/upgrading-github-enterprise-server.md b/translations/pt-BR/content/admin/enterprise-management/upgrading-github-enterprise-server.md
index 4665a15c9f..710c056503 100644
--- a/translations/pt-BR/content/admin/enterprise-management/upgrading-github-enterprise-server.md
+++ b/translations/pt-BR/content/admin/enterprise-management/upgrading-github-enterprise-server.md
@@ -49,7 +49,7 @@ Há dois tipos de instantâneo:
| Plataforma | Método de instantâneo | URL de documentação de instantâneo |
| --------------------- | --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
| Amazon AWS | Disco | |
-| Azure | VM | |
+| Azure | VM | |
| Hyper-V | VM | |
| Google Compute Engine | Disco | |
| VMware | VM | [https://pubs.vmware.com/vsphere-50/topic/com.vmware.wssdk.pg.doc_50/PG_Ch11_VM_Manage.13.3.html](https://pubs.vmware.com/vsphere-50/topic/com.vmware.wssdk.pg.doc_50/PG_Ch11_VM_Manage.13.3.html) |
diff --git a/translations/pt-BR/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/pt-BR/content/admin/enterprise-support/about-github-enterprise-support.md
index f7b0ffc30e..13f5d92a6c 100644
--- a/translations/pt-BR/content/admin/enterprise-support/about-github-enterprise-support.md
+++ b/translations/pt-BR/content/admin/enterprise-support/about-github-enterprise-support.md
@@ -29,9 +29,16 @@ In addition to all of the benefits of {% data variables.contact.enterprise_suppo
- Suporte gravado por meio de nosso portal de suporte 24 horas por dias, 7 dias por semana
- Suporte por telefone 24 horas por dia, 7 dias por semana
- A{% if currentVersion == "github-ae@latest" %}n enhanced{% endif %} Service Level Agreement (SLA) {% if enterpriseServerVersions contains currentVersion %}with guaranteed initial response times{% endif %}
- - Access to premium content{% if enterpriseServerVersions contains currentVersion %}
- - Scheduled health checks{% endif %}
- - Serviços gerenciados
+{% if currentVersion == "github-ae@latest" %}
+ - An assigned Technical Service Account Manager
+ - Quarterly support reviews
+ - Managed Admin services
+{% else if enterpriseServerVersions contains currentVersion %}
+ - Technical account managers
+ - Acesso a conteúdo premium
+ - Verificação de integridade agendadas
+ - Managed Admin hours
+{% endif %}
{% data reusables.support.government-response-times-may-vary %}
diff --git a/translations/pt-BR/content/admin/enterprise-support/submitting-a-ticket.md b/translations/pt-BR/content/admin/enterprise-support/submitting-a-ticket.md
index 040261eae8..500cc3cdcc 100644
--- a/translations/pt-BR/content/admin/enterprise-support/submitting-a-ticket.md
+++ b/translations/pt-BR/content/admin/enterprise-support/submitting-a-ticket.md
@@ -51,7 +51,7 @@ After submitting your support request and optional diagnostic information,
{% if currentVersion == "github-ae@latest" %}
### Enviar um tíquete usando o {% data variables.contact.ae_azure_portal %}
-Commercial customers can submit a support request in the {% data variables.contact.contact_ae_portal %}. Government customers should use the [Azure portal for government customers](https://portal.azure.us/#blade/Microsoft_Azure_Support/HelpAndSupportBlade). For more information, see [Create an Azure support request](https://docs.microsoft.com/en-us/azure/azure-portal/supportability/how-to-create-azure-support-request) in the Microsoft documentation.
+Commercial customers can submit a support request in the {% data variables.contact.contact_ae_portal %}. Government customers should use the [Azure portal for government customers](https://portal.azure.us/#blade/Microsoft_Azure_Support/HelpAndSupportBlade). For more information, see [Create an Azure support request](https://docs.microsoft.com/azure/azure-portal/supportability/how-to-create-azure-support-request) in the Microsoft documentation.
For urgent issues, to ensure a quick response, after you submit a ticket, please call the support hotline immediately. Your Technical Support Account Manager (TSAM) will provide you with the number to use in your onboarding session.
diff --git a/translations/pt-BR/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md b/translations/pt-BR/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md
index e1bdac2ed6..8757267bb2 100644
--- a/translations/pt-BR/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md
+++ b/translations/pt-BR/content/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise.md
@@ -12,7 +12,7 @@ versions:
### Sobre as permissões de {% data variables.product.prodname_actions %} para sua empresa
-Ao habilitar o {% data variables.product.prodname_actions %} em {% data variables.product.prodname_ghe_server %}, ele fica habilitado para todas as organizações da sua empresa. Você pode optar por desativar {% data variables.product.prodname_actions %} para todas as organizações da sua empresa ou permitir apenas organizações específicas. Você também pode limitar o uso de ações públicas, de modo que as pessoas só possam usar ações locais que existem em uma organização.
+Ao habilitar o {% data variables.product.prodname_actions %} em {% data variables.product.prodname_ghe_server %}, ele fica habilitado para todas as organizações da sua empresa. Você pode optar por desativar {% data variables.product.prodname_actions %} para todas as organizações da sua empresa ou permitir apenas organizações específicas. You can also limit the use of public actions, so that people can only use local actions that exist in your enterprise.
### Gerenciar as permissões de {% data variables.product.prodname_actions %} para a sua empresa
diff --git a/translations/pt-BR/content/admin/installation/installing-github-enterprise-server-on-azure.md b/translations/pt-BR/content/admin/installation/installing-github-enterprise-server-on-azure.md
index a0563d2c75..84cb9430df 100644
--- a/translations/pt-BR/content/admin/installation/installing-github-enterprise-server-on-azure.md
+++ b/translations/pt-BR/content/admin/installation/installing-github-enterprise-server-on-azure.md
@@ -14,7 +14,7 @@ Você pode implantar o {% data variables.product.prodname_ghe_server %} no Azure
- {% data reusables.enterprise_installation.software-license %}
- Você deve ter uma conta do Azure que permita provisionar novas máquinas. Para obter mais informações, consulte o [site do Microsoft Azure](https://azure.microsoft.com).
-- A maioria das ações necessárias para iniciar sua máquina virtual (VM) também pode ser executada pelo Portal do Azure. No entanto, é recomendável instalar a interface da linha de comando (CLI) do Azure para a configuração inicial. Veja abaixo alguns exemplos de uso da CLI do Azure 2.0. Para obter mais informações, consulte o guia "[Instalar a CLI do Azure 2.0](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest)".
+- A maioria das ações necessárias para iniciar sua máquina virtual (VM) também pode ser executada pelo Portal do Azure. No entanto, é recomendável instalar a interface da linha de comando (CLI) do Azure para a configuração inicial. Veja abaixo alguns exemplos de uso da CLI do Azure 2.0. Para obter mais informações, consulte o guia "[Instalar a CLI do Azure 2.0](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest)".
### Considerações de hardware
@@ -26,9 +26,9 @@ Antes de iniciar a {% data variables.product.product_location %} no Azure, você
#### Regiões e tipos de VM compatíveis
-O appliance do {% data variables.product.prodname_ghe_server %} requer um disco de dados de armazenamento premium e é compatível com qualquer VM do Azure que tenha suporte ao armazenamento premium. Para obter mais informações, consulte "[VMs compatíveis](https://docs.microsoft.com/en-us/azure/storage/common/storage-premium-storage#supported-vms)" na documentação do Azure. Para ver informações gerais sobre as VMs disponíveis, consulte a [página de visão geral das máquinas virtuais do Azure](http://azure.microsoft.com/en-us/pricing/details/virtual-machines/#Linux).
+O appliance do {% data variables.product.prodname_ghe_server %} requer um disco de dados de armazenamento premium e é compatível com qualquer VM do Azure que tenha suporte ao armazenamento premium. Para obter mais informações, consulte "[VMs compatíveis](https://docs.microsoft.com/azure/storage/common/storage-premium-storage#supported-vms)" na documentação do Azure. Para ver informações gerais sobre as VMs disponíveis, consulte a [página de visão geral das máquinas virtuais do Azure](https://azure.microsoft.com/pricing/details/virtual-machines/#Linux).
-O {% data variables.product.prodname_ghe_server %} dá suporte a qualquer região compatível com o seu tipo de VM. Para obter mais informações sobre as regiões compatíveis com cada VM, consulte "[Produtos disponíveis por região](https://azure.microsoft.com/en-us/regions/services/)".
+O {% data variables.product.prodname_ghe_server %} dá suporte a qualquer região compatível com o seu tipo de VM. Para obter mais informações sobre as regiões compatíveis com cada VM, consulte "[Produtos disponíveis por região](https://azure.microsoft.com/regions/services/)".
#### Tipos recomendados de VM
@@ -47,20 +47,20 @@ O {% data variables.product.prodname_ghe_server %} dá suporte a qualquer regiã
{% data reusables.enterprise_installation.create-ghe-instance %}
-1. Localize a imagem mais recente do appliance do {% data variables.product.prodname_ghe_server %}. Para obter mais informações sobre o comando `vm image list`, consulte "[Lista de imagens de vm no az](https://docs.microsoft.com/en-us/cli/azure/vm/image?view=azure-cli-latest#az_vm_image_list)" na documentação da Microsoft.
+1. Localize a imagem mais recente do appliance do {% data variables.product.prodname_ghe_server %}. Para obter mais informações sobre o comando `vm image list`, consulte "[Lista de imagens de vm no az](https://docs.microsoft.com/cli/azure/vm/image?view=azure-cli-latest#az_vm_image_list)" na documentação da Microsoft.
```shell
$ az vm image list --all -f GitHub-Enterprise | grep '"urn":' | sort -V
```
-2. Crie uma VM usando a imagem do appliance. Para obter mais informações, consulte "[criar vm no az](https://docs.microsoft.com/en-us/cli/azure/vm?view=azure-cli-latest#az_vm_create)" na documentação da Microsoft.
+2. Crie uma VM usando a imagem do appliance. Para obter mais informações, consulte "[criar vm no az](https://docs.microsoft.com/cli/azure/vm?view=azure-cli-latest#az_vm_create)" na documentação da Microsoft.
- Veja as opções de nome da VM, grupo de recursos, tamanho da VM, nome da região preferida do Azure, nome da da imagem de VM do appliance que você listou na etapa anterior e o SKU de armazenamento para Premium. Para obter mais informações sobre grupos de recursos, consulte "[Grupos de recursos](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-overview#resource-groups)" na documentação da Microsoft.
+ Veja as opções de nome da VM, grupo de recursos, tamanho da VM, nome da região preferida do Azure, nome da da imagem de VM do appliance que você listou na etapa anterior e o SKU de armazenamento para Premium. Para obter mais informações sobre grupos de recursos, consulte "[Grupos de recursos](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-overview#resource-groups)" na documentação da Microsoft.
```shell
$ az vm create -n VM_NAME -g RESOURCE_GROUP --size VM_SIZE -l REGION --image APPLIANCE_IMAGE_NAME --storage-sku Premium_LRS
```
-3. Defina as configurações de segurança na VM para abrir as portas necessárias. Para obter mais informações, consulte "[abrir portas para a vm no az](https://docs.microsoft.com/en-us/cli/azure/vm?view=azure-cli-latest#az_vm_open_port)" na documentação da Microsoft. A tabela abaixo descreve cada porta para determinar quais portas você precisa abrir.
+3. Defina as configurações de segurança na VM para abrir as portas necessárias. Para obter mais informações, consulte "[abrir portas para a vm no az](https://docs.microsoft.com/cli/azure/vm?view=azure-cli-latest#az_vm_open_port)" na documentação da Microsoft. A tabela abaixo descreve cada porta para determinar quais portas você precisa abrir.
```shell
$ az vm open-port -n VM_NAME -g RESOURCE_GROUP --port PORT_NUMBER
@@ -70,7 +70,7 @@ O {% data variables.product.prodname_ghe_server %} dá suporte a qualquer regiã
{% data reusables.enterprise_installation.necessary_ports %}
-4. Crie e anexe um novo disco de dados não criptografado à VM e configure o tamanho com base na sua contagem de licenças do usuário. Para obter mais informações, consulte "[anexar disco a uma vm no az](https://docs.microsoft.com/en-us/cli/azure/vm/disk?view=azure-cli-latest#az_vm_disk_attach)" na documentação da Microsoft.
+4. Crie e anexe um novo disco de dados não criptografado à VM e configure o tamanho com base na sua contagem de licenças do usuário. Para obter mais informações, consulte "[anexar disco a uma vm no az](https://docs.microsoft.com/cli/azure/vm/disk?view=azure-cli-latest#az_vm_disk_attach)" na documentação da Microsoft.
Veja as opções de nome da VM (por exemplo, `ghe-acme-corp`), o grupo de recursos, o SKU de armazenamento Premium, o tamanho do disco (por exemplo, `100`) e um nome para o VHD resultante.
@@ -86,7 +86,7 @@ O {% data variables.product.prodname_ghe_server %} dá suporte a qualquer regiã
### Configurar a máquina virtual do {% data variables.product.prodname_ghe_server %}
-1. Antes de configurar a VM, você deve aguardar a entrada no status ReadyRole. Verifique o status da VM com o comando `vm list`. Para obter mais informações, consulte "[listar vms no az](https://docs.microsoft.com/en-us/cli/azure/vm?view=azure-cli-latest#az_vm_list)" na documentação da Microsoft.
+1. Antes de configurar a VM, você deve aguardar a entrada no status ReadyRole. Verifique o status da VM com o comando `vm list`. Para obter mais informações, consulte "[listar vms no az](https://docs.microsoft.com/cli/azure/vm?view=azure-cli-latest#az_vm_list)" na documentação da Microsoft.
```shell
$ az vm list -d -g RESOURCE_GROUP -o table
> Name ResourceGroup PowerState PublicIps Fqdns Location Zones
@@ -96,7 +96,7 @@ O {% data variables.product.prodname_ghe_server %} dá suporte a qualquer regiã
```
{% note %}
- **Observação:** o Azure não cria uma entrada FQDNS automaticamente para a VM. Para obter mais informações, consulte o guia do Azure sobre como "[Criar um nome de domínio totalmente qualificado no portal do Azure para uma VM Linux](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/portal-create-fqdn)".
+ **Observação:** o Azure não cria uma entrada FQDNS automaticamente para a VM. Para obter mais informações, consulte o guia do Azure sobre como "[Criar um nome de domínio totalmente qualificado no portal do Azure para uma VM Linux](https://docs.microsoft.com/azure/virtual-machines/linux/portal-create-fqdn)".
{% endnote %}
diff --git a/translations/pt-BR/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md b/translations/pt-BR/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md
index 0606820ffd..d56c5ad415 100644
--- a/translations/pt-BR/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md
+++ b/translations/pt-BR/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md
@@ -12,7 +12,7 @@ versions:
- {% data reusables.enterprise_installation.software-license %}
- Seu sistema operacional deve estar entre o Windows Server 2008 e o Windows Server 2016, que são compatíveis com o Hyper-V.
-- A maioria das ações necessárias para criar sua máquina virtual (VM) também pode ser executada usando o [Gerenciador do Hyper-V](https://docs.microsoft.com/en-us/windows-server/virtualization/hyper-v/manage/remotely-manage-hyper-v-hosts). No entanto, a configuração inicial é recomendável com o shell de linha de comando do Windows PowerShell. Veja abaixo alguns exemplos com o PowerShell. Para obter mais informações, consulte "[Introdução ao Windows PowerShell](https://docs.microsoft.com/en-us/powershell/scripting/getting-started/getting-started-with-windows-powershell?view=powershell-5.1)" no guia da Microsoft.
+- A maioria das ações necessárias para criar sua máquina virtual (VM) também pode ser executada usando o [Gerenciador do Hyper-V](https://docs.microsoft.com/windows-server/virtualization/hyper-v/manage/remotely-manage-hyper-v-hosts). No entanto, a configuração inicial é recomendável com o shell de linha de comando do Windows PowerShell. Veja abaixo alguns exemplos com o PowerShell. Para obter mais informações, consulte "[Introdução ao Windows PowerShell](https://docs.microsoft.com/powershell/scripting/getting-started/getting-started-with-windows-powershell?view=powershell-5.1)" no guia da Microsoft.
### Considerações de hardware
@@ -30,23 +30,23 @@ versions:
{% data reusables.enterprise_installation.create-ghe-instance %}
-1. No PowerShell, crie uma máquina virtual Generation 1, configure o tamanho com base na contagem de licenças de usuário e anexe a imagem do {% data variables.product.prodname_ghe_server %} que você baixou. Para obter mais informações, consulte "[Nova VM](https://docs.microsoft.com/en-us/powershell/module/hyper-v/new-vm?view=win10-ps)" na documentação da Microsoft.
+1. No PowerShell, crie uma máquina virtual Generation 1, configure o tamanho com base na contagem de licenças de usuário e anexe a imagem do {% data variables.product.prodname_ghe_server %} que você baixou. Para obter mais informações, consulte "[Nova VM](https://docs.microsoft.com/powershell/module/hyper-v/new-vm?view=win10-ps)" na documentação da Microsoft.
```shell
PS C:\> New-VM -Generation 1 -Name VM_NAME -MemoryStartupBytes MEMORY_SIZE -BootDevice VHD -VHDPath PATH_TO_VHD
```
-{% data reusables.enterprise_installation.create-attached-storage-volume %} Substitua `PATH_TO_DATA_DISK` pelo caminho no local em que você criará o disco. Para obter mais informações, consulte "[Novo VHD](https://docs.microsoft.com/en-us/powershell/module/hyper-v/new-vhd?view=win10-ps)" na documentação da Microsoft.
+{% data reusables.enterprise_installation.create-attached-storage-volume %} Substitua `PATH_TO_DATA_DISK` pelo caminho no local em que você criará o disco. Para obter mais informações, consulte "[Novo VHD](https://docs.microsoft.com/powershell/module/hyper-v/new-vhd?view=win10-ps)" na documentação da Microsoft.
```shell
PS C:\> New-VHD -Path PATH_TO_DATA_DISK -SizeBytes DISK_SIZE
```
-3. Vincule o disco de dados à sua instância. Para obter mais informações, consulte "[Adicionar VMHardDiskDrive](https://docs.microsoft.com/en-us/powershell/module/hyper-v/add-vmharddiskdrive?view=win10-ps)" na documentação da Microsoft.
+3. Vincule o disco de dados à sua instância. Para obter mais informações, consulte "[Adicionar VMHardDiskDrive](https://docs.microsoft.com/powershell/module/hyper-v/add-vmharddiskdrive?view=win10-ps)" na documentação da Microsoft.
```shell
PS C:\> Add-VMHardDiskDrive -VMName VM_NAME -Path PATH_TO_DATA_DISK
```
-4. Inicie a VM. Para obter mais informações, consulte "[Iniciar a VM](https://docs.microsoft.com/en-us/powershell/module/hyper-v/start-vm?view=win10-ps)" na documentação da Microsoft.
+4. Inicie a VM. Para obter mais informações, consulte "[Iniciar a VM](https://docs.microsoft.com/powershell/module/hyper-v/start-vm?view=win10-ps)" na documentação da Microsoft.
```shell
PS C:\> Start-VM -Name VM_NAME
```
-5. Obtenha o endereço IP da sua VM. Para obter mais informações, consulte "[Obter VMNetworkAdapter](https://docs.microsoft.com/en-us/powershell/module/hyper-v/get-vmnetworkadapter?view=win10-ps)" na documentação da Microsoft.
+5. Obtenha o endereço IP da sua VM. Para obter mais informações, consulte "[Obter VMNetworkAdapter](https://docs.microsoft.com/powershell/module/hyper-v/get-vmnetworkadapter?view=win10-ps)" na documentação da Microsoft.
```shell
PS C:\> (Get-VMNetworkAdapter -VMName VM_NAME).IpAddresses
```
diff --git a/translations/pt-BR/content/admin/packages/configuring-third-party-storage-for-packages.md b/translations/pt-BR/content/admin/packages/configuring-third-party-storage-for-packages.md
index dde4acf744..c23aba8618 100644
--- a/translations/pt-BR/content/admin/packages/configuring-third-party-storage-for-packages.md
+++ b/translations/pt-BR/content/admin/packages/configuring-third-party-storage-for-packages.md
@@ -13,7 +13,7 @@ versions:
{% data variables.product.prodname_registry %} em {% data variables.product.prodname_ghe_server %} usa armazenamento externo de blob para armazenar seus pacotes. A quantidade de armazenamento necessária depende do seu uso de {% data variables.product.prodname_registry %}.
-No momento, {% data variables.product.prodname_registry %} é compatível com o armazenamento do blob com Amazon Web Services (AWS) S3. MinIO também é compatível, mas a configuração não está atualmente implementada na interface de {% data variables.product.product_name %}. Você pode usar o MinIO para armazenamento seguindo as instruções para AWS S3, inserindo as informações análogas para a configuração do seu MinIO.
+No momento, {% data variables.product.prodname_registry %} é compatível com o armazenamento do blob com Amazon Web Services (AWS) S3. MinIO também é compatível, mas a configuração não está atualmente implementada na interface de {% data variables.product.product_name %}. You can use MinIO for storage by following the instructions for AWS S3, entering the analogous information for your MinIO configuration.
Para a melhor experiência, recomendamos o uso de um bucket dedicado para {% data variables.product.prodname_registry %}, separado do bucket usado para armazenamento para {% data variables.product.prodname_actions %}.
diff --git a/translations/pt-BR/content/admin/policies/creating-a-pre-receive-hook-script.md b/translations/pt-BR/content/admin/policies/creating-a-pre-receive-hook-script.md
index c250ceae62..39458b5454 100644
--- a/translations/pt-BR/content/admin/policies/creating-a-pre-receive-hook-script.md
+++ b/translations/pt-BR/content/admin/policies/creating-a-pre-receive-hook-script.md
@@ -102,8 +102,8 @@ Antes de criar ou atualizar um script de hook pre-receive no appliance do {% dat
adduser git -D -G root -h /home/git -s /bin/bash && \
passwd -d git && \
su git -c "mkdir /home/git/.ssh && \
- ssh-keygen -t rsa -b 4096 -f /home/git/.ssh/id_rsa -P '' && \
- mv /home/git/.ssh/id_rsa.pub /home/git/.ssh/authorized_keys && \
+ ssh-keygen -t ed25519 -f /home/git/.ssh/id_ed25519 -P '' && \
+ mv /home/git/.ssh/id_ed25519.pub /home/git/.ssh/authorized_keys && \
mkdir /home/git/test.git && \
git --bare init /home/git/test.git"
@@ -135,7 +135,7 @@ Antes de criar ou atualizar um script de hook pre-receive no appliance do {% dat
> Sending build context to Docker daemon 3.584 kB
> Step 1 : FROM gliderlabs/alpine:3.3
> ---> 8944964f99f4
- > Step 2 : RUN apk add --no-cache git openssh bash && ssh-keygen -A && sed -i "s/#AuthorizedKeysFile/AuthorizedKeysFile/g" /etc/ssh/sshd_config && adduser git -D -G root -h /home/git -s /bin/bash && passwd -d git && su git -c "mkdir /home/git/.ssh && ssh-keygen -t rsa -b 4096 -f /home/git/.ssh/id_rsa -P ' && mv /home/git/.ssh/id_rsa.pub /home/git/.ssh/authorized_keys && mkdir /home/git/test.git && git --bare init /home/git/test.git"
+ > Step 2 : RUN apk add --no-cache git openssh bash && ssh-keygen -A && sed -i "s/#AuthorizedKeysFile/AuthorizedKeysFile/g" /etc/ssh/sshd_config && adduser git -D -G root -h /home/git -s /bin/bash && passwd -d git && su git -c "mkdir /home/git/.ssh && ssh-keygen -t ed25519 -f /home/git/.ssh/id_ed25519 -P ' && mv /home/git/.ssh/id_ed25519.pub /home/git/.ssh/authorized_keys && mkdir /home/git/test.git && git --bare init /home/git/test.git"
> ---> Running in e9d79ab3b92c
> fetch http://alpine.gliderlabs.com/alpine/v3.3/main/x86_64/APKINDEX.tar.gz
> fetch http://alpine.gliderlabs.com/alpine/v3.3/community/x86_64/APKINDEX.tar.gz
@@ -143,9 +143,9 @@ Antes de criar ou atualizar um script de hook pre-receive no appliance do {% dat
> OK: 34 MiB in 26 packages
> ssh-keygen: generating new host keys: RSA DSA ECDSA ED25519
> Password for git changed by root
- > Generating public/private rsa key pair.
- > Sua identificação foi salva em /home/git/.ssh/id_rsa.
- > Sua chave pública foi salva em /home/git/.ssh/id_rsa.pub.
+ > Generating public/private ed25519 key pair.
+ > Your identification has been saved in /home/git/.ssh/id_ed25519.
+ > Your public key has been saved in /home/git/.ssh/id_ed25519.pub.
....saída truncada....
> Initialized empty Git repository in /home/git/test.git/
> Successfully built dd8610c24f82
@@ -173,7 +173,7 @@ Antes de criar ou atualizar um script de hook pre-receive no appliance do {% dat
9. Copie a chave SSH gerada do contêiner de dados para a máquina local:
```shell
- $ docker cp data:/home/git/.ssh/id_rsa .
+ $ docker cp data:/home/git/.ssh/id_ed25519 .
```
10. Modifique o remote de um repositório de teste e faça push para o repo `test.git` no contêiner Docker. Este exemplo usa o `git@github.com:octocat/Hello-World.git`, mas você pode usar o repositório de sua preferência. Este exemplo pressupõe que a sua máquina local (127.0.0.1) está vinculando a porta 52311, mas você pode usar outro endereço IP se o docker estiver sendo executado em uma máquina remota.
@@ -182,7 +182,7 @@ Antes de criar ou atualizar um script de hook pre-receive no appliance do {% dat
$ git clone git@github.com:octocat/Hello-World.git
$ cd Hello-World
$ git remote add test git@127.0.0.1:test.git
- $ GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 52311 -i ../id_rsa" git push -u test master
+ $ GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 52311 -i ../id_ed25519" git push -u test main
> Warning: Permanently added '[192.168.99.100]:52311' (ECDSA) to the list of known hosts.
> Contando objetos: 7, concluído.
> Delta compression using up to 4 threads.
diff --git a/translations/pt-BR/content/admin/user-management/auditing-users-across-your-enterprise.md b/translations/pt-BR/content/admin/user-management/auditing-users-across-your-enterprise.md
index 8b30b3b6b6..092d928cd9 100644
--- a/translations/pt-BR/content/admin/user-management/auditing-users-across-your-enterprise.md
+++ b/translations/pt-BR/content/admin/user-management/auditing-users-across-your-enterprise.md
@@ -66,9 +66,9 @@ Só é possível usar o nome de usuário do {% data variables.product.product_na
O qualificador `org` limita as ações a uma organização específica. Por exemplo:
-* `org:my-org` localiza todos os eventos que ocorreram na organização `my-org`;
+* `org:my-org` finds all events that occurred for the `my-org` organization.
* `org:my-org action:team` localiza todos os eventos de equipe que ocorreram na organização `my-org`;
-* `org:my-org` exclui todos os eventos que ocorreram na organização `my-org`.
+* `-org:my-org` excludes all events that occurred for the `my-org` organization.
#### Pesquisar com base na ação
diff --git a/translations/pt-BR/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md b/translations/pt-BR/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md
index 30e20af3c0..43ce777b70 100644
--- a/translations/pt-BR/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md
+++ b/translations/pt-BR/content/desktop/installing-and-configuring-github-desktop/creating-your-first-repository-using-github-desktop.md
@@ -80,12 +80,8 @@ Agora que você criou e publicou seu repositório, você está pronto para fazer
2. Faça algumas alterações no arquivo _README.md_ que você criou anteriormente. Você pode adicionar informações que descrevem o seu projeto, como o que ele faz e por que ele é útil. Quando estiver satisfeito com suas alterações, salve-as no editor de texto.
3. Em {% data variables.product.prodname_desktop %}, acesse a vista **Alterações**. Na lista de arquivos, você verá o _README.md_ alterado. A marca de verificação à esquerda do arquivo _README.md_ indica que as alterações feitas no arquivo serão parte do commit que você fez. Talvez você queira fazer alterações em vários arquivos no futuro, mas sem fazer o commit das alterações de todos eles. Se você clicar na marca de seleção ao lado de um arquivo, esse arquivo não será incluído no commit. 
-4. Na parte inferior da lista **Changes** (Alterações), adicione uma mensagem ao commit. À direita da sua foto de perfil, digite uma breve descrição do commit. Já que estamos alterando o arquivo _README.md_, algo como "Adicionar informações sobre o propósito do projeto" seria um bom resumo. Abaixo do resumo, o campo de texto "Descrição" permite digitar uma descrição mais longa das alterações feitas no commit. Essa descrição pode ser útil para analisar o histórico de um projeto e entender o motivo das alterações. Como estamos fazendo uma atualização básica do arquivo _README.md_, fique à vontade para ignorar a descrição.  <<<<<<< HEAD
-5. Clique em **Fazer commit do NOME DO BRANCH**. O botão do commit mostra o seu branch atual. Dessa forma, você pode ter certeza de que deseja fazer o commit no branch desejado.
-
-=======
-5. Clique em **Commit to master** (Fazer commit para o mestre). O botão de commit mostra o seu branch atual, que, neste caso, é `mestre`, para que você saiba em qual branch você está fazendo o commit. 
-> > > > > > > mestre
+4. Na parte inferior da lista **Changes** (Alterações), adicione uma mensagem ao commit. À direita da sua foto de perfil, digite uma breve descrição do commit. Já que estamos alterando o arquivo _README.md_, algo como "Adicionar informações sobre o propósito do projeto" seria um bom resumo. Abaixo do resumo, o campo de texto "Descrição" permite digitar uma descrição mais longa das alterações feitas no commit. Essa descrição pode ser útil para analisar o histórico de um projeto e entender o motivo das alterações. Como estamos fazendo uma atualização básica do arquivo _README.md_, fique à vontade para ignorar a descrição. 
+5. Clique em **Fazer commit do NOME DO BRANCH**. O botão do commit mostra o seu branch atual. Dessa forma, você pode ter certeza de que deseja fazer o commit no branch desejado. 
6. Para fazer push das alterações no repositório remote no {% data variables.product.product_name %}, clique em **Push origin** (Fazer push da origem). 
- O botão **Subir origem** é o mesmo que você clicou para publicar o seu repositório no {% data variables.product.product_name %}. Este botão muda contextualmente de acordo com o local em que você está no fluxo de trabalho do Git. Agora, ele deve mostrar `Fazer push da origem` com um número `1` ao lado, indicando que ainda não foi feito o push de um commit para o {% data variables.product.product_name %}.
- O termo "origem" na opção **Fazer push da origem** indica que estamos fazendo push das alterações para o repositório remoto denominado `origem` que, neste caso, é o repositório do seu projeto no {% data variables.product.prodname_dotcom_the_website %}. Até você fazer o push de qualquer commit para o {% data variables.product.product_name %}, haverá diferenças entre o repositório do seu projeto no computador e o repositório do seu projeto no {% data variables.product.prodname_dotcom_the_website %}. Assim, você pode trabalhar no local e deixar para fazer push das suas alterações no {% data variables.product.prodname_dotcom_the_website %} quando estiver tudo pronto.
diff --git a/translations/pt-BR/content/developers/apps/creating-ci-tests-with-the-checks-api.md b/translations/pt-BR/content/developers/apps/creating-ci-tests-with-the-checks-api.md
index 3becec3caa..7fb85f4ed2 100644
--- a/translations/pt-BR/content/developers/apps/creating-ci-tests-with-the-checks-api.md
+++ b/translations/pt-BR/content/developers/apps/creating-ci-tests-with-the-checks-api.md
@@ -836,7 +836,7 @@ Aqui estão alguns problemas comuns e algumas soluções sugeridas. Se você tiv
* **P:** Meu aplicativo não está enviando código para o GitHub. Eu não vejo as correções que o RuboCop faz automaticamente!
- **R:** Certifique-se de que você tem permissões de **Leitura & gravação** para "conteúdo de repositório" e qeu você está clonando o repositório com seu token de instalação. Consulte [Etapa 2.2. Clonar o repositório](#step-22-cloning-the-repository) para obter detalhes.
+ **A:** Make sure you have **Read & write** permissions for "Repository contents," and that you are cloning the repository with your installation token. Consulte [Etapa 2.2. Clonar o repositório](#step-22-cloning-the-repository) para obter detalhes.
* **P:** Vejo um erro no saída de depuração de `template_server.rb` relacionado à clonagem do meu repositório.
diff --git a/translations/pt-BR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md b/translations/pt-BR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
index 39ade7dd24..60a7f9be39 100644
--- a/translations/pt-BR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
+++ b/translations/pt-BR/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md
@@ -662,7 +662,7 @@ While most of your API interaction should occur using your server-to-server inst
* [Create commit signature protection](/v3/repos/branches/#create-commit-signature-protection)
* [Delete commit signature protection](/v3/repos/branches/#delete-commit-signature-protection)
* [Get status checks protection](/v3/repos/branches/#get-status-checks-protection)
-* [Update status check potection](/v3/repos/branches/#update-status-check-potection)
+* [Update status check protection](/v3/repos/branches/#update-status-check-protection)
* [Remove status check protection](/v3/repos/branches/#remove-status-check-protection)
* [Get all status check contexts](/v3/repos/branches/#get-all-status-check-contexts)
* [Add status check contexts](/v3/repos/branches/#add-status-check-contexts)
diff --git a/translations/pt-BR/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md b/translations/pt-BR/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md
index b0af0f6755..a8d4850586 100644
--- a/translations/pt-BR/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md
+++ b/translations/pt-BR/content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md
@@ -260,10 +260,10 @@ Antes de usar a biblioteca do Octokit.rb para fazer chamadas de API, você dever
``` ruby
# Instancie um cliente do Octokit autenticado como um aplicativo GitHub.
-# A autenticação do aplicativo GitHub App exige que você construa um
-# JWT (https://jwt. o/introduction/) assinado com a chave privada do aplicativo
-# para que o GitHub possa ter certeza de que veio do aplicativo e não foi alterada por
-# terceiros maliciosos.
+# GitHub App authentication requires that you construct a
+# JWT (https://jwt.io/introduction/) signed with the app's private key,
+# so GitHub can be sure that it came from the app an not altered by
+# a malicious third party.
def authenticate_app
payload = {
# The time that this JWT was issued, _i.e._ now.
diff --git a/translations/pt-BR/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md b/translations/pt-BR/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md
index a0b71c3dd0..e82a47ae29 100644
--- a/translations/pt-BR/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md
+++ b/translations/pt-BR/content/developers/github-marketplace/rest-endpoints-for-the-github-marketplace-api.md
@@ -1,6 +1,6 @@
---
title: Pontos de extremidade de REST para a API do GitHub Marketplace
-intro: 'Para ajudar a gerenciar seu aplicativo em {% data variables.product.prodname_marketplace %}, use esses pontos de extremidade de {% data variables.product.prodname_marketplace %}'
+intro: 'To help manage your app on {% data variables.product.prodname_marketplace %}, use these {% data variables.product.prodname_marketplace %} API endpoints.'
redirect_from:
- /apps/marketplace/github-marketplace-api-endpoints/
- /apps/marketplace/integrating-with-the-github-marketplace-api/github-marketplace-rest-api-endpoints/
diff --git a/translations/pt-BR/content/github/administering-a-repository/about-dependabot-version-updates.md b/translations/pt-BR/content/github/administering-a-repository/about-dependabot-version-updates.md
new file mode 100644
index 0000000000..58af138a95
--- /dev/null
+++ b/translations/pt-BR/content/github/administering-a-repository/about-dependabot-version-updates.md
@@ -0,0 +1,45 @@
+---
+title: About Dependabot version updates
+intro: 'Você pode usar o {% data variables.product.prodname_dependabot %} para manter os pacotes que usa atualizados para as versões mais recentes.'
+redirect_from:
+ - /github/administering-a-repository/about-dependabot
+ - /github/administering-a-repository/about-github-dependabot-version-updates
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.dependabot.beta-note %}
+
+### Sobre o {% data variables.product.prodname_dependabot_version_updates %}
+
+O {% data variables.product.prodname_dependabot %} facilita a manutenção de suas dependências. Você pode usá-lo para garantir que seu repositório se mantenha atualizado automaticamente com as versões mais recentes dos pacotes e aplicações do qual ele depende.
+
+Você habilita o {% data variables.product.prodname_dependabot_version_updates %} verificando um arquivo de configuração no seu repositório. O arquivo de configuração especifica a localização do manifesto ou outros arquivos de definição de pacote, armazenados no seu repositório. O {% data variables.product.prodname_dependabot %} usa essas informações para verificar pacotes e aplicativos desatualizados. {% data variables.product.prodname_dependabot %} determina se há uma nova versão de uma dependência observando a versão semântica ([semver](https://semver.org/)) da dependência para decidir se deve atualizar para essa versão. Para certos gerentes de pacote, {% data variables.product.prodname_dependabot_version_updates %} também é compatível com armazenamento. Dependências de vendor (ou armazenadas) são dependências registradas em um diretório específico em um repositório, em vez de referenciadas em um manifesto. Dependências de vendor estão disponíveis no tempo de criação, ainda que os servidores de pacote estejam indisponíveis. {% data variables.product.prodname_dependabot_version_updates %} pode ser configurado para verificar as dependências de vendor para novas versões e atualizá-las, se necessário.
+
+Quando {% data variables.product.prodname_dependabot %} identifica uma dependência desatualizada, ele cria uma pull request para atualizar o manifesto para a última versão da dependência. Para dependências de vendor, {% data variables.product.prodname_dependabot %} levanta um pull request para substituir diretamente a dependência desatualizada pela nova versão. Você verifica se os seus testes passam, revisa o changelog e lança observações incluídas no resumo do pull request e, em seguida, faz a mesclagem. Para obter detalhes, consulte "[Habilitando e desabilitando atualizações da versão](/github/administering-a-repository/enabling-and-disabling-version-updates)."
+
+Se você habilitar atualizações de segurança, {% data variables.product.prodname_dependabot %} também promove pull requests para atualizar dependências vulneráveis. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
+
+{% data reusables.dependabot.dependabot-tos %}
+
+### Frequência de {% data variables.product.prodname_dependabot %} pull requests
+
+Você especifica com que frequência verifica cada ecossistema para novas versões no arquivo de configuração: diariamente, semanalmente ou mensalmente.
+
+{% data reusables.dependabot.initial-updates %}
+
+Se tiver habilitado atualizações de segurança, às vezes você verá atualizações de segurança extras de pull requests. Elas são acionadas por um alerta de {% data variables.product.prodname_dependabot %} para uma dependência de seu branch padrão. {% data variables.product.prodname_dependabot %} gera automaticamente um pull request para atualizar a dependência vulnerável.
+
+### Repositórios e ecossistemas suportados
+
+{% note %}
+
+{% data reusables.dependabot.private-dependencies %}
+
+{% endnote %}
+
+É possível configurar atualizações de versão para repositórios que contenham um manifesto de dependência ou arquivo de bloqueio para um dos gerentes de pacotes suportados. Para alguns gerenciadores de pacotes, você também pode configurar o armazenamento para dependências. Para obter mais informações, consulte "[Opções de configuração para atualizações de dependências](/github/administering-a-repository/configuration-options-for-dependency-updates#vendor)".
+
+{% data reusables.dependabot.supported-package-managers %}
+
+Se o seu repositório já usa uma integração para gerenciamento de dependências, você precisará desativar isso antes de habilitar o {% data variables.product.prodname_dependabot %}. Para obter mais informações, consulte "[Sobre integrações](/github/customizing-your-github-workflow/about-integrations)".
diff --git a/translations/pt-BR/content/github/administering-a-repository/about-releases.md b/translations/pt-BR/content/github/administering-a-repository/about-releases.md
index 56dfacb93a..121135ce20 100644
--- a/translations/pt-BR/content/github/administering-a-repository/about-releases.md
+++ b/translations/pt-BR/content/github/administering-a-repository/about-releases.md
@@ -37,7 +37,7 @@ Pessoas com permissões de administrador para um repositório podem escolher se
Se uma versão consertar uma vulnerabilidade de segurança, você deverá publicar uma consultoria de segurança no seu repositório.
-{% data variables.product.prodname_dotcom %} revisa cada consultoria de segurança publicada e pode usá-la para enviar alertas de {% data variables.product.prodname_dependabot_short %} para repositórios afetados. Para obter mais informações, consulte "[Sobre as consultorias de segurança do GitHub](/github/managing-security-vulnerabilities/about-github-security-advisories)."
+{% data variables.product.prodname_dotcom %} reviews each published security advisory and may use it to send {% data variables.product.prodname_dependabot_alerts %} to affected repositories. Para obter mais informações, consulte "[Sobre as consultorias de segurança do GitHub](/github/managing-security-vulnerabilities/about-github-security-advisories)."
Você pode visualizar a aba **Dependentes** do gráfico de dependências para ver quais repositórios e pacotes dependem do código no repositório e pode, portanto, ser afetado por uma nova versão. Para obter mais informações, consulte "[Sobre o gráfico de dependência](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)".
diff --git a/translations/pt-BR/content/github/administering-a-repository/about-securing-your-repository.md b/translations/pt-BR/content/github/administering-a-repository/about-securing-your-repository.md
index ac6eccab07..9e96152167 100644
--- a/translations/pt-BR/content/github/administering-a-repository/about-securing-your-repository.md
+++ b/translations/pt-BR/content/github/administering-a-repository/about-securing-your-repository.md
@@ -21,13 +21,13 @@ O primeiro passo para proteger um repositório é configurar quem pode ver e mod
Discute em particular e corrige vulnerabilidades de segurança no código do seu repositório. Em seguida, você pode publicar uma consultoria de segurança para alertar a sua comunidade sobre a vulnerabilidade e incentivá-los a fazer a atualização. Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)".
-- **{% data variables.product.prodname_dependabot_short %} alerts and security updates**
+- **{% data variables.product.prodname_dependabot_alerts %} and security updates**
- Ver alertas sobre dependências conhecidas por conter vulnerabilidades de segurança e escolher se deseja gerar pull requests para atualizar essas dependências automaticamente. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."
+ Ver alertas sobre dependências conhecidas por conter vulnerabilidades de segurança e escolher se deseja gerar pull requests para atualizar essas dependências automaticamente. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
-- **{% data variables.product.prodname_dependabot_short %} version updates**
+- **{% data variables.product.prodname_dependabot %} version updates**
- Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. Para obter mais informações, consulte "[Sobre o {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-github-dependabot-version-updates)".
+ Use {% data variables.product.prodname_dependabot %} to automatically raise pull requests to keep your dependencies up-to-date. This helps reduce your exposure to older versions of dependencies. Using newer versions makes it easier to apply patches if security vulnerabilities are discovered, and also makes it easier for {% data variables.product.prodname_dependabot_security_updates %} to successfully raise pull requests to upgrade vulnerable dependencies. Para obter mais informações, consulte "[Sobre o {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-dependabot-version-updates)".
- **Alertas de {% data variables.product.prodname_code_scanning_capc %}**
@@ -43,6 +43,6 @@ O gráfico de dependências de {% data variables.product.prodname_dotcom %} perm
* Ecossistemas e pacotes dos quais o repositório depende
* Repositórios e pacotes que dependem do seu repositório
-Você deve habilitar o gráfico de dependências antes de {% data variables.product.prodname_dotcom %} pode gerar alertas de {% data variables.product.prodname_dependabot_short %} para dependências com vulnerabilidades de segurança.
+You must enable the dependency graph before {% data variables.product.prodname_dotcom %} can generate {% data variables.product.prodname_dependabot_alerts %} for dependencies with security vulnerabilities.
Você pode encontrar o gráfico de dependências na aba **Ideias** para o seu repositório. Para obter mais informações, consulte "[Sobre o gráfico de dependência](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)".
diff --git a/translations/pt-BR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md b/translations/pt-BR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md
index a7539933f9..d8da8921c7 100644
--- a/translations/pt-BR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md
+++ b/translations/pt-BR/content/github/administering-a-repository/configuration-options-for-dependency-updates.md
@@ -12,7 +12,7 @@ versions:
O arquivo de configuração do {% data variables.product.prodname_dependabot %} , *dependabot.yml*, usa a sintaxe YAML. Se você não souber o que é YAMLe quiser saber mais, consulte "[Aprender a usar YAML em cinco minutos](https://www.codeproject.com/Articles/1214409/Learn-YAML-in-five-minutes)".
-Você deve armazenar este arquivo no diretório `.github` do seu repositório. Ao adicionar ou atualizar o arquivo *dependabot.yml* , isso aciona uma verificação imediata de atualizações de versão. Quaisquer opções que também afetem as atualizações de segurança são usadas na próxima vez que um alerta de segurança acionar uma pull request para atualização de segurança. Para obter mais informações, consulte "[Configurando {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."
+Você deve armazenar este arquivo no diretório `.github` do seu repositório. Ao adicionar ou atualizar o arquivo *dependabot.yml* , isso aciona uma verificação imediata de atualizações de versão. Any options that also affect security updates are used the next time a security alert triggers a pull request for a security update. For more information, see "[Enabling and disabling version updates](/github/administering-a-repository/enabling-and-disabling-version-updates)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)."
### Opções de configuração para *dependabot.yml*
@@ -56,13 +56,13 @@ Além disso, a opção [`open-pull-requests-limite`](#open-pull-requests-limit)
As atualizações de segurança são geradas para manifestos de pacote vulneráveis apenas no branch padrão. Quando as opções de configuração são definidas para o mesmo branch (verdadeiro a menos que você use `target-branch`) e especifica um `package-ecosystem` e o `directory` para o manifesto vulnerável, as pull requests para atualizações de segurança usam opções relevantes.
-Em geral, as atualizações de segurança usam quaisquer opções de configuração que afetam pull request, por exemplo, adicionando metadados ou alterando seu comportamento. Para obter mais informações sobre atualizações de segurança, consulte "[Configurando {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."
+Em geral, as atualizações de segurança usam quaisquer opções de configuração que afetam pull request, por exemplo, adicionando metadados ou alterando seu comportamento. Para obter mais informações sobre atualizações de segurança, consulte "[Configurando {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)."
{% endnote %}
### `package-ecosystem`
-**Obrigatório** Você adiciona um elemento de `package-ecosystem` para cada gerenciador de pacotes que você deseja que {% data variables.product.prodname_dependabot_short %} monitore para novas versões. O repositório também deve conter um manifesto de dependência ou um arquivo de bloqueio para cada um desses gerenciadores de pacotes. Se você quiser habilitar o vendoring para um gerente de pacotes com o qual é compatível, as dependências do vendor devem estar localizadas no diretório necessário. Para obter mais informações, consulte o [`vendor`](#vendor) abaixo.
+**Obrigatório** Você adiciona um elemento de `package-ecosystem` para cada gerenciador de pacotes que você deseja que {% data variables.product.prodname_dependabot %} monitore para novas versões. O repositório também deve conter um manifesto de dependência ou um arquivo de bloqueio para cada um desses gerenciadores de pacotes. Se você quiser habilitar o vendoring para um gerente de pacotes com o qual é compatível, as dependências do vendor devem estar localizadas no diretório necessário. Para obter mais informações, consulte o [`vendor`](#vendor) abaixo.
{% data reusables.dependabot.supported-package-managers %}
@@ -308,7 +308,7 @@ atualizações:
{% note %}
-**Observação**: {% data variables.product.prodname_dependabot_version_updates %} não pode executar atualizações de versão para nenhuma dependência no manifesto que contém dependências do git privadas ou registros do git privados, mesmo que você adicione as dependências privadas à opção `ignorar` do seu arquivo de configuração. Para obter mais informações, consulte "[Sobre o {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-github-dependabot#supported-repositories-and-ecosystems)".
+**Observação**: {% data variables.product.prodname_dependabot_version_updates %} não pode executar atualizações de versão para nenhuma dependência no manifesto que contém dependências do git privadas ou registros do git privados, mesmo que você adicione as dependências privadas à opção `ignorar` do seu arquivo de configuração. Para obter mais informações, consulte "[Sobre o {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-dependabot#supported-repositories-and-ecosystems)".
{% endnote %}
@@ -543,7 +543,7 @@ updates:
### `vendor`
-Use a opção `vendor` para dizer {% data variables.product.prodname_dependabot_short %} para dependências de vendor ao atualizá-las.
+Use a opção `vendor` para dizer {% data variables.product.prodname_dependabot %} para dependências de vendor ao atualizá-las.
```yaml
# Configure version updates for both dependencies defined in manifests and vendored dependencies
@@ -558,7 +558,7 @@ updates:
interval: "weekly"
```
-{% data variables.product.prodname_dependabot_short %} atualiza apenas as dependências de vendor localizadas em diretórios específicos em um repositório.
+{% data variables.product.prodname_dependabot %} atualiza apenas as dependências de vendor localizadas em diretórios específicos em um repositório.
| Gerenciador de pacotes | Caminho de arquivo necessário para dependências delegadas | Mais informações |
| ---------------------- | ----------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------- |
diff --git a/translations/pt-BR/content/github/administering-a-repository/customizing-dependency-updates.md b/translations/pt-BR/content/github/administering-a-repository/customizing-dependency-updates.md
index b1dfb106fc..405e97a07d 100644
--- a/translations/pt-BR/content/github/administering-a-repository/customizing-dependency-updates.md
+++ b/translations/pt-BR/content/github/administering-a-repository/customizing-dependency-updates.md
@@ -20,7 +20,7 @@ Depois que você habilitou as atualizações de versão, você pode personalizar
Para obter mais informações sobre as opções de configuração, consulte "[Opções de configuração para atualizações de dependências](/github/administering-a-repository/configuration-options-for-dependency-updates)".
-Ao atualizar o arquivo *dependabot.yml* no seu repositório, o {% data variables.product.prodname_dependabot %} executa uma verificação imediata com a nova configuração. Dentro de minutos você verá uma lista atualizada de dependências na aba **{% data variables.product.prodname_dependabot_short %}**, isso pode demorar mais se o repositório tiver muitas dependências. Você também pode ver novas pull requests para atualizações de versão. Para obter mais informações, consulte "[Listando dependências configuradas para atualizações da versão](/github/administering-a-repository/listing-dependencies-configured-for-version-updates)".
+Ao atualizar o arquivo *dependabot.yml* no seu repositório, o {% data variables.product.prodname_dependabot %} executa uma verificação imediata com a nova configuração. Within minutes you will see an updated list of dependencies on the **{% data variables.product.prodname_dependabot %}** tab, this may take longer if the repository has many dependencies. Você também pode ver novas pull requests para atualizações de versão. Para obter mais informações, consulte "[Listando dependências configuradas para atualizações da versão](/github/administering-a-repository/listing-dependencies-configured-for-version-updates)".
### Impacto das alterações de configuração nas atualizações de segurança
diff --git a/translations/pt-BR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md b/translations/pt-BR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md
index 4090b545eb..b21e6a0afb 100644
--- a/translations/pt-BR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md
+++ b/translations/pt-BR/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md
@@ -63,7 +63,7 @@ Como alternativa, você pode habilitar o {% data variables.product.prodname_acti
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
{% data reusables.repositories.settings-sidebar-actions %}
-1. Em **Permissões de ações**, selecione **Permitir ações específicas** e adicione as suas ações necessárias à lista. 
+1. Under **Actions permissions**, select **Allow select actions** and add your required actions to the list. 
2. Clique em **Salvar**.
{% endif %}
diff --git a/translations/pt-BR/content/github/administering-a-repository/enabling-and-disabling-version-updates.md b/translations/pt-BR/content/github/administering-a-repository/enabling-and-disabling-version-updates.md
index 5ac90261d4..2f4b8ed5c0 100644
--- a/translations/pt-BR/content/github/administering-a-repository/enabling-and-disabling-version-updates.md
+++ b/translations/pt-BR/content/github/administering-a-repository/enabling-and-disabling-version-updates.md
@@ -10,7 +10,7 @@ versions:
### Sobre atualizações de versão para dependências
-Você habilita {% data variables.product.prodname_dependabot_version_updates %}, verificando um arquivo de configuração *dependabot.yml* no diretório do seu repositório `.github`. Em seguida, o {% data variables.product.prodname_dependabot_short %} cria um pull request para manter as dependências que você configura atualizadas. Para cada dependência do gerenciador de pacotes que você deseja atualizar, você deve especificar a localização dos arquivos de manifesto do pacote e a frequência de busca por atualizações nas dependências listadas nesses arquivos. Para obter mais informações sobre habilitar atualizações de segurança, consulte "[Configurando {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)."
+Você habilita {% data variables.product.prodname_dependabot_version_updates %}, verificando um arquivo de configuração *dependabot.yml* no diretório do seu repositório `.github`. {% data variables.product.prodname_dependabot %} then raises pull requests to keep the dependencies you configure up-to-date. Para cada dependência do gerenciador de pacotes que você deseja atualizar, você deve especificar a localização dos arquivos de manifesto do pacote e a frequência de busca por atualizações nas dependências listadas nesses arquivos. For information about enabling security updates, see "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)."
{% data reusables.dependabot.initial-updates %} Para obter mais informações, consulte "[Personalizar atualizações de dependência](/github/administering-a-repository/customizing-dependency-updates)".
@@ -72,7 +72,7 @@ Em uma bifurcação, você também precisa habilitar explicitamente {% data vari
### Verificando o status das atualizações da versão
-Depois que você habilitar as atualizações da versão, você verá uma nova aba **Dependabot** no gráfico de dependências para o repositório. Esta aba mostra quais gerentes de pacote de {% data variables.product.prodname_dependabot %} estão configurados para monitorar e quando {% data variables.product.prodname_dependabot_short %} fez a última verificação com relação a novas versões.
+Depois que você habilitar as atualizações da versão, você verá uma nova aba **Dependabot** no gráfico de dependências para o repositório. This tab shows which package managers {% data variables.product.prodname_dependabot %} is configured to monitor and when {% data variables.product.prodname_dependabot %} last checked for new versions.

diff --git a/translations/pt-BR/content/github/administering-a-repository/index.md b/translations/pt-BR/content/github/administering-a-repository/index.md
index 2c75f5b01e..2608509eee 100644
--- a/translations/pt-BR/content/github/administering-a-repository/index.md
+++ b/translations/pt-BR/content/github/administering-a-repository/index.md
@@ -91,11 +91,11 @@ versions:
{% topic_link_in_list /keeping-your-dependencies-updated-automatically %}
- {% link_in_list /about-github-dependabot-version-updates %}
+ {% link_in_list /about-dependabot-version-updates %}
{% link_in_list /enabling-and-disabling-version-updates %}
{% link_in_list /listing-dependencies-configured-for-version-updates %}
{% link_in_list /managing-pull-requests-for-dependency-updates %}
{% link_in_list /customizing-dependency-updates %}
{% link_in_list /configuration-options-for-dependency-updates %}
- {% link_in_list /keeping-your-actions-up-to-date-with-github-dependabot %}
+ {% link_in_list /keeping-your-actions-up-to-date-with-dependabot %}
diff --git a/translations/pt-BR/content/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot.md b/translations/pt-BR/content/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot.md
new file mode 100644
index 0000000000..685c5215eb
--- /dev/null
+++ b/translations/pt-BR/content/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot.md
@@ -0,0 +1,49 @@
+---
+title: Keeping your actions up to date with Dependabot
+intro: 'Você pode usar o {% data variables.product.prodname_dependabot %} para manter as ações que você utiliza atualizadas para as versões mais recentes.'
+redirect_from:
+ - /github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.dependabot.beta-note %}
+
+### Sobre {% data variables.product.prodname_dependabot_version_updates %} para ações
+
+Ações são frequentemente atualizadas com correções de bugs e novos recursos para tornar os processos automatizados mais confiáveis, mais rápidos e mais seguros. Quando você habilitar {% data variables.product.prodname_dependabot_version_updates %} para {% data variables.product.prodname_actions %}, o {% data variables.product.prodname_dependabot %} ajudará a garantir que referências a ações em um arquivo *workflow.yml* de um repositório são mantidas atualizadas. Para cada ação no arquivo, {% data variables.product.prodname_dependabot %} verifica a referência da ação (tipicamente, um número de versão ou identificador de commit associado à ação) em relação à versão mais recente. Se uma versão mais recente da ação estiver disponível, o {% data variables.product.prodname_dependabot %} enviará para você uma pull request que atualizará a referência no arquivo de fluxo de trabalho para a versão mais recente. Para obter mais informações sobre o {% data variables.product.prodname_dependabot_version_updates %}, consulte "[Sobre {% data variables.product.prodname_dependabot_version_updates %}](/github/administering-a-repository/about-dependabot-version-updates)". Para obter mais informações sobre a configuração dos fluxos de trabalho para {% data variables.product.prodname_actions %}, consulte "[Aprender {% data variables.product.prodname_actions %}](/actions/learn-github-actions)".
+
+### Habilitando {% data variables.product.prodname_dependabot_version_updates %} para ações
+
+{% data reusables.dependabot.create-dependabot-yml %} Se você já habilitou o {% data variables.product.prodname_dependabot_version_updates %} para outros ecossistemas ou gerenciadores de pacotes, basta abrir o arquivo existente *dependabot.yml*.
+1. Especifique `"github-actions"` como um `package-ecosystem` para monitorar.
+1. Defina o `directory` como `"/"` para verificar os arquivos de fluxo de trabalho em `.github/workflows`.
+1. Defina um `schedule.interval` para especificar quantas vezes procurar por novas versões.
+{% data reusables.dependabot.check-in-dependabot-yml %} Se você tiver editado um arquivo existente, salve suas alterações.
+
+Você também pode habilitar o {% data variables.product.prodname_dependabot_version_updates %} em bifurcações. Para obter mais informações, consulte "[Habilitando e desabilitando atualizações de versão](/github/administering-a-repository/enabling-and-disabling-version-updates#enabling-version-updates-on-forks)."
+
+#### Exemplo de arquivo *dependabot.yml* para {% data variables.product.prodname_actions %}
+
+O exemplo de arquivo *dependabot.yml* abaixo configura atualizações de versão para {% data variables.product.prodname_actions %}. O `directory` deve ser definido como `"/"` para verificar os arquivos de fluxo de trabalho em `.github/workflows`. O `schedule.interval` está definido como `"diariamente"`. Após este arquivo ter sido verificado ou atualizado, {% data variables.product.prodname_dependabot %} verifica novas versões de suas ações. O {% data variables.product.prodname_dependabot %} irá criar as pull request para atualizações da versão para quaisquer ações desatualizadas que ele encontre. Após as atualizações iniciais da versão, {% data variables.product.prodname_dependabot %} continuará a verificar se há versões desatualizadas de ações uma vez por dia.
+
+```yaml
+# Configurar calendário de atualização para GitHub Actions
+
+version: 2
+updates:
+
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ # Verificar atualizações do GitHub Actions todos os dias de semana
+ interval: "daily"
+```
+
+### Configurando o {% data variables.product.prodname_dependabot_version_updates %} para ações
+
+Ao habilitar {% data variables.product.prodname_dependabot_version_updates %} para ações, você deve especificar valores para `package-ecosystem`, `directory` e `schedule.interval`. Há muitas propriedades opcionais adicionais que você pode definir para personalizar ainda mais suas atualizações de versão. Para obter mais informações, consulte "[Opções de configuração para atualizações de dependências](/github/administering-a-repository/configuration-options-for-dependency-updates)".
+
+### Leia mais
+
+- "[Sobre o GitHub Actions](/actions/getting-started-with-github-actions/about-github-actions)"
diff --git a/translations/pt-BR/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md b/translations/pt-BR/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md
index 941020a459..65844afe8d 100644
--- a/translations/pt-BR/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md
+++ b/translations/pt-BR/content/github/administering-a-repository/listing-dependencies-configured-for-version-updates.md
@@ -9,7 +9,7 @@ versions:
### Visualizando dependências monitoradas por {% data variables.product.prodname_dependabot %}
-Depois de habilitar as atualizações de versão, você pode confirmar que a sua configuração está correta usando a aba **{% data variables.product.prodname_dependabot_short %}** no gráfico de dependências para o repositório. Para obter detalhes, consulte "[Habilitando e desabilitando atualizações da versão](/github/administering-a-repository/enabling-and-disabling-version-updates)."
+Depois de habilitar as atualizações de versão, você pode confirmar que a sua configuração está correta usando a aba **{% data variables.product.prodname_dependabot %}** no gráfico de dependências para o repositório. Para obter detalhes, consulte "[Habilitando e desabilitando atualizações da versão](/github/administering-a-repository/enabling-and-disabling-version-updates)."
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.accessing-repository-graphs %}
@@ -21,5 +21,5 @@ Se quaisquer dependências estiverem faltando, verifique os arquivos de log em b
### Visualizando arquivos de log {% data variables.product.prodname_dependabot %}
-1. Na aba **{% data variables.product.prodname_dependabot_short %}** , clique em **Última verificação em *TIME* atrás** para ver o arquivo de log gerado pelo {% data variables.product.prodname_dependabot %} durante a última verificação de atualizações de versão. 
+1. Na aba **{% data variables.product.prodname_dependabot %}** , clique em **Última verificação em *TIME* atrás** para ver o arquivo de log gerado pelo {% data variables.product.prodname_dependabot %} durante a última verificação de atualizações de versão. 
2. Opcionalmente, para executar novamente a verificação da versão, clique em **Procurar atualizações**. 
diff --git a/translations/pt-BR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md b/translations/pt-BR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md
index 64bb6356ea..b997f5b299 100644
--- a/translations/pt-BR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md
+++ b/translations/pt-BR/content/github/administering-a-repository/managing-pull-requests-for-dependency-updates.md
@@ -11,7 +11,7 @@ versions:
{% data reusables.dependabot.pull-request-introduction %}
-Quando o {% data variables.product.prodname_dependabot %} cria uma pull request, você é notificado pelo método escolhido para o repositório. Each pull request contains detailed information about the proposed change, taken from the package manager. Essas pull requests seguem as verificações e testes normais definidas no seu repositório. Além disso, onde informações suficientes estão disponíveis, você verá uma pontuação de compatibilidade. Isso também pode ajudá-lo a decidir se deve ou não mesclar a alteração. For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)."
+Quando o {% data variables.product.prodname_dependabot %} cria uma pull request, você é notificado pelo método escolhido para o repositório. Each pull request contains detailed information about the proposed change, taken from the package manager. Essas pull requests seguem as verificações e testes normais definidas no seu repositório. Além disso, onde informações suficientes estão disponíveis, você verá uma pontuação de compatibilidade. Isso também pode ajudá-lo a decidir se deve ou não mesclar a alteração. For information about this score, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
Se você tem muitas dependências para gerenciar, você pode querer personalizar a configuração para cada gerenciador de pacotes para que as pull requests tenham revisores, responsáveis e etiquetas específicos. Para obter mais informações, consulte "[Personalizar atualizações de dependência](/github/administering-a-repository/customizing-dependency-updates)".
diff --git a/translations/pt-BR/content/github/authenticating-to-github/connecting-with-third-party-applications.md b/translations/pt-BR/content/github/authenticating-to-github/connecting-with-third-party-applications.md
index 8b891a2125..939b19d593 100644
--- a/translations/pt-BR/content/github/authenticating-to-github/connecting-with-third-party-applications.md
+++ b/translations/pt-BR/content/github/authenticating-to-github/connecting-with-third-party-applications.md
@@ -55,10 +55,10 @@ Há vários tipos de dados que os aplicativos podem solicitar.
| Tipos de dados | Descrição |
| ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| Status do commit | Você pode conceder acesso para que um aplicativo de terceiro relate seu status de commit. O acesso ao status do commit permite que os aplicativos determinem se uma compilação foi bem-sucedida em relação a um commit específico. Os apps não terão acesso ao seu código, mas poderão ler e gravar informações de status em relação a um commit específico. |
-| Implantações | O acesso ao status da implantação permite que os aplicativos determinem se uma implantação foi bem-sucedida em relação a um commit específico para repositórios públicos e privados. Os aplicativos não terão acesso ao seu código. |
+| Implantações | Deployment status access allows applications to determine if a deployment is successful against a specific commit for public and private repositories. Applications won't have access to your code. |
| Gists | O acesso ao [Gist](https://gist.github.com) permite que os aplicativos leiam ou gravem em seus Gists secretos e públicos. |
| Hooks | O acesso aos [webhooks](/webhooks) permite que os aplicativos leiam ou gravem configurações de hook em repositórios que você gerencia. |
-| Notificações | O acesso à notificação permite que os aplicativos leiam as notificações do {% data variables.product.product_name %}, como comentários sobre problemas ou pull requests. No entanto, os aplicativos continuam sem poder acessar nada nos repositórios. |
+| Notificações | Notification access allows applications to read your {% data variables.product.product_name %} notifications, such as comments on issues and pull requests. No entanto, os aplicativos continuam sem poder acessar nada nos repositórios. |
| Organizações e equipes | O acesso às organizações e equipes permite que os apps acessem e gerenciem a associação à organização e à equipe. |
| Dados pessoais do usuário | Os dados do usuário incluem informações encontradas no seu perfil de usuário, como nome, endereço de e-mail e localização. |
| Repositórios | As informações de repositório incluem os nomes dos contribuidores, os branches que você criou e os arquivos reais dentro do repositório. Os aplicativos podem solicitar acesso para repositórios públicos ou privados em um nível amplo de usuário. |
diff --git a/translations/pt-BR/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md b/translations/pt-BR/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
index a7be6ef0ab..0abf639d7a 100644
--- a/translations/pt-BR/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
+++ b/translations/pt-BR/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
@@ -20,18 +20,26 @@ Caso não queira reinserir sua frase secreta cada vez que usa a chave SSH, é po
{% data reusables.command_line.open_the_multi_os_terminal %}
2. Cole o texto abaixo, substituindo o endereço de e-mail pelo seu {% data variables.product.product_name %}.
```shell
- $ ssh-keygen -t rsa -b 4096 -C "your_email@example.com"
+ $ ssh-keygen -t ed25519 -C "your_email@example.com"
```
+ {% note %}
+
+ **Note:** If you are using a legacy system that doesn't support the Ed25519 algorithm, use:
+ ```shell
+ $ ssh-keygen -t rsa -b 4096 -C "your_email@example.com"
+ ```
+
+ {% endnote %}
O comando criará uma nova chave SSH, usando o e-mail fornecido como uma etiqueta.
```shell
- > Gerar par de chaves rsa pública/privada.
+ > Generating public/private ed25519 key pair.
```
3. Quando aparecer a solicitação "Enter a file in which to save the key" (Insira um arquivo no qual salvar a chave), presssione Enter. O local padrão do arquivo será aceito.
{% mac %}
```shell
- > Insira um arquivo no qual salvar a chave (/Users/you/.ssh/id_rsa): [Press enter]
+ > Enter a file in which to save the key (/Users/you/.ssh/id_ed25519): [Press enter]
```
{% endmac %}
@@ -39,7 +47,7 @@ Caso não queira reinserir sua frase secreta cada vez que usa a chave SSH, é po
{% windows %}
```shell
- > Insira um arquivo no qual salvar a chave (/c/Users/you/.ssh/id_rsa):[Press enter]
+ > Enter a file in which to save the key (/c/Users/you/.ssh/id_ed25519):[Press enter]
```
{% endwindows %}
@@ -47,7 +55,7 @@ Caso não queira reinserir sua frase secreta cada vez que usa a chave SSH, é po
{% linux %}
```shell
- > Insira um arquivo no qual salvar a chave (/home/you/.ssh/id_rsa): [Press enter]
+ > Enter a file in which to save the key (/home/you/.ssh/id_ed25519): [Press enter]
```
{% endlinux %}
@@ -81,18 +89,18 @@ Antes de adicionar uma nova chave SSH ao ssh-agent para gerenciar suas chaves, v
$ touch ~/.ssh/config
```
- * Abra seu arquivo `~/.ssh/config` e, em seguida, modifique-o, substituindo `~/. sh/id_rsa`, caso você não esteja usando o local e o nome padrão para sua chave `id_rsa`.
+ * Open your `~/.ssh/config` file, then modify the file, replacing `~/.ssh/id_ed25519` if you are not using the default location and name for your `id_ed25519` key.
```
Host *
AddKeysToAgent yes
UseKeychain yes
- IdentityFile ~/.ssh/id_rsa
+ IdentityFile ~/.ssh/id_ed25519
```
3. Adicione sua chave SSH privada ao ssh-agent e armazene sua frase secreta no keychain. {% data reusables.ssh.add-ssh-key-to-ssh-agent %}
```shell
- $ ssh-add -K ~/.ssh/id_rsa
+ $ ssh-add -K ~/.ssh/id_ed25519
```
{% note %}
diff --git a/translations/pt-BR/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md b/translations/pt-BR/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md
index 4ec91d674c..398985d286 100644
--- a/translations/pt-BR/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md
+++ b/translations/pt-BR/content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md
@@ -20,6 +20,7 @@ Você pode bloquear um usuário nas configurações da sua conta ou no perfil do
Quando você bloqueia um usuário:
- O usuário para de seguir você
- O usuário para de inspecionar e deixa de fixar seus repositórios
+- The user is not able to join any organizations you are an owner of
- As estrelas e atribuições de problema do usuário são removidas dos repositórios
- As bifurcações dos seus repositórios são excluídas
- Você exclui qualquer bifurcação dos repositórios do usuário
diff --git a/translations/pt-BR/content/github/building-a-strong-community/index.md b/translations/pt-BR/content/github/building-a-strong-community/index.md
index 3298f41be9..dbe945aa36 100644
--- a/translations/pt-BR/content/github/building-a-strong-community/index.md
+++ b/translations/pt-BR/content/github/building-a-strong-community/index.md
@@ -37,6 +37,7 @@ versions:
{% link_in_list /managing-disruptive-comments %}
{% link_in_list /locking-conversations %}
{% link_in_list /limiting-interactions-in-your-repository %}
+ {% link_in_list /limiting-interactions-for-your-user-account %}
{% link_in_list /limiting-interactions-in-your-organization %}
{% link_in_list /tracking-changes-in-a-comment %}
{% link_in_list /managing-how-contributors-report-abuse-in-your-organizations-repository %}
diff --git a/translations/pt-BR/content/github/building-a-strong-community/limiting-interactions-for-your-user-account.md b/translations/pt-BR/content/github/building-a-strong-community/limiting-interactions-for-your-user-account.md
new file mode 100644
index 0000000000..02e1c3b8ee
--- /dev/null
+++ b/translations/pt-BR/content/github/building-a-strong-community/limiting-interactions-for-your-user-account.md
@@ -0,0 +1,26 @@
+---
+title: Limiting interactions for your user account
+intro: 'You can temporarily enforce a period of limited activity for certain users in all public repositories owned by your user account.'
+versions:
+ free-pro-team: '*'
+permissions: Anyone can limit interactions for their own user account.
+---
+
+### About temporary interaction limits
+
+Limiting interactions for your user account enables temporary interaction limits for all public repositories owned by your user account. {% data reusables.community.interaction-limits-restrictions %}
+
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your public repositories.
+
+{% data reusables.community.types-of-interaction-limits %}
+
+When you enable user-wide activity limitations, you can't enable or disable interaction limits on individual repositories. For more information on limiting activity for an individual repository, see "[Limiting interactions in your repository](/articles/limiting-interactions-in-your-repository)."
+
+You can also block users. For more information, see "[Blocking a user from your personal account](/github/building-a-strong-community/blocking-a-user-from-your-personal-account)."
+
+### Limiting interactions for your user account
+
+{% data reusables.user_settings.access_settings %}
+1. In your user settings sidebar, under "Moderation settings", click **Interaction limits**. 
+{% data reusables.community.set-interaction-limit %}
+ 
\ No newline at end of file
diff --git a/translations/pt-BR/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md b/translations/pt-BR/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md
index 6e61b93b29..a5b193c110 100644
--- a/translations/pt-BR/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md
+++ b/translations/pt-BR/content/github/building-a-strong-community/limiting-interactions-in-your-organization.md
@@ -1,29 +1,37 @@
---
title: Restringir interações na organização
-intro: 'Os proprietários de organizações podem restringir temporariamente determinados usuários de comentar, abrir problemas ou criar pull requests nos repositórios públicos da organização para impor um período de atividade limitada.'
+intro: 'You can temporarily enforce a period of limited activity for certain users in all public repositories owned by your organization.'
redirect_from:
- /github/setting-up-and-managing-organizations-and-teams/limiting-interactions-in-your-organization
- /articles/limiting-interactions-in-your-organization
versions:
free-pro-team: '*'
+permissions: Organization owners can limit interactions in an organization.
---
-Depois de 24 horas, os usuários podem retomar à atividade normal nos repositórios públicos de sua organização. Quando você habilita restrições de atividades para toda a organização, você não pode habilitar ou desabilitar restrições de interação em repositórios individuais. Para obter mais informações sobre restrições de atividades por repositórios, consulte "[Restringir interações no repositório](/articles/limiting-interactions-in-your-repository)".
+### About temporary interaction limits
-{% tip %}
+Limiting interactions in your organization enables temporary interaction limits for all public repositories owned by the organization. {% data reusables.community.interaction-limits-restrictions %}
-**Dica:** proprietários de organizações também podem bloquear usuários por um período específico. Após o término do bloqueio, o usuário é automaticamente desbloqueado. Para obter mais informações, consulte "[Bloquear um usuário em sua organização](/articles/blocking-a-user-from-your-organization)".
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your organization's public repositories.
-{% endtip %}
+{% data reusables.community.types-of-interaction-limits %}
+
+Members of the organization are not affected by any of the limit types.
+
+Quando você habilita restrições de atividades para toda a organização, você não pode habilitar ou desabilitar restrições de interação em repositórios individuais. For more information on limiting activity for an individual repository, see "[Limiting interactions in your repository](/articles/limiting-interactions-in-your-repository)."
+
+Organization owners can also block users for a specific amount of time. Após o término do bloqueio, o usuário é automaticamente desbloqueado. Para obter mais informações, consulte "[Bloquear um usuário em sua organização](/articles/blocking-a-user-from-your-organization)".
+
+### Restringir interações na organização
{% data reusables.profile.access_profile %}
{% data reusables.profile.access_org %}
{% data reusables.organizations.org_settings %}
-4. Na barra lateral da organização, em Settings (Configurações), clique em **Interaction limits** (Restrições de interação). 
-5. Em "Temporary interaction limits" (Restrições de interação temporárias), clique em uma ou mais opções.
- - **Limit to existing users** (Restringir a usuários existentes): restringe a atividade para usuários da organização com contas que tenham sido criadas há menos de 24 horas, que não tenham contribuições prévias e que não sejam colaboradores.
- - **Limit to prior contributors** (Restringir a usuários prévios): restringe a atividade para usuários da organização que não tenham contribuído anteriormente e que não sejam colaboradores.
- - "[Níveis de permissão do repositório de conta de usuário](/articles/permission-levels-for-a-user-account-repository)"
+1. In the organization settings sidebar, click **Moderation settings**. 
+1. Under "Moderation settings", click **Interaction limits**. 
+{% data reusables.community.set-interaction-limit %}
+ 
### Leia mais
- "[Denunciar abuso ou spam](/articles/reporting-abuse-or-spam)"
diff --git a/translations/pt-BR/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md b/translations/pt-BR/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md
index c95a28b382..24e8f07689 100644
--- a/translations/pt-BR/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md
+++ b/translations/pt-BR/content/github/building-a-strong-community/limiting-interactions-in-your-repository.md
@@ -1,28 +1,32 @@
---
title: Restringir interações no repositório
-intro: 'Pessoas com acesso de proprietário ou administradors podem restringir temporariamente determinados usuários de comentar, abrir problemas ou criar pull requests em seu repositório público para impor um período de atividade limitada.'
+intro: 'You can temporarily enforce a period of limited activity for certain users on a public repository.'
redirect_from:
- /articles/limiting-interactions-with-your-repository/
- /articles/limiting-interactions-in-your-repository
versions:
free-pro-team: '*'
+permissions: People with admin permissions to a repository can temporarily limit interactions in that repository.
---
-Depois de 24 horas, os usuários podem retomar à atividade normal no repositórios.
+### About temporary interaction limits
-{% tip %}
+{% data reusables.community.interaction-limits-restrictions %}
-**Dica:** proprietários da organização podem habilitar restrições de atividades em toda a organização. Se restrições de atividades são habilitadas em toda a organização, você não pode restringir atividades em repositórios individuais. Para obter mais informações, consulte "[Restringir interações na organização](/articles/limiting-interactions-in-your-organization)".
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your repository.
-{% endtip %}
+{% data reusables.community.types-of-interaction-limits %}
+
+You can also enable activity limitations on all repositories owned by your user account or an organization. If a user-wide or organization-wide limit is enabled, you can't limit activity for individual repositories owned by the account. For more information, see "[Limiting interactions for your user account](/github/building-a-strong-community/limiting-interactions-for-your-user-account)" and "[Limiting interactions in your organization](/github/building-a-strong-community/limiting-interactions-in-your-organization)."
+
+### Restringir interações no repositório
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
-3. Na barra lateral do repositório, em Settings (Configurações), clique em **Interaction limits** (Restrições de interação). 
-4. Em "Temporary interaction limits" (Restrições de interação temporárias), clique em uma ou mais opções.
- - **Limit to existing users** (Restringir a usuários existentes): restringe a atividade para usuários com contas que tenham sido criadas há menos de 24 horas, que não tenham contribuições prévias e que não sejam colaboradores.
- - **Limit to prior contributors** (Restringir a usuários prévios): restringe a atividade para usuários que não tenham contribuído anteriormente e que não sejam colaboradores.
- - "[Níveis de permissão do repositório de conta de usuário](/articles/permission-levels-for-a-user-account-repository)"
+1. In the left sidebar, click **Moderation settings**. 
+1. Under "Moderation settings", click **Interaction limits**. 
+{% data reusables.community.set-interaction-limit %}
+ 
### Leia mais
- "[Denunciar abuso ou spam](/articles/reporting-abuse-or-spam)"
diff --git a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md
index 79df73332f..d3898c1128 100644
--- a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md
+++ b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md
@@ -38,6 +38,10 @@ Você pode exibir todas as revisões que uma pull request recebeu na linha do te
{% data reusables.pull_requests.resolving-conversations %}
+### Re-requesting a review
+
+{% data reusables.pull_requests.re-request-review %}
+
### Revisões obrigatórias
{% data reusables.pull_requests.required-reviews-for-prs-summary %}
diff --git a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md
index e2d00351a4..81190022aa 100644
--- a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md
+++ b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request.md
@@ -25,6 +25,10 @@ Cada pessoa que sugeriu uma alteração incluída no commit será uma coautora d
4. No campo de mensagem do commit, digite uma mensagem curta e relevante que descreva a alteração que você fez no arquivo ou arquivos. 
5. Clique em **Commit changes** (Fazer commit das alterações). 
+### Re-requesting a review
+
+{% data reusables.pull_requests.re-request-review %}
+
### Abrir um problema para uma sugestão fora do escopo
Se alguém sugerir alterações na sua pull request que estão fora do escopo dela, abra um novo problema para acompanhar o feedback. Para obter mais informações, consulte "[Abrir um problema a partir de um comentário](/github/managing-your-work-on-github/opening-an-issue-from-a-comment)".
diff --git a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md
index 1f0d73e7e0..fe9595fa3f 100644
--- a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md
+++ b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md
@@ -43,6 +43,12 @@ Se decidir que não quer que as alterações em um branch de tópico sofram merg
{% data reusables.files.choose-commit-email %}
+ {% note %}
+
+ **Note:** The email selector is not available for rebase merges, which do not create a merge commit, or for squash merges, which credit the user who created the pull request as the author of the squashed commit.
+
+ {% endnote %}
+
6. Clique em **Confirm merge** (Confirmar merge), **Confirm squash and merge** (Confirmar combinação por squash e merge) ou **Confirm rebase and merge** (Confirmar rebase e merge).
6. Opcionalmente, [exclua o branch](/articles/deleting-unused-branches). Assim, a lista de branches do repositório ficará limpa.
diff --git a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
index a9c0d595ad..1aca29abb9 100644
--- a/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
+++ b/translations/pt-BR/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
@@ -13,7 +13,7 @@ Para poder sincronizar a bifurcação com o repositório upstream, você deve [c
{% data reusables.command_line.open_the_multi_os_terminal %}
2. Altere o diretório de trabalho atual referente ao seu projeto local.
-3. Obtenha os branches e os respectivos commits do repositório upstream. Commits to `main` will be stored in a local branch, `upstream/main`.
+3. Obtenha os branches e os respectivos commits do repositório upstream. Commits to `BRANCHNAME` will be stored in the local branch `upstream/BRANCHNAME`.
```shell
$ git fetch upstream
> remote: Counting objects: 75, done.
@@ -23,12 +23,12 @@ Para poder sincronizar a bifurcação com o repositório upstream, você deve [c
> From https://{% data variables.command_line.codeblock %}/ORIGINAL_OWNER/ORIGINAL_REPOSITORY
> * [new branch] main -> upstream/main
```
-4. Check out your fork's local `main` branch.
+4. Check out your fork's local default branch - in this case, we use `main`.
```shell
$ git checkout main
> Switched to branch 'main'
```
-5. Merge the changes from `upstream/main` into your local `main` branch. This brings your fork's `main` branch into sync with the upstream repository, without losing your local changes.
+5. Merge the changes from the upstream default branch - in this case, `upstream/main` - into your local default branch. This brings your fork's default branch into sync with the upstream repository, without losing your local changes.
```shell
$ git merge upstream/main
> Updating a422352..5fdff0f
diff --git a/translations/pt-BR/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md b/translations/pt-BR/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md
index 1c1de419fd..7e24ef2c68 100644
--- a/translations/pt-BR/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md
+++ b/translations/pt-BR/content/github/developing-online-with-codespaces/configuring-codespaces-for-your-project.md
@@ -61,7 +61,6 @@ Você pode usar as chaves de configuração compatíveis com {% data variables.p
- `settings`
- `extensões`
- `forwardPorts`
-- `devPort`
- `postCreateCommand`
#### Docker, arquivo Docker ou configurações de imagem
@@ -73,13 +72,9 @@ Você pode usar as chaves de configuração compatíveis com {% data variables.p
- `remoteEnv`
- `containerUser`
- `remoteUser`
-- `updateRemoteUserUID`
- `mounts`
-- `workspaceMount`
-- `workspaceFolder`
- `runArgs`
- `overrideCommand`
-- `shutdownAction`
- `dockerComposeFile`
Para obter mais informações sobre as configurações disponíveis para `devcontainer.json`, consulte [referência do devcontainer.json](https://aka.ms/vscode-remote/devcontainer.json) na documentação do {% data variables.product.prodname_vscode %}.
diff --git a/translations/pt-BR/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md b/translations/pt-BR/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md
index 0a3572b620..af356b8368 100644
--- a/translations/pt-BR/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md
+++ b/translations/pt-BR/content/github/developing-online-with-codespaces/personalizing-codespaces-for-your-account.md
@@ -32,7 +32,7 @@ Se nenhum desses arquivos for encontrado, quaisquer arquivos ou pastas nos `dotf
Quaisquer alterações no repositório de `dotfiles` serão aplicadas apenas a cada novo codespace e não afetarão nenhum codespace existente.
-Para obter mais informações, consulte [Personalizar](https://docs.microsoft.com/en-us/visualstudio/online/reference/personalizing) na documentação do {% data variables.product.prodname_vscode %}.
+Para obter mais informações, consulte [Personalizar](https://docs.microsoft.com/visualstudio/online/reference/personalizing) na documentação do {% data variables.product.prodname_vscode %}.
{% note %}
diff --git a/translations/pt-BR/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md b/translations/pt-BR/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md
index 2f895d98da..6b6b7b6062 100644
--- a/translations/pt-BR/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md
+++ b/translations/pt-BR/content/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github.md
@@ -32,14 +32,14 @@ Alguns projetos de código aberto oferecem espelhos em {% data variables.product
Seguem aqui alguns repositórios de destaque espelhados em {% data variables.product.prodname_dotcom_the_website %}:
-- [android](https://github.com/android)
+- [Android Open Source Project](https://github.com/aosp-mirror)
- [The Apache Software Foundation](https://github.com/apache)
- [The Chromium Project](https://github.com/chromium)
-- [The Eclipse Foundation](https://github.com/eclipse)
+- [Eclipse Foundation](https://github.com/eclipse)
- [The FreeBSD Project](https://github.com/freebsd)
-- [The Glasgow Haskell Compiler](https://github.com/ghc)
+- [Glasgow Haskell Compiler](https://github.com/ghc)
- [GNOME](https://github.com/GNOME)
-- [The Linux kernel source tree](https://github.com/torvalds/linux)
+- [Linux kernel source tree](https://github.com/torvalds/linux)
- [Qt](https://github.com/qt)
É possível estabelecer seu próprio espelho, configurando [um post-receive hook](https://git-scm.com/book/en/Customizing-Git-Git-Hooks) em seu repositório de projetos oficial para fazer push de commits automaticamente para um repositório espelho em {% data variables.product.product_name %}.
diff --git a/translations/pt-BR/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md b/translations/pt-BR/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md
index e0e356a1cf..5f77beef3f 100644
--- a/translations/pt-BR/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md
+++ b/translations/pt-BR/content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-server.md
@@ -13,7 +13,7 @@ versions:
Você pode solicitar uma versão de avaliação por 45 dias do {% data variables.product.prodname_ghe_server %}. A versão de avaliação será instalada como um appliance virtual, com opções para implementação local ou na nuvem. Consulte a lista de plataformas de visualização compatíveis em "[Configurar uma instância do GitHub Enterprise Server](/enterprise/admin/installation/setting-up-a-github-enterprise-server-instance)".
-{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}Alertas {% endif %} de segurança e {% data variables.product.prodname_github_connect %} não estão atualmente disponíveis em testes de {% data variables.product.prodname_ghe_server %}. Para uma demonstração desses recursos, entre em contato com {% data variables.contact.contact_enterprise_sales %}. Para obter mais informações sobre esses recursos, consulte "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" e "[Conectando {% data variables.product.prodname_ghe_server %} a {% data variables.product.prodname_dotcom_the_website %}](/enterprise/admin/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)".
+{% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}Alertas {% endif %} de segurança e {% data variables.product.prodname_github_connect %} não estão atualmente disponíveis em testes de {% data variables.product.prodname_ghe_server %}. Para uma demonstração desses recursos, entre em contato com {% data variables.contact.contact_enterprise_sales %}. Para obter mais informações sobre esses recursos, consulte "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" e "[Conectando {% data variables.product.prodname_ghe_server %} a {% data variables.product.prodname_dotcom_the_website %}](/enterprise/admin/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)".
As versões de avaliação também estão disponíveis para {% data variables.product.prodname_ghe_cloud %}. Para obter mais informações, consulte "[Configurar uma versão de avaliação do {% data variables.product.prodname_ghe_cloud %}](/articles/setting-up-a-trial-of-github-enterprise-cloud)".
diff --git a/translations/pt-BR/content/github/managing-large-files/removing-files-from-a-repositorys-history.md b/translations/pt-BR/content/github/managing-large-files/removing-files-from-a-repositorys-history.md
index 24cdc55fc9..ee8839da33 100644
--- a/translations/pt-BR/content/github/managing-large-files/removing-files-from-a-repositorys-history.md
+++ b/translations/pt-BR/content/github/managing-large-files/removing-files-from-a-repositorys-history.md
@@ -16,10 +16,6 @@ versions:
{% endwarning %}
-### Remover um arquivo adicionado em um commit anterior
-
-Se você adicionou um arquivo em um commit anterior, você deverá removê-lo do histórico do repositório. Para remover arquivos do histórico do repositório, você pode usar o comando BFG Repo-Cleaner ou o `git filter-branch`. Para obter mais informações, consulte "[Remover dados confidenciais de um repositório](/github/authenticating-to-github/removing-sensitive-data-from-a-repository)".
-
### Remover um arquivo adicionado ao commit não processado mais recente
Se o arquivo foi adicionado ao commit mais recente e ainda não foi processado no {% data variables.product.product_location %}, você poderá excluir o arquivo e corrigir o commit:
@@ -43,3 +39,7 @@ Se o arquivo foi adicionado ao commit mais recente e ainda não foi processado n
$ git push
# Push our rewritten, smaller commit
```
+
+### Remover um arquivo adicionado em um commit anterior
+
+Se você adicionou um arquivo em um commit anterior, você deverá removê-lo do histórico do repositório. Para remover arquivos do histórico do repositório, você pode usar o comando BFG Repo-Cleaner ou o `git filter-branch`. Para obter mais informações, consulte "[Remover dados confidenciais de um repositório](/github/authenticating-to-github/removing-sensitive-data-from-a-repository)".
diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/about-dependabot-security-updates.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/about-dependabot-security-updates.md
new file mode 100644
index 0000000000..a645e9ae21
--- /dev/null
+++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/about-dependabot-security-updates.md
@@ -0,0 +1,35 @@
+---
+title: About Dependabot security updates
+intro: '{% data variables.product.prodname_dependabot %} can fix vulnerable dependencies for you by raising pull requests with security updates.'
+shortTitle: About Dependabot security updates
+redirect_from:
+ - /github/managing-security-vulnerabilities/about-github-dependabot-security-updates
+versions:
+ free-pro-team: '*'
+---
+
+### Sobre o {% data variables.product.prodname_dependabot_security_updates %}
+
+{% data variables.product.prodname_dependabot_security_updates %} make it easier for you to fix vulnerable dependencies in your repository. If you enable this feature, when a {% data variables.product.prodname_dependabot %} alert is raised for a vulnerable dependency in the dependency graph of your repository, {% data variables.product.prodname_dependabot %} automatically tries to fix it. For more information, see "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" and "[Configuring {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)."
+
+{% data variables.product.prodname_dependabot %} checks whether it's possible to upgrade the vulnerable dependency to a fixed version without disrupting the dependency graph for the repository. Then {% data variables.product.prodname_dependabot %} raises a pull request to update the dependency to the minimum version that includes the patch and links the pull request to the {% data variables.product.prodname_dependabot %} alert, or reports an error on the alert. For more information, see "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)."
+
+{% note %}
+
+**Observação**
+
+The {% data variables.product.prodname_dependabot_security_updates %} feature is available for repositories where you have enabled the dependency graph and {% data variables.product.prodname_dependabot_alerts %}. You will see a {% data variables.product.prodname_dependabot %} alert for every vulnerable dependency identified in your full dependency graph. However, security updates are triggered only for dependencies that are specified in a manifest or lock file. {% data variables.product.prodname_dependabot %} is unable to update an indirect or transitive dependency that is not explicitly defined. Para obter mais informações, consulte "[Sobre o gráfico de dependência](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#dependencies-included)".
+
+{% endnote %}
+
+### About pull requests for security updates
+
+Each pull request contains everything you need to quickly and safely review and merge a proposed fix into your project. Isto inclui informações sobre a vulnerabilidade como, por exemplo, notas de lançamento, entradas de registros de mudanças e detalhes do commit. Details of which vulnerability a pull request resolves are hidden from anyone who does not have access to {% data variables.product.prodname_dependabot_alerts %} for the repository.
+
+When you merge a pull request that contains a security update, the corresponding {% data variables.product.prodname_dependabot %} alert is marked as resolved for your repository. For more information about {% data variables.product.prodname_dependabot %} pull requests, see "[Managing pull requests for dependency updates](/github/administering-a-repository/managing-pull-requests-for-dependency-updates)."
+
+{% data reusables.dependabot.automated-tests-note %}
+
+### Sobre pontuações de compatibilidade
+
+{% data variables.product.prodname_dependabot_security_updates %} may include compatibility scores to let you know whether updating a vulnerability could cause breaking changes to your project. These are calculated from CI tests in other public repositories where the same security update has been generated. An update's compatibility score is the percentage of CI runs that passed when updating between specific versions of the dependency.
diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-dependabot-security-updates.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-dependabot-security-updates.md
new file mode 100644
index 0000000000..860d7784a1
--- /dev/null
+++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-dependabot-security-updates.md
@@ -0,0 +1,60 @@
+---
+title: Configuring Dependabot security updates
+intro: 'Você pode usar {% data variables.product.prodname_dependabot_security_updates %} ou pull requests manuais para atualizar facilmente dependências vulneráveis.'
+shortTitle: Configuring Dependabot security updates
+redirect_from:
+ - /articles/configuring-automated-security-fixes
+ - /github/managing-security-vulnerabilities/configuring-automated-security-fixes
+ - /github/managing-security-vulnerabilities/configuring-automated-security-updates
+ - /github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates
+versions:
+ free-pro-team: '*'
+---
+
+### About configuring {% data variables.product.prodname_dependabot_security_updates %}
+
+You can enable {% data variables.product.prodname_dependabot_security_updates %} for any repository that uses {% data variables.product.prodname_dependabot_alerts %} and the dependency graph. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
+
+Você pode desativar as {% data variables.product.prodname_dependabot_security_updates %} em um repositório individual ou para todos os repositórios que pertencem à sua conta de usuário ou organização. Para obter mais informações, consulte "[Gerenciar o {% data variables.product.prodname_dependabot_security_updates %} para seus repositórios](#managing-dependabot-security-updates-for-your-repositories) abaixo".
+
+{% data reusables.dependabot.dependabot-tos %}
+
+### Repositórios compatíveis
+
+O {% data variables.product.prodname_dotcom %} habilita automaticamente o {% data variables.product.prodname_dependabot_security_updates %} para cada repositório que atende a estes pré-requisitos.
+
+{% note %}
+
+**Observação**: Você pode habilitar manualmente {% data variables.product.prodname_dependabot_security_updates %}, mesmo que o repositório não atenda a alguns dos pré-requisitos abaixo. Por exemplo, você pode habilitar {% data variables.product.prodname_dependabot_security_updates %} em uma bifurcação, ou para um gerenciador de pacotes que não é suportado diretamente seguindo as instruções em "[Gerenciar {% data variables.product.prodname_dependabot_security_updates %} para seus repositórios](#managing-dependabot-security-updates-for-your-repositories). "
+
+{% endnote %}
+
+| Pré-requisito de habilitação automática | Mais informações |
+| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| O repositório não é uma bifurcação | "[Sobre bifurcações](/github/collaborating-with-issues-and-pull-requests/about-forks)" |
+| Repositório não está arquivado | "[Arquivar repositórios](/github/creating-cloning-and-archiving-repositories/archiving-repositories)" |
+| O repositório é público ou o repositório é privado e você ativou a análise somente leitura por {% data variables.product.prodname_dotcom %}, dependência gráfico e alertas de vulnerabilidade nas configurações do repositório | "[Gerenciar configurações de uso de dados para seu repositório privado](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)". |
+| O repositório contém o arquivo de manifesto de dependência de um ecossistema de pacote compatível com o {% data variables.product.prodname_dotcom %} | "[Ecossistemas de pacotes compatíveis](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)" |
+| {% data variables.product.prodname_dependabot_security_updates %} não estão desativadas para o repositório | "[Gerenciar {% data variables.product.prodname_dependabot_security_updates %} para o seu repositório](#managing-dependabot-security-updates-for-your-repositories)" |
+| O repositório já não está utilizando uma integração para o gerenciamento de dependências | "[Sobre integrações](/github/customizing-your-github-workflow/about-integrations)" |
+
+Se as atualizações de segurança não estiverem habilitadas para o seu repositório e você não souber o motivo, primeiro tente habilitá-las utilizando as instruções fornecidas nas seções de procedimento abaixo. Se, ainda assim, as atualizações de segurança não funcionarem, você poderá [entrar em contato com o suporte](https://support.github.com/contact).
+
+### Gerenciar {% data variables.product.prodname_dependabot_security_updates %} para seus repositórios
+
+Você pode habilitar ou desabilitar {% data variables.product.prodname_dependabot_security_updates %} em um repositório individual.
+
+Você também pode habilitar ou desabilitar {% data variables.product.prodname_dependabot_security_updates %} para todos os repositórios pertencentes à sua conta de usuário ou organização. Para mais informações consulte "[Gerenciar as configurações de segurança e análise da sua conta de usuário](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" ou "[Gerenciar as configurações de segurança e análise da sua organização](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)".
+
+O {% data variables.product.prodname_dependabot_security_updates %} exige configurações específicas do repositório. Para obter mais informações, consulte "[Repositórios compatíveis](#supported-repositories)".
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-security %}
+{% data reusables.repositories.sidebar-dependabot-alerts %}
+1. Acima da lista de alertas, use o menu suspenso e selecione ou desmarque as atualizações de segurança do **{% data variables.product.prodname_dependabot %}**. 
+
+### Leia mais
+
+- "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)"
+- "[Gerenciar configurações de uso de dados para o seu repositório privado](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)"
+- "[Ecossistemas de pacotes compatíveis](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)"
diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md
index 9eb238ba9b..2b32234811 100644
--- a/translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md
+++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md
@@ -1,7 +1,7 @@
---
title: Configuring notifications for vulnerable dependencies
shortTitle: Configuring notifications
-intro: 'Optimize how you receive notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts.'
+intro: 'Optimize how you receive notifications about {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts.'
versions:
free-pro-team: '*'
enterprise-server: '>=2.21'
@@ -9,10 +9,10 @@ versions:
### About notifications for vulnerable dependencies
-{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we generate a {% data variables.product.prodname_dependabot_short %} alert and display it on the Security tab for the repository. {% data variables.product.product_name %} notifies the maintainers of affected repositories about the new alert according to their notification preferences.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot_short %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability.
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we generate a {% data variables.product.prodname_dependabot %} alert and display it on the Security tab for the repository. {% data variables.product.product_name %} notifies the maintainers of affected repositories about the new alert according to their notification preferences.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability.
{% endif %}
-{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_short %} alerts for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)."
+{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-features-for-new-repositories)."
{% endif %}
{% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.21" %}
@@ -21,7 +21,7 @@ Your site administrator needs to enable security alerts for vulnerable dependenc
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.20" %}
By default, if your site administrator has configured email for notifications on your enterprise, you will receive {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} by email.{% endif %}
-{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_short %} alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
+{% if currentVersion ver_gt "enterprise-server@2.21" %}Site administrators can also enable {% data variables.product.prodname_dependabot_alerts %} without notifications. For more information, see "[Enabling {% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
{% if currentVersion ver_lt "enterprise-server@2.22" %}Site administrators can also enable security alerts without notifications. For more information, see "[Enabling security alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
@@ -33,14 +33,14 @@ You can configure notification settings for yourself or your organization from t
{% data reusables.notifications.vulnerable-dependency-notification-options %}
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
- 
+ 
{% else %}

{% endif %}
{% note %}
-**Note:** You can filter your {% data variables.product.company_short %} inbox notifications to show {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. For more information, see "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)."
+**Note:** You can filter your {% data variables.product.company_short %} inbox notifications to show {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %} security{% endif %} alerts. For more information, see "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)."
{% endnote %}
diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/index.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/index.md
index efcc006abb..d2056ce545 100644
--- a/translations/pt-BR/content/github/managing-security-vulnerabilities/index.md
+++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/index.md
@@ -30,9 +30,9 @@ versions:
{% link_in_list /about-alerts-for-vulnerable-dependencies %}
{% link_in_list /configuring-notifications-for-vulnerable-dependencies %}
- {% link_in_list /about-github-dependabot-security-updates %}
- {% link_in_list /configuring-github-dependabot-security-updates %}
+ {% link_in_list /about-dependabot-security-updates %}
+ {% link_in_list /configuring-dependabot-security-updates %}
{% link_in_list /viewing-and-updating-vulnerable-dependencies-in-your-repository %}
{% link_in_list /troubleshooting-the-detection-of-vulnerable-dependencies %}
- {% link_in_list /troubleshooting-github-dependabot-errors %}
+ {% link_in_list /troubleshooting-dependabot-errors %}
diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors.md
new file mode 100644
index 0000000000..f1b3af4c35
--- /dev/null
+++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors.md
@@ -0,0 +1,84 @@
+---
+title: Troubleshooting Dependabot errors
+intro: 'Sometimes {% data variables.product.prodname_dependabot %} is unable to raise a pull request to update your dependencies. You can review the error and unblock {% data variables.product.prodname_dependabot %}.'
+shortTitle: Solução de erros
+redirect_from:
+ - /github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors
+versions:
+ free-pro-team: '*'
+---
+
+{% data reusables.dependabot.beta-note %}
+
+### About {% data variables.product.prodname_dependabot %} errors
+
+{% data reusables.dependabot.pull-request-introduction %}
+
+If anything prevents {% data variables.product.prodname_dependabot %} from raising a pull request, this is reported as an error.
+
+### Investigating errors with {% data variables.product.prodname_dependabot_security_updates %}
+
+When {% data variables.product.prodname_dependabot %} is blocked from creating a pull request to fix a {% data variables.product.prodname_dependabot %} alert, it posts the error message on the alert. The {% data variables.product.prodname_dependabot_alerts %} view shows a list of any alerts that have not been resolved yet. To access the alerts view, click **{% data variables.product.prodname_dependabot_alerts %}** on the **Security** tab for the repository. Where a pull request that will fix the vulnerable dependency has been generated, the alert includes a link to that pull request.
+
+
+
+There are three reasons why an alert may have no pull request link:
+
+1. {% data variables.product.prodname_dependabot_security_updates %} are not enabled for the repository.
+1. The alert is for an indirect or transitive dependency that is not explicitly defined in a lock file.
+1. An error blocked {% data variables.product.prodname_dependabot %} from creating a pull request.
+
+If an error blocked {% data variables.product.prodname_dependabot %} from creating a pull request, you can display details of the error by clicking the alert.
+
+
+
+### Investigating errors with {% data variables.product.prodname_dependabot_version_updates %}
+
+When {% data variables.product.prodname_dependabot %} is blocked from creating a pull request to update a dependency in an ecosystem, it posts the error icon on the manifest file. The manifest files that are managed by {% data variables.product.prodname_dependabot %} are listed on the {% data variables.product.prodname_dependabot %} tab. To access this tab, on the **Insights** tab for the repository click **Dependency graph**, and then click the **{% data variables.product.prodname_dependabot %}** tab.
+
+
+
+To see the log file for any manifest file, click the **Last checked TIME ago** link. When you display the log file for a manifest that's shown with an error symbol (for example, Maven in the screenshot above), any errors are also displayed.
+
+
+
+### Understanding {% data variables.product.prodname_dependabot %} errors
+
+Pull requests for security updates act to upgrade a vulnerable dependency to the minimum version that includes a fix for the vulnerability. In contrast, pull requests for version updates act to upgrade a dependency to the latest version allowed by the package manifest and {% data variables.product.prodname_dependabot %} configuration files. Consequently, some errors are specific to one type of update.
+
+#### {% data variables.product.prodname_dependabot %} cannot update DEPENDENCY to a non-vulnerable version
+
+**Security updates only.** {% data variables.product.prodname_dependabot %} cannot create a pull request to update the vulnerable dependency to a secure version without breaking other dependencies in the dependency graph for this repository.
+
+Every application that has dependencies has a dependency graph, that is, a directed acyclic graph of every package version that the application directly or indirectly depends on. Every time a dependency is updated, this graph must resolve otherwise the application won't build. When an ecosystem has a deep and complex dependency graph, for example, npm and RubyGems, it is often impossible to upgrade a single dependency without upgrading the whole ecosystem.
+
+The best way to avoid this problem is to stay up to date with the most recently released versions, for example, by enabling version updates. This increases the likelihood that a vulnerability in one dependency can be resolved by a simple upgrade that doesn't break the dependency graph. Para obter detalhes, consulte "[Habilitando e desabilitando atualizações da versão](/github/administering-a-repository/enabling-and-disabling-version-updates)."
+
+#### {% data variables.product.prodname_dependabot %} cannot update to the required version as there is already an open pull request for the latest version
+
+**Security updates only.** {% data variables.product.prodname_dependabot %} will not create a pull request to update the vulnerable dependency to a secure version because there is already an open pull request to update this dependency. You will see this error when a vulnerability is detected in a single dependency and there's already an open pull request to update the dependency to the latest version.
+
+There are two options: you can review the open pull request and merge it as soon as you are confident that the change is safe, or close that pull request and trigger a new security update pull request. For more information, see "[Triggering a {% data variables.product.prodname_dependabot %} pull request manually](#triggering-a-dependabot-pull-request-manually)."
+
+#### {% data variables.product.prodname_dependabot %} timed out during its update
+
+{% data variables.product.prodname_dependabot %} took longer than the maximum time allowed to assess the update required and prepare a pull request. This error is usually seen only for large repositories with many manifest files, for example, npm or yarn monorepo projects with hundreds of *package.json* files. Updates to the Composer ecosystem also take longer to assess and may time out.
+
+This error is difficult to address. If a version update times out, you could specify the most important dependencies to update using the `allow` parameter or, alternatively, use the `ignore` parameter to exclude some dependencies from updates. Updating your configuration might allow {% data variables.product.prodname_dependabot %} to review the version update and generate the pull request in the time available.
+
+If a security update times out, you can reduce the chances of this happening by keeping the dependencies updated, for example, by enabling version updates. Para obter detalhes, consulte "[Habilitando e desabilitando atualizações da versão](/github/administering-a-repository/enabling-and-disabling-version-updates)."
+
+#### {% data variables.product.prodname_dependabot %} cannot open any more pull requests
+
+There's a limit on the number of open pull requests {% data variables.product.prodname_dependabot %} will generate. When this limit is reached, no new pull requests are opened and this error is reported. The best way to resolve this error is to review and merge some of the open pull requests.
+
+There are separate limits for security and version update pull requests, so that open version update pull requests cannot block the creation of a security update pull request. The limit for security update pull requests is 10. By default, the limit for version updates is 5 but you can change this using the `open-pull-requests-limit` parameter in the configuration file. Para obter mais informações, consulte "[Opções de configuração para atualizações de dependências](/github/administering-a-repository/configuration-options-for-dependency-updates#open-pull-requests-limit)".
+
+The best way to resolve this error is to merge or close some of the existing pull requests and trigger a new pull request manually. For more information, see "[Triggering a {% data variables.product.prodname_dependabot %} pull request manually](#triggering-a-dependabot-pull-request-manually)."
+
+### Triggering a {% data variables.product.prodname_dependabot %} pull request manually
+
+If you unblock {% data variables.product.prodname_dependabot %}, you can manually trigger a fresh attempt to create a pull request.
+
+- **Security updates**—display the {% data variables.product.prodname_dependabot %} alert that shows the error you have fixed and click **Create {% data variables.product.prodname_dependabot %} security update**.
+- **Version updates**—display the log file for the manifest that shows the error that you have fixed and click **Check for updates**.
diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md
index 1522435ed3..878d09d6c1 100644
--- a/translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md
+++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies.md
@@ -14,14 +14,14 @@ O {% data variables.product.prodname_dotcom %} gera e exibe dados de dependênci
* {% data variables.product.prodname_advisory_database %} é uma das fontes de dados que {% data variables.product.prodname_dotcom %} usa para identificar dependências vulneráveis. É um banco de dados gratuito e curado com informações sobre vulnerabilidade para ecossistemas de pacote comum em {% data variables.product.prodname_dotcom %}. Inclui tanto dados relatados diretamente para {% data variables.product.prodname_dotcom %} de {% data variables.product.prodname_security_advisories %} quanto os feeds oficiais e as fontes comunitárias. Estes dados são revisados e curados por {% data variables.product.prodname_dotcom %} para garantir que informações falsas ou não acionáveis não sejam compartilhadas com a comunidade de desenvolvimento. Para obter mais informações, consulte "[Pesquisar vulnerabilidades de segurança no {% data variables.product.prodname_advisory_database %}](/github/managing-security-vulnerabilities/browsing-security-vulnerabilities-in-the-github-advisory-database)" e "[Sobre {% data variables.product.prodname_security_advisories %}](/github/managing-security-vulnerabilities/about-github-security-advisories)".
* O gráfico de dependências analisa todos os arquivos conhecidos de manifesto de pacote no repositório de um usuário. Por exemplo, para o npm, ele irá analisar o arquivo _package-lock.json_. Ele constrói um gráfico de todas as dependências do repositório e dependências públicas. Isso acontece quando você habilita o gráfico de dependências e quando alguém faz push para o branch-padrão, e inclui commits que fazem alterações em um formato de manifesto compatível. Para obter mais informações, consulte "[Sobre o gráfico de dependência](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)".
-* {% data variables.product.prodname_dependabot_short %} verifica qualquer push, para o branch-padrão, que contém um arquivo de manifesto. Quando um novo registro de vulnerabilidade é adicionado, ele verifica todos os repositórios existentes e gera um alerta para cada repositório vulnerável. Os alertas do {% data variables.product.prodname_dependabot_short %} são agregados ao nível do repositório, em vez de criar um alerta por vulnerabilidade. Para obter mais informações, consulte "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)"
-* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot_short %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)."
+* {% data variables.product.prodname_dependabot %} verifica qualquer push, para o branch-padrão, que contém um arquivo de manifesto. Quando um novo registro de vulnerabilidade é adicionado, ele verifica todos os repositórios existentes e gera um alerta para cada repositório vulnerável. {% data variables.product.prodname_dependabot_alerts %} are aggregated at the repository level, rather than creating one alert per vulnerability. Para obter mais informações, consulte "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)"
+* {% data variables.product.prodname_dependabot_security_updates %} are triggered when you receive an alert about a vulnerable dependency in your repository. Where possible, {% data variables.product.prodname_dependabot %} creates a pull request in your repository to upgrade the vulnerable dependency to the minimum possible secure version needed to avoid the vulnerability. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)."
- {% data variables.product.prodname_dependabot_short %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. Por exemplo, uma varredura é acionada quando uma nova dependência é adicionada ({% data variables.product.prodname_dotcom %} verifica isso em cada push), ou quando uma nova vulnerabilidade é descoberta e adicionada ao banco de dados consultivo.
+ {% data variables.product.prodname_dependabot %} doesn't scan repositories for vulnerable dependencies on a schedule, but rather when something changes. Por exemplo, uma varredura é acionada quando uma nova dependência é adicionada ({% data variables.product.prodname_dotcom %} verifica isso em cada push), ou quando uma nova vulnerabilidade é descoberta e adicionada ao banco de dados consultivo.
### Por que não recebo alertas de vulnerabilidade em alguns ecossistemas?
-O {% data variables.product.prodname_dotcom %} limita seu suporte a alertas de vulnerabilidade a um conjunto de ecossistemas onde podemos fornecer dados de alta qualidade e relevantes. Vulnerabilidades sanadas no {% data variables.product.prodname_advisory_database %}, o gráfico de dependência, alertas {% data variables.product.prodname_dependabot_short %} e as atualizações de segurança {% data variables.product.prodname_dependabot_short %} são fornecidas para vários ecossistemas, incluindo o Maven do Java, o npm do JavaScript e o Yarn, NuGet do NET, pip do Python, RubyGems do Ruby e Composer do PHP. Nós continuaremos a adicionar suporte para mais ecossistemas ao longo do tempo. Para uma visão geral dos ecossistemas de pacotes suportados por nós, consulte "[Sobre o gráfico de dependências](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)".
+O {% data variables.product.prodname_dotcom %} limita seu suporte a alertas de vulnerabilidade a um conjunto de ecossistemas onde podemos fornecer dados de alta qualidade e relevantes. Curated vulnerabilities in the {% data variables.product.prodname_advisory_database %}, the dependency graph, {% data variables.product.prodname_dependabot_alerts %}, and {% data variables.product.prodname_dependabot %} security updates are provided for several ecosystems, including Java’s Maven, JavaScript’s npm and Yarn, .NET’s NuGet, Python’s pip, Ruby's RubyGems, and PHP’s Composer. Nós continuaremos a adicionar suporte para mais ecossistemas ao longo do tempo. Para uma visão geral dos ecossistemas de pacotes suportados por nós, consulte "[Sobre o gráfico de dependências](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems)".
Vale a pena notar que a [{% data variables.product.prodname_dotcom %} Consultoria de Segurança](/github/managing-security-vulnerabilities/about-github-security-advisories) pode existir para outros ecossistemas. As informações em uma consultoria de segurança são fornecidas pelos mantenedores de um determinado repositório. Estes dados não são curados da mesma forma que as informações relativas aos ecossistemas suportados.
@@ -31,7 +31,7 @@ Vale a pena notar que a [{% data variables.product.prodname_dotcom %} Consultori
O gráfico de dependências inclui informações sobre dependências explicitamente declaradas em seu ambiente. Ou seja, dependências que são especificadas em um manifesto ou um arquivo de bloqueio. O gráfico de dependências, geralmente, também inclui dependências transitivas, mesmo quando não são especificadas em um arquivo de travamento analisando as dependências das dependências em um arquivo de manifesto.
-Os alertas {% data variables.product.prodname_dependabot_short %} o aconselham sobre dependências que você deve atualizar, incluindo dependências transitivas, onde a versão pode ser determinada a partir de um manifesto ou de um arquivo de bloqueio. As atualizações de segurança {% data variables.product.prodname_dependabot_short %} apenas sugerem uma mudança onde ela pode "corrigir" diretamente a dependência, ou seja, quando estas são:
+{% data variables.product.prodname_dependabot_alerts %} advise you about dependencies you should update, including transitive dependencies, where the version can be determined from a manifest or a lockfile. As atualizações de segurança {% data variables.product.prodname_dependabot %} apenas sugerem uma mudança onde ela pode "corrigir" diretamente a dependência, ou seja, quando estas são:
* Dependências diretas, que são definidas explicitamente em um manifesto ou arquivo de bloqueio
* Dependências transitórias declaradas em um arquivo de bloqueio
@@ -51,21 +51,21 @@ Sim, o gráfico de dependências tem duas categorias de limites:
1. **Limites de processamento**
- Eles afetam o gráfico de dependências exibido dentro de {% data variables.product.prodname_dotcom %} e também impedem que sejam criados alertas do {% data variables.product.prodname_dependabot_short %}.
+ These affect the dependency graph displayed within {% data variables.product.prodname_dotcom %} and also prevent {% data variables.product.prodname_dependabot_alerts %} being created.
- Manifestos com tamanho superior a 0.5 MB são processados apenas para contas corporativas. Para as outras contas, os manifestos com tamanho superior a 0,5 MB são ignorados e não criarão alertas de {% data variables.product.prodname_dependabot_short %}.
+ Manifestos com tamanho superior a 0.5 MB são processados apenas para contas corporativas. For other accounts, manifests over 0.5 MB are ignored and will not create {% data variables.product.prodname_dependabot_alerts %}.
- Por padrão, o {% data variables.product.prodname_dotcom %} não processará mais de 20 manifestos por repositório. Não são criados alertas de {% data variables.product.prodname_dependabot_short %} para manifestos acima deste limite. Se você precisar aumentar o limite, entre em contato com {% data variables.contact.contact_support %}.
+ Por padrão, o {% data variables.product.prodname_dotcom %} não processará mais de 20 manifestos por repositório. {% data variables.product.prodname_dependabot_alerts %} are not be created for manifests beyond this limit. Se você precisar aumentar o limite, entre em contato com {% data variables.contact.contact_support %}.
2. **Limites de visualização**
- Eles afetam o que é exibido no gráfico de dependências dentro de {% data variables.product.prodname_dotcom %}. No entanto, eles não afetam os alertas de {% data variables.product.prodname_dependabot_short %} que foram criados.
+ Eles afetam o que é exibido no gráfico de dependências dentro de {% data variables.product.prodname_dotcom %}. However, they don't affect the {% data variables.product.prodname_dependabot_alerts %} that are created.
- A exibição de dependências do gráfico de dependências em um repositório só exibe 100 manifestos. De modo geral, isso é adequado, já que é significativamente maior do que o limite de processamento descrito acima. Em situações em que o limite de processamento é superior a 100, os alertas de {% data variables.product.prodname_dependabot_short %} são criados para quaisquer manifestos que não são mostrados dentro de {% data variables.product.prodname_dotcom %}.
+ A exibição de dependências do gráfico de dependências em um repositório só exibe 100 manifestos. De modo geral, isso é adequado, já que é significativamente maior do que o limite de processamento descrito acima. In situations where the processing limit is over 100, {% data variables.product.prodname_dependabot_alerts %} are still created for any manifests that are not shown within {% data variables.product.prodname_dotcom %}.
**Verifique**: A dependência que falta está em um arquivo de manifesto superior a 0,5 MB ou em um repositório com um grande número de manifestos?
-### O {% data variables.product.prodname_dependabot_short %} gera alertas de vulnerabilidades que são conhecidas há muitos anos?
+### O {% data variables.product.prodname_dependabot %} gera alertas de vulnerabilidades que são conhecidas há muitos anos?
O {% data variables.product.prodname_advisory_database %} foi lançado em novembro de 2019 e preencheu, inicialmente, a inclusão de informações de vulnerabilidade para os ecossistemas compatíveis a partir de 2017. Ao adicionar CVEs ao banco de dados, priorizamos a curadoria de CVEs mais recentes e CVEs que afetam versões mais recentes do software.
@@ -77,19 +77,19 @@ Algumas informações sobre vulnerabilidades mais antigas estão disponíveis, e
Algumas ferramentas de terceiros usam dados de CVE não descurados que não são verificados ou filtrados por um ser humano. Isto significa que os CVEs com erros de etiqueta ou de gravidade, ou outros problemas de qualidade, gerarão alertas mais frequentes, mais ruidosos e menos úteis.
-Uma vez que {% data variables.product.prodname_dependabot_short %} usa dados curados em {% data variables.product.prodname_advisory_database %}, o volume de alertas pode ser menor, mas os alertas que você recebe serão precisos e relevantes.
+Uma vez que {% data variables.product.prodname_dependabot %} usa dados curados em {% data variables.product.prodname_advisory_database %}, o volume de alertas pode ser menor, mas os alertas que você recebe serão precisos e relevantes.
### Cada vulnerabilidade de dependência gera um alerta separado?
Quando uma dependência tem várias vulnerabilidades, apenas um alerta agregado é gerado para essa dependência, em vez de um alerta por vulnerabilidade.
-A contagem de alertas de {% data variables.product.prodname_dependabot_short %} em {% data variables.product.prodname_dotcom %} mostra um total para o número de alertas, ou seja, o número de dependências com vulnerabilidades, não o número de vulnerabilidades.
+The {% data variables.product.prodname_dependabot_alerts %} count in {% data variables.product.prodname_dotcom %} shows a total for the number of alerts, that is, the number of dependencies with vulnerabilities, not the number of vulnerabilities.
-
+
Ao clicar para exibir os detalhes de alerta, você pode ver quantas vulnerabilidades são incluídas no alerta.
-
+
**Verifique**: Se houver discrepância no total que você está vendo, verifique se você não está comparando números de alerta com números de vulnerabilidade.
@@ -98,4 +98,4 @@ Ao clicar para exibir os detalhes de alerta, você pode ver quantas vulnerabilid
- "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)"
- "[Visualizar e atualizar dependências vulneráveis no seu repositório](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)"
- "[Gerenciar as configurações de segurança e análise para o seu repositório](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)"
-- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)"
+- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)"
diff --git a/translations/pt-BR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md b/translations/pt-BR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
index 2942f2ea48..a1e4114a7a 100644
--- a/translations/pt-BR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
+++ b/translations/pt-BR/content/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository.md
@@ -11,11 +11,11 @@ versions:
A aba de alertas do {% data variables.product.prodname_dependabot %} do seu repositório lista todos {% data variables.product.prodname_dependabot_alerts %} e as {% data variables.product.prodname_dependabot_security_updates %} correspondente. Você pode classificar a lista de alertas usando o menu suspenso e clicar em determinados alertas para ver mais detalhes. Para obter mais informações, consulte "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)"
-É possível habilitar atualizações de segurança automáticas para qualquer repositório que usa o {% data variables.product.prodname_dependabot_alerts %} e o gráfico de dependências. Para obter mais informações, consulte "[Sobre {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)".
+É possível habilitar atualizações de segurança automáticas para qualquer repositório que usa o {% data variables.product.prodname_dependabot_alerts %} e o gráfico de dependências. For more information, see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)."
### Sobre atualizações para dependências vulneráveis no seu repositório
-{% data variables.product.product_name %} generates {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. Para repositórios em que o {% data variables.product.prodname_dependabot_security_updates %} está ativado, quando {% data variables.product.product_name %} detecta uma dependência vulnerável, {% data variables.product.prodname_dependabot_short %} cria um pull request para corrigi-la. O pull request irá atualizar a dependência para a versão minimamente segura possível, o que é necessário para evitar a vulnerabilidade.
+{% data variables.product.product_name %} generates {% data variables.product.prodname_dependabot_alerts %} when we detect vulnerabilities affecting your repository. Para repositórios em que o {% data variables.product.prodname_dependabot_security_updates %} está ativado, quando {% data variables.product.product_name %} detecta uma dependência vulnerável, {% data variables.product.prodname_dependabot %} cria um pull request para corrigi-la. O pull request irá atualizar a dependência para a versão minimamente segura possível, o que é necessário para evitar a vulnerabilidade.
### Visualizar e atualizar dependências vulneráveis
@@ -24,14 +24,14 @@ A aba de alertas do {% data variables.product.prodname_dependabot %} do seu repo
{% data reusables.repositories.sidebar-dependabot-alerts %}
1. Clique no alerta que deseja exibir. 
1. Revise as informações da vulnerabilidade e, se disponível, o pull request que contém a atualização de segurança automatizada.
-1. Opcionalmente, se ainda não houver uma atualização de {% data variables.product.prodname_dependabot_security_updates %} para o alerta, crie um pull request para resolver a vulnerabilidade. Clique em **Criar uma atualização de segurança de {% data variables.product.prodname_dependabot_short %}**. 
-1. Quando estiver pronto para atualizar a dependência e resolver a vulnerabilidade, faça merge da pull request. Cada pull request criado por {% data variables.product.prodname_dependabot_short %} inclui informações sobre os comandos que você pode usar para controlar {% data variables.product.prodname_dependabot_short %}. Para obter mais informações, consulte "[Gerenciar pull requests para atualizações de dependências](/github/administering-a-repository/managing-pull-requests-for-dependency-updates#managing-github-dependabot-pull-requests-with-comment-commands)".
+1. Opcionalmente, se ainda não houver uma atualização de {% data variables.product.prodname_dependabot_security_updates %} para o alerta, crie um pull request para resolver a vulnerabilidade. Clique em **Criar uma atualização de segurança de {% data variables.product.prodname_dependabot %}**. 
+1. Quando estiver pronto para atualizar a dependência e resolver a vulnerabilidade, faça merge da pull request. Cada pull request criado por {% data variables.product.prodname_dependabot %} inclui informações sobre os comandos que você pode usar para controlar {% data variables.product.prodname_dependabot %}. Para obter mais informações, consulte "[Gerenciar pull requests para atualizações de dependências](/github/administering-a-repository/managing-pull-requests-for-dependency-updates#managing-dependabot-pull-requests-with-comment-commands)".
1. Opcionalmente, se o alerta estiver sendo corrigido, se estiver incorreto, ou localizado em um código não utilizado, use o menu suspenso "Ignorar", e clique em um motivo para ignorar o alerta. 
### Leia mais
- "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)"
-- "[Configurar {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates)"
+- "[Configurar {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/configuring-dependabot-security-updates)"
- "[Gerenciar as configurações de segurança e análise para o seu repositório](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)"
- "[Solução de problemas na detecção de dependências vulneráveis](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)"
-- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-github-dependabot-errors)"
+- "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors)"
diff --git a/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md b/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md
index 874282e8fa..a41f92ef02 100644
--- a/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md
+++ b/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md
@@ -122,7 +122,7 @@ As notificações de e-mail do {% data variables.product.product_name %} contêm
3. Na página de configurações de notificações, escolha como receber notificações quando:
- Há atualizações em repositórios ou discussões de equipe que você está inspecionando ou em uma conversa na qual você está participando. Para obter mais informações, consulte "[Sobre notificações de participação e inspeção](#about-participating-and-watching-notifications)".
- Você obtém acesso a um novo repositório ou se juntou a uma nova equipe. Para obter mais informações, consulte "[Inspeção automática](#automatic-watching)."{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
- - Há novos {% if page.version == 'dotcom' %} {% data variables.product.prodname_dependabot_alerts %} {% else %} alertas de segurança {% endif %} em seu repositório. Para obter mais informações, consulte "[{% data variables.product.prodname_dependabot_alerts %} opções de notificação](#github-dependabot-alerts-notification-options)". {% endif %}{% if currentVersion == "enterprise-server@2.21" %}
+ - Há novos {% if page.version == 'dotcom' %} {% data variables.product.prodname_dependabot_alerts %} {% else %} alertas de segurança {% endif %} em seu repositório. Para obter mais informações, consulte "[{% data variables.product.prodname_dependabot_alerts %} opções de notificação](#dependabot-alerts-notification-options)". {% endif %}{% if currentVersion == "enterprise-server@2.21" %}
- Existem novos alertas de segurança no seu repositório. Para obter mais informações, consulte "[Opções de notificação de alerta de segurança](#security-alert-notification-options)". {% endif %} {% if currentVersion == "free-pro-team@latest" %}
- Há atualizações de fluxo de trabalho nos repositórios configurados com o {% data variables.product.prodname_actions %}. Para obter mais informações, consulte "[{% data variables.product.prodname_actions %} opções de notificação](#github-actions-notification-options)".{% endif %}
diff --git a/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md b/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
index 7d03a57105..253908d3c6 100644
--- a/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
+++ b/translations/pt-BR/content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md
@@ -82,6 +82,7 @@ Filtros personalizados atualmente não suportam:
- Distinguindo entre filtros de consulta `is:issue`, `is:pr` e `is:pull-request`. Essas consultas retornarão problemas e pull requests.
- Criando mais de 15 filtros personalizados.
- Alterando os filtros padrão ou sua ordenação.
+ - Search [exclusion](/github/searching-for-information-on-github/understanding-the-search-syntax#exclude-certain-results) using `NOT` or `-QUALIFIER`.
### Consultas suportadas para filtros personalizados
@@ -113,7 +114,7 @@ Para filtrar notificações por motivos pelos quais recebeu uma atualização, v
#### Consultas suportadas `is:`
-Para filtrar notificações para uma atividade específica no {% data variables.product.product_name %}, você pode usar a consulta `is`. For example, to only see repository invitation updates, use `is:repository-invitation`{% if currentVersion != "github-ae@latest" %}, and to only see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts, use `is:repository-vulnerability-alert`.{% endif %}
+Para filtrar notificações para uma atividade específica no {% data variables.product.product_name %}, você pode usar a consulta `is`. For example, to only see repository invitation updates, use `is:repository-invitation`{% if currentVersion != "github-ae@latest" %}, and to only see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %} security{% endif %} alerts, use `is:repository-vulnerability-alert`.{% endif %}
- `is:check-suite`
- `is:commit`
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md
index f753d60535..6f7319a611 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md
@@ -59,7 +59,7 @@ Você pode desabilitar todos os fluxos de trabalho para uma organização ou def
{% data reusables.profile.access_org %}
{% data reusables.organizations.org_settings %}
{% data reusables.organizations.settings-sidebar-actions %}
-1. Em **Políticas**, selecione **Permitir ações específicas** e adicione as suas ações necessárias à lista. 
+1. Under **Policies**, select **Allow select actions** and add your required actions to the list. 
1. Clique em **Salvar**.
{% endif %}
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md
index 290152d47b..e49e67f95f 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md
@@ -18,7 +18,7 @@ Quando se solicita automaticamente que os proprietários de códigos façam uma
### Encaminhar algoritmos
-As atribuições de revisão de código escolhem e atribuem automaticamente os revisores com base em um dos dois algoritmos possíveis.
+Code review assignments automatically choose and assign reviewers based on one of two possible algorithms.
O algoritmo round robin (rotativo) escolhe os revisores com base em quem recebeu a solicitação de revisão menos recente e tem o foco em alternar entre todos os integrantes da equipe, independentemente do número de avaliações pendentes que possuem atualmente.
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md
index 6ffbeaeb35..56be0018d7 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md
@@ -64,7 +64,7 @@ Os integrantes da organização podem ter funções de *proprietário*{% if curr
| Comprar, instalar, gerenciar cobranças e cancelar aplicativos do {% data variables.product.prodname_marketplace %} | **X** | | |
| Listar aplicativos no {% data variables.product.prodname_marketplace %} | **X** | | |{% if currentVersion != "github-ae@latest" %}
| Recebe [{% data variables.product.prodname_dependabot_alerts %} sobre dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) para todos os repositórios de uma organização | **X** | | |
-| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-github-dependabot-security-updates)") | **X** | | |{% endif %}
+| Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)") | **X** | | |{% endif %}
| [Gerenciar a política de bifurcação](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization) | **X** | | |
| [Limitar a atividade em repositórios públicos na organização](/articles/limiting-interactions-in-your-organization) | **X** | | |
| Fazer pull (ler), fazer push (gravar) e clonar (copiar) *todos os repositórios* na organização | **X** | | |
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
index aa1dd9d200..61497be9a9 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md
@@ -47,7 +47,7 @@ To search for specific events, use the `action` qualifier in your query. Actions
| `repo` | Contains all activities related to the repositories owned by your organization.{% if currentVersion == "free-pro-team@latest" %}
| `repository_content_analysis` | Contains all activities related to [enabling or disabling data use for a private repository](/articles/about-github-s-use-of-your-data).
| `repository_dependency_graph` | Contains all activities related to [enabling or disabling the dependency graph for a private repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository).{% endif %}{% if currentVersion != "github-ae@latest" %}
-| `repository_vulnerability_alert` | Contains all activities related to [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% endif %}{% if currentVersion == "free-pro-team@latest" %}
+| `repository_vulnerability_alert` | Contains all activities related to [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies).{% endif %}{% if currentVersion == "free-pro-team@latest" %}
| `sponsors` | Contains all events related to sponsor buttons (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)"){% endif %}{% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %}
| `team` | Contains all activities related to teams in your organization.{% endif %}
| `team_discussions` | Contains activities related to managing team discussions for an organization.
@@ -354,10 +354,10 @@ For more information, see "[Restricting publication of {% data variables.product
| Action | Description
|------------------|-------------------
-| `create` | Triggered when {% data variables.product.product_name %} creates a [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alert for a vulnerable dependency](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a particular repository.
+| `create` | Triggered when {% data variables.product.product_name %} creates a [{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alert for a vulnerable dependency](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a particular repository.
| `resolve` | Triggered when someone with write access to a repository [pushes changes to update and resolve a vulnerability](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a project dependency.
-| `dismiss` | Triggered when an organization owner or person with admin access to the repository dismisses a {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_short %}{% else %}security{% endif %} alert about a vulnerable dependency.{% if currentVersion == "free-pro-team@latest" %}
-| `authorized_users_teams` | Triggered when an organization owner or a member with admin permissions to the repository [updates the list of people or teams authorized to receive {% data variables.product.prodname_dependabot_short %} alerts](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-github-dependabot-alerts) for vulnerable dependencies in the repository.{% endif %}
+| `dismiss` | Triggered when an organization owner or person with admin access to the repository dismisses a {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot %}{% else %}security{% endif %} alert about a vulnerable dependency.{% if currentVersion == "free-pro-team@latest" %}
+| `authorized_users_teams` | Triggered when an organization owner or a member with admin permissions to the repository [updates the list of people or teams authorized to receive {% data variables.product.prodname_dependabot_alerts %}](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-dependabot-alerts) for vulnerable dependencies in the repository.{% endif %}
{% endif %}
{% if currentVersion == "free-pro-team@latest" %}
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md
index 4d623dc137..2b0bdf7542 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md
@@ -36,7 +36,7 @@ Com as informações de dependência, é possível visualizar vulnerabilidades,
3. No nome da organização, clique em {% octicon "graph" aria-label="The bar graph icon" %} **Insights** (Informações). 
4. Clique em **Dependencies** (Dependências) para exibir as que pertencem a esta organização. 
5. Para exibir informações de dependência para todas as suas organizações do {% data variables.product.prodname_ghe_cloud %}, clique em **My organizations** (Minhas organizações). 
-6. Você pode clicar nos resultados dos gráficos **Consultorias de segurança abertas** e **Licenças** para filtrar por um status de vulnerabilidade, uma licença ou uma combinação dos dois. 
+6. Você pode clicar nos resultados dos gráficos **Consultorias de segurança abertas** e **Licenças** para filtrar por um status de vulnerabilidade, uma licença ou uma combinação dos dois. 
7. Também pode clicar em {% octicon "package" aria-label="The package icon" %} **Dependents** (Dependentes) ao lado de cada vulnerabilidade para ver quais dependentes na organização estão usando cada biblioteca. 
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md
index 55a8f2f18f..4855d718d6 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/about-github-business-accounts/
- /articles/about-enterprise-accounts
+ - /github/setting-up-and-managing-your-enterprise-account/about-enterprise-accounts
versions:
free-pro-team: '*'
enterprise-server: '*'
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md
index 9bb333cc96..1734bf5cb4 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account.md
@@ -4,6 +4,7 @@ intro: É possível criar novas organizações para serem gerenciadas em sua con
product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/adding-organizations-to-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/adding-organizations-to-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md
index 2e64101e0d..c5a43dcdf1 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta.md
@@ -4,6 +4,7 @@ intro: 'Você pode usar o logon único (SSO) da Linguagem de Markup da Declaraç
product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /github/setting-up-and-managing-your-enterprise/configuring-single-sign-on-and-scim-for-your-enterprise-account-using-okta
+ - /github/setting-up-and-managing-your-enterprise-account/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta
versions:
free-pro-team: '*'
---
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md
index 7a75d8c7a3..2bd1d3b766 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account.md
@@ -2,6 +2,8 @@
title: Configuring the retention period for GitHub Actions artifacts and logs in your enterprise account
intro: 'Enterprise owners can configure the retention period for {% data variables.product.prodname_actions %} artifacts and logs in an enterprise account.'
product: '{% data reusables.gated-features.enterprise-accounts %}'
+redirect_from:
+ - /github/setting-up-and-managing-your-enterprise-account/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account
miniTocMaxHeadingLevel: 4
versions:
free-pro-team: '*'
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md
index 52b1a21f53..07b2acfae0 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/configuring-webhooks-for-organization-events-in-your-business-account/
- /articles/configuring-webhooks-for-organization-events-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/configuring-webhooks-for-organization-events-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md
index d5119f167c..6e1c8331a3 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/enforcing-a-policy-on-dependency-insights/
- /articles/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md
index 680009b0c1..dcb5400a30 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account.md
@@ -2,6 +2,8 @@
title: Aplicar políticas do GitHub Actions na sua conta corporativa
intro: 'Os proprietários de empresas podem habilitar, desabilitar limitar {% data variables.product.prodname_actions %} para uma conta corporativa.'
product: '{% data reusables.gated-features.enterprise-accounts %}'
+redirect_from:
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-github-actions-policies-in-your-enterprise-account
miniTocMaxHeadingLevel: 4
versions:
free-pro-team: '*'
@@ -32,7 +34,7 @@ Você pode desabilitar todos os fluxos de trabalho para uma empresa ou definir u
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.policies-tab %}
{% data reusables.enterprise-accounts.actions-tab %}
-1. Em **Políticas**, selecione **Permitir ações específicas** e adicione as suas ações necessárias à lista. 
+1. Under **Policies**, select **Allow select actions** and add your required actions to the list. 
### Habilitar fluxos de trabalho para bifurcações privadas do repositório
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md
index 5cd0a8db84..4d80b5fe84 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account.md
@@ -6,6 +6,7 @@ redirect_from:
- /articles/enforcing-project-board-settings-for-organizations-in-your-business-account/
- /articles/enforcing-project-board-policies-for-organizations-in-your-enterprise-account/
- /articles/enforcing-project-board-policies-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-project-board-policies-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md
index 894cd7ff41..3374f119cd 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account.md
@@ -6,6 +6,7 @@ redirect_from:
- /articles/enforcing-repository-management-settings-for-organizations-in-your-business-account/
- /articles/enforcing-repository-management-policies-for-organizations-in-your-enterprise-account/
- /articles/enforcing-repository-management-policies-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-repository-management-policies-in-your-enterprise-account
versions:
free-pro-team: '*'
---
@@ -48,8 +49,7 @@ Em todas as organizações pertencentes à conta corporativa, é possível permi
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.policies-tab %}
3. Na guia **Repository policies** (Políticas de repositório), em "Repository invitations" (Convites para repositórios), revise as informações sobre como alterar a configuração. {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
-4. Em "Repository invitations" (Convites para repositórios), use o menu suspenso e escolha uma política.
- 
+4. Under "Repository invitations", use the drop-down menu and choose a policy. 
### Aplicar política sobre como alterar a visibilidade do repositório
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md
index 91c866e205..804ea9da4a 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md
@@ -8,6 +8,7 @@ redirect_from:
- /articles/enforcing-security-settings-for-organizations-in-your-enterprise-account/
- /articles/enforcing-security-settings-in-your-enterprise-account
- /github/articles/managing-allowed-ip-addresses-for-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-security-settings-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md
index d5a3153b82..81353a72d9 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md
@@ -6,6 +6,7 @@ redirect_from:
- /articles/enforcing-team-settings-for-organizations-in-your-business-account/
- /articles/enforcing-team-policies-for-organizations-in-your-enterprise-account/
- /articles/enforcing-team-policies-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/enforcing-team-policies-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md
index 36167a489f..2912c3987a 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md
@@ -5,6 +5,7 @@ redirect_from:
- /github/setting-up-and-managing-your-enterprise/managing-licenses-for-the-github-enterprise-and-visual-studio-bundle
- /github/articles/about-the-github-and-visual-studio-bundle
- /articles/about-the-github-and-visual-studio-bundle
+ - /github/setting-up-and-managing-your-enterprise-account/managing-licenses-for-visual-studio-subscription-with-github-enterprise
versions:
free-pro-team: '*'
---
@@ -21,7 +22,7 @@ Para obter mais informações sobre o {% data variables.product.prodname_enterpr
1. Depois de comprar {% data variables.product.prodname_vss_ghe %}, entre em contato com {% data variables.contact.contact_enterprise_sales %} e mencione "{% data variables.product.prodname_vss_ghe %}". Você trabalhará com a equipe de vendas para criar uma conta empresarial em {% data variables.product.prodname_dotcom_the_website %}. Se você já possui uma conta corporativa em {% data variables.product.prodname_dotcom_the_website %}, ou se não tiver certeza, informe a nossa equipe de vendas.
-2. Atribua licenças para {% data variables.product.prodname_vss_ghe %} aos assinantes em {% data variables.product.prodname_vss_admin_portal_with_url %}. Para obter mais informações sobre a atribuição de licenças, consulte [Gerenciar assinaturas de {% data variables.product.prodname_vs %} com {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/en-us/visualstudio/subscriptions/assign-github) na documentação da Microsoft.
+2. Atribua licenças para {% data variables.product.prodname_vss_ghe %} aos assinantes em {% data variables.product.prodname_vss_admin_portal_with_url %}. Para obter mais informações sobre a atribuição de licenças, consulte [Gerenciar assinaturas de {% data variables.product.prodname_vs %} com {% data variables.product.prodname_enterprise %}](https://docs.microsoft.com/visualstudio/subscriptions/assign-github) na documentação da Microsoft.
3. Em {% data variables.product.prodname_dotcom_the_website %}, crie pelo menos uma organização pertencente à conta corporativa. Para obter mais informações, consulte "[Adicionar organizações à sua conta corporativa](/github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account)".
@@ -39,4 +40,4 @@ Você também pode ver convites pendentes de {% data variables.product.prodname_
### Leia mais
-- [Apresentar as assinaturas do Visual Studio com GitHub Enterprise](https://docs.microsoft.com/en-us/visualstudio/subscriptions/access-github) na documentação da Microsoft
+- [Apresentar as assinaturas do Visual Studio com GitHub Enterprise](https://docs.microsoft.com/visualstudio/subscriptions/access-github) na documentação da Microsoft
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md
index 4370448c9c..dc10a55571 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account.md
@@ -4,6 +4,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
mapTopic: true
redirect_from:
- /articles/managing-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md
index a4da012bf3..c34c8c04cf 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account.md
@@ -3,6 +3,8 @@ title: Gerenciar organizações sem proprietários na sua conta corporativa
intro: Você pode tornar-se proprietário de uma organização na sua conta corporativa que não tem proprietários no momento.
product: '{% data reusables.gated-features.enterprise-accounts %}'
permissions: Os proprietários da empresa podem gerenciar organizações sem proprietários em uma conta corporativa.
+redirect_from:
+ - /github/setting-up-and-managing-your-enterprise-account/managing-unowned-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md
index 36c82ffa5b..8e45d248fd 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise.md
@@ -4,6 +4,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
mapTopic: true
redirect_from:
- /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/managing-users-in-your-enterprise-account
- /articles/managing-users-in-your-enterprise-account
- /articles/managing-users-in-your-enterprise
versions:
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md
index 53d0de627d..91dac75dfd 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account.md
@@ -4,6 +4,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
mapTopic: true
redirect_from:
- /articles/setting-policies-for-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/setting-policies-for-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
index acc7a308df..fab65dabc9 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md
@@ -5,6 +5,7 @@ permissions: Os proprietários das empresas podem visualizar e gerenciar o acess
product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/viewing-and-managing-a-users-saml-access-to-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md
index b5b643f05a..a48bcf215c 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- /articles/viewing-the-audit-logs-for-organizations-in-your-business-account/
- /articles/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
+ - /github/setting-up-and-managing-your-enterprise-account/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
versions:
free-pro-team: '*'
---
diff --git a/translations/pt-BR/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md b/translations/pt-BR/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md
index 09ca43f047..c3bdf530cd 100644
--- a/translations/pt-BR/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md
+++ b/translations/pt-BR/content/github/setting-up-and-managing-your-github-user-account/about-your-personal-dashboard.md
@@ -29,6 +29,8 @@ Na barra lateral esquerda do painel, é possível acessar os repositórios e equ

+The list of top repositories is automatically generated, and can include any repository you have interacted with, whether it's owned directly by your account or not. Interactions include making commits and opening or commenting on issues and pull requests. The list of top repositories cannot be edited, but repositories will drop off the list 4 months after you last interacted with them.
+
Também é possível encontrar uma lista de seus repositórios, equipes e quadros de projeto recentemente visitados quando você clica na barra de pesquisa no topo de qualquer página do {% data variables.product.product_name %}.
### Permanecer atualizado com as atividades da comunidade
diff --git a/translations/pt-BR/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md b/translations/pt-BR/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
index fd62843869..fca35ec045 100644
--- a/translations/pt-BR/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
+++ b/translations/pt-BR/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
@@ -5,9 +5,7 @@ product: '{% data reusables.gated-features.github-insights %}'
redirect_from:
- /github/installing-and-configuring-github-insights/github-insights-and-data-protection-for-your-organization
versions:
- free-pro-team: '*'
enterprise-server: '*'
- github-ae: '*'
---
Para obter mais informações sobre os termos que regem {% data variables.product.prodname_insights %}, consulte o seu contrato de assinatura do {% data variables.product.prodname_ghe_one %}.
diff --git a/translations/pt-BR/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md b/translations/pt-BR/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
index cbd0b88af2..564b63e926 100644
--- a/translations/pt-BR/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
+++ b/translations/pt-BR/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
@@ -141,7 +141,8 @@ Por favor, note que a informação disponível varia de caso a caso. Algumas das
- Comunicações ou documentação (como problemas ou Wikis) em repositórios privados
- Qualquer chave de segurança usada para autenticação ou criptografia
-- **Sob circunstâncias críticas** — Se recebermos uma solicitação de informações sob certas circunstâncias críticas (onde acreditamos que a divulgação é necessária para evitar uma situação emergencial que envolva risco de morte ou graves lesões físicas para uma pessoa), podemos divulgar informações limitadas que determinarmos necessárias para permitir que a aplicação da lei responda à emergência da situação. Para qualquer informação além disso, precisaríamos de uma intimação, um mandado de busca ou ordem judicial, conforme descrito acima. Por exemplo, não divulgaremos o conteúdo de repositórios privados sem um mandado de busca. Antes de divulgar informações, confirmamos que o pedido veio de um agente de aplicação da lei, que uma autoridade enviou uma notificação oficial resumindo a situação emergencial, e a forma como as informações solicitadas ajudarão a responder à emergência.
+-
+**Sob circunstâncias críticas** — Se recebermos uma solicitação de informações sob certas circunstâncias críticas (onde acreditamos que a divulgação é necessária para evitar uma situação emergencial que envolva risco de morte ou graves lesões físicas para uma pessoa), podemos divulgar informações limitadas que determinarmos necessárias para permitir que a aplicação da lei responda à emergência da situação. Para qualquer informação além disso, precisaríamos de uma intimação, um mandado de busca ou ordem judicial, conforme descrito acima. Por exemplo, não divulgaremos o conteúdo de repositórios privados sem um mandado de busca. Antes de divulgar informações, confirmamos que o pedido veio de um agente de aplicação da lei, que uma autoridade enviou uma notificação oficial resumindo a situação emergencial, e a forma como as informações solicitadas ajudarão a responder à emergência.
### Reembolso de custos
diff --git a/translations/pt-BR/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md b/translations/pt-BR/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md
index 381b8993ff..966c6b68b9 100644
--- a/translations/pt-BR/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md
+++ b/translations/pt-BR/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md
@@ -10,7 +10,7 @@ versions:
### Sobre o uso de dados para seu repositório privado
-Ao habilitar o uso de dados para seu repositório privado, poderá acessar o gráfico de dependências, em que você pode acompanhar as dependências do repositório e receber alertas de {% data variables.product.prodname_dependabot_short %} quando o {% data variables.product.product_name %} detectar dependências vulneráveis. Para obter mais informações, consulte "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies#github-dependabot-alerts-for-vulnerable-dependencies)"
+When you enable data use for your private repository, you'll be able to access the dependency graph, where you can track your repository's dependencies and receive {% data variables.product.prodname_dependabot_alerts %} when {% data variables.product.product_name %} detects vulnerable dependencies. Para obter mais informações, consulte "[Sobre alertas para dependências vulneráveis](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies#dependabot-alerts-for-vulnerable-dependencies)"
### Habilitar ou desabilitar os recursos de uso de dados
diff --git a/translations/pt-BR/content/github/using-git/about-git-subtree-merges.md b/translations/pt-BR/content/github/using-git/about-git-subtree-merges.md
index c3d7bc4ebb..c81c4fda1a 100644
--- a/translations/pt-BR/content/github/using-git/about-git-subtree-merges.md
+++ b/translations/pt-BR/content/github/using-git/about-git-subtree-merges.md
@@ -105,5 +105,5 @@ $ git pull -s subtree spoon-knife main
### Leia mais
-- [O capítulo "Subtree Merging" no livro do _Pro Git_](https://git-scm.com/book/en/Git-Tools-Subtree-Merging)
+- [The "Advanced Merging" chapter from the _Pro Git_ book](https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging)
- "[Como usar a estratégia de merge de subárvore](https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html)"
diff --git a/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md b/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md
index e674add356..ee6e10f5bc 100644
--- a/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md
+++ b/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md
@@ -47,7 +47,7 @@ You can use the dependency graph to:
{% if currentVersion == "free-pro-team@latest" %}To generate a dependency graph, {% data variables.product.product_name %} needs read-only access to the dependency manifest and lock files for a repository. The dependency graph is automatically generated for all public repositories and you can choose to enable it for private repositories. For information about enabling or disabling it for private repositories, see "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)."{% endif %}
-{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_short %} alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
+{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}If the dependency graph is not available in your system, your site administrator can enable the dependency graph and {% data variables.product.prodname_dependabot_alerts %}. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."{% endif %}
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_lt "enterprise-server@2.22" %} If the dependency graph is not available in your system, your site administrator can enable the dependency graph and security alerts. For more information, see "[Enabling alerts for vulnerable dependencies on {% data variables.product.prodname_ghe_server %}](/enterprise/{{ currentVersion }}/admin/configuration/enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server)."
diff --git a/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md b/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md
index 5944335f47..aa6d8e0a5f 100644
--- a/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md
+++ b/translations/pt-BR/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md
@@ -37,7 +37,7 @@ Se foram detectadas vulnerabilidades no repositório, estas são exibidas na par
{% if enterpriseServerVersions contains currentVersion and currentVersion ver_gt "enterprise-server@2.21" %}
Todas as dependências diretas e indiretas especificadas no manifesto do repositório ou arquivos de bloqueio são listadas e agrupadas pelo ecossistema. Se foram detectadas vulnerabilidades no repositório, estas serão exibidas na parte superior da visualização para usuários com acesso ao
-Alertas de {% data variables.product.prodname_dependabot_short %}.
+{% data variables.product.prodname_dependabot_alerts %}.
{% note %}
diff --git a/translations/pt-BR/content/github/working-with-github-pages/about-github-pages.md b/translations/pt-BR/content/github/working-with-github-pages/about-github-pages.md
index f9aae83080..aed2ddd6d9 100644
--- a/translations/pt-BR/content/github/working-with-github-pages/about-github-pages.md
+++ b/translations/pt-BR/content/github/working-with-github-pages/about-github-pages.md
@@ -36,9 +36,9 @@ sites de {% data variables.product.prodname_pages %} nos repositórios da organi
Há três tipos de site do {% data variables.product.prodname_pages %}: projeto, usuário e organização. Os sites de projeto são conectados a um projeto específico hospedado no {% data variables.product.product_name %}, como uma biblioteca do JavaScript ou um conjunto de receitas. Os sites de usuário e organização são conectados a uma conta específica do {% data variables.product.product_name %}.
-Para publicar um site de usuário, você deve criar um repositório pertencente à sua conta de usuário denominada {% if currentVersion == "free-pro-team@latest" %}`. ithub.io`{% else %}`.`{% endif %}. Para publicar um site da organização, você deve criar um repositório pertencente a uma organização denominada {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, user and organization sites are available at `http(s)://.github.io` or `http(s)://.github.io`.{% elsif currentVersion == "github-ae@latest" %}User and organization sites are available at `http(s)://pages./` or `http(s)://pages./`.{% endif %}
+To publish a user site, you must create a repository owned by your user account that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`