github · Octomerger · Jul 20, 2022 · Jul 20, 2022 · Jul 20, 2022
diff --git a/...slations/ja-JP/content/admin/configuration/configuring-your-enterprise/index.md b/...slations/ja-JP/content/admin/configuration/configuring-your-enterprise/index.md
@@ -29,7 +29,7 @@ children:
   - /verifying-or-approving-a-domain-for-your-enterprise
   - /configuring-rate-limits
   - /configuring-applications
-  - /troubleshooting-ssl-errors
+  - /troubleshooting-tls-errors
   - /configuring-time-synchronization
   - /command-line-utilities
   - /restricting-network-traffic-to-your-enterprise

diff --git a/...-enterprise/troubleshooting-ssl-errors.md → ...-enterprise/troubleshooting-tls-errors.md b/...-enterprise/troubleshooting-ssl-errors.md → ...-enterprise/troubleshooting-tls-errors.md
@@ -1,12 +1,13 @@
 ---
-title: SSLのエラーのトラブルシューティング
-intro: アプライアンスでSSLの問題が生じたなら、解決のためのアクションを取ってください。
+title: Troubleshooting TLS errors
+intro: 'If you run into TLS issues with your appliance, you can take actions to resolve them.'
 redirect_from:
   - /enterprise/admin/articles/troubleshooting-ssl-errors
   - /enterprise/admin/categories/dns-ssl-and-subdomain-configuration
   - /enterprise/admin/installation/troubleshooting-ssl-errors
   - /enterprise/admin/configuration/troubleshooting-ssl-errors
   - /admin/configuration/troubleshooting-ssl-errors
+  - /admin/configuration/configuring-your-enterprise/troubleshooting-ssl-errors
 versions:
   ghes: '*'
 type: how_to
@@ -17,7 +18,7 @@ topics:
   - Networking
   - Security
   - Troubleshooting
-shortTitle: Troubleshoot SSL errors
+shortTitle: Troubleshoot TLS errors
 ---
 
 ## 鍵ファイルからのパスフレーズの除去
@@ -37,7 +38,7 @@ OpenSSLがインストールされたLinuxマシンを使うなら、パスフ
 
 OpenSSL に関する詳しい情報については、[OpenSSL のドキュメンテーション](https://www.openssl.org/docs/)を参照してください。
 
-## SSL証明書あるいは鍵のPEMフォーマットへの変換
+## Converting your TLS certificate or key into PEM format
 
 OpenSSL をインストールしている場合、`openssl` コマンドを使って鍵を PEM フォーマットに変換できます。 たとえば鍵を DER フォーマットから PEM フォーマットに変換できます。
 
@@ -49,19 +50,19 @@ $ openssl rsa -in yourdomain.der -inform DER -out yourdomain.key -outform PEM
 
 ## 鍵のアップロード後の反応のない環境
 
-SSL 鍵のアップロード後に {% data variables.product.product_location %} の反応がない場合、SSL 証明書のコピーを含む詳細事項と合わせて [{% data variables.product.prodname_enterprise %} Support に連絡](https://enterprise.github.com/support)してください。
+If {% data variables.product.product_location %} is unresponsive after uploading an TLS key, please [contact {% data variables.product.prodname_enterprise %} Support](https://enterprise.github.com/support) with specific details, including a copy of your TLS certificate.
 
 ## 証明書の検証エラー
 
-Web ブラウザやコマンドラインの Git などのクライアントは、SSL 証明書の正当性が検証できなければエラーメッセージを表示します。 これはしばしば自己署名証明書の場合や、クライアントが認識しない中間ルート証明書から発行された "チェーンドルート" 証明書の場合に生じます。
+Clients such as web browsers and command-line Git will display an error message if they cannot verify the validity of an TLS certificate. これはしばしば自己署名証明書の場合や、クライアントが認識しない中間ルート証明書から発行された "チェーンドルート" 証明書の場合に生じます。
 
 証明書認証局 (CA) によって署名された証明書を使っている場合は、{% data variables.product.prodname_ghe_server %} にアップロードする証明書ファイルには CA のルート証明を持つ証明書チェーンが含まれていなければなりません。 そのようなファイルを作成するには、証明書チェーン全体 (「証明書バンドル」とも呼ばれます) を証明書の終わりにつなげ、プリンシパル証明書の先頭にホスト名が来るようにしてください。 ほとんどのシステムでは、以下のようなコマンドでこの処理を行えます:
 
 ```shell
 $ cat yourdomain.com.crt bundle-certificates.crt > yourdomain.combined.crt
 ```
 
-証明書バンドル (たとえば `bundle-certificates.crt`) は、証明書認証局もしくは SSL のベンダーからダウンロードできるはずです。
+You should be able to download a certificate bundle (for example, `bundle-certificates.crt`) from your certificate authority or TLS vendor.
 
 ## 自己署名もしくは信頼されない証明書認証者（CA）ルート証明書のインストール
 
@@ -81,6 +82,6 @@ $ cat yourdomain.com.crt bundle-certificates.crt > yourdomain.combined.crt
   $ ghe-ssl-ca-certificate-install -c rootCA.crt
   ```
 
-## Updating an SSL certificate
+## Updating a TLS certificate
 
-You can generate a new self-signed certificate or update an existing SSL certificate for {% data variables.product.product_location %} with the `ghe-ssl-certificate-setup` command line utility. 詳しい情報については、「[コマンドラインユーティリティ](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-ssl-ca-certificate-setup)」を参照してください。
+You can generate a new self-signed certificate or update an existing TLS certificate for {% data variables.product.product_location %} with the `ghe-ssl-certificate-setup` command line utility. 詳しい情報については、「[コマンドラインユーティリティ](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-ssl-ca-certificate-setup)」を参照してください。
diff --git a/...eviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md b/...eviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md
@@ -190,11 +190,11 @@ The scope of the events that appear in your enterprise's audit log depend on whe
 {%- ifversion ghes %}
 ## `config_entry` category actions
 
-| アクション                  | 説明                                                                                                                                                                                                                                                                                                                                                                                                        |
-| ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `config_entry.create`  | A configuration setting was created. These events are only visible in the site admin audit log. The type of events recorded relate to:</br>- Enterprise settings and policies</br>- Organization and repository permissions and settings</br>- Git, Git LFS, {% data variables.product.prodname_github_connect %}, {% data variables.product.prodname_registry %}, project, and code security settings. |
-| `config_entry.destroy` | A configuration setting was deleted. These events are only visible in the site admin audit log. The type of events recorded relate to:</br>- Enterprise settings and policies</br>- Organization and repository permissions and settings</br>- Git, Git LFS, {% data variables.product.prodname_github_connect %}, {% data variables.product.prodname_registry %}, project, and code security settings. |
-| `config_entry.update`  | A configuration setting was edited. These events are only visible in the site admin audit log. The type of events recorded relate to:</br>- Enterprise settings and policies</br>- Organization and repository permissions and settings</br>- Git, Git LFS, {% data variables.product.prodname_github_connect %}, {% data variables.product.prodname_registry %}, project, and code security settings.  |
+| アクション                  | 説明                                                                                                                                                                                                                                                                                                                                                                                   |
+| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `config_entry.create`  | A configuration setting was created. これらのイベントは、サイトアドミンのAudit logでのみ表示されます。 The type of events recorded relate to:</br>- Enterprise settings and policies</br>- Organization and repository permissions and settings</br>- Git, Git LFS, {% data variables.product.prodname_github_connect %}, {% data variables.product.prodname_registry %}, project, and code security settings. |
+| `config_entry.destroy` | A configuration setting was deleted. これらのイベントは、サイトアドミンのAudit logでのみ表示されます。 The type of events recorded relate to:</br>- Enterprise settings and policies</br>- Organization and repository permissions and settings</br>- Git, Git LFS, {% data variables.product.prodname_github_connect %}, {% data variables.product.prodname_registry %}, project, and code security settings. |
+| `config_entry.update`  | A configuration setting was edited. これらのイベントは、サイトアドミンのAudit logでのみ表示されます。 The type of events recorded relate to:</br>- Enterprise settings and policies</br>- Organization and repository permissions and settings</br>- Git, Git LFS, {% data variables.product.prodname_github_connect %}, {% data variables.product.prodname_registry %}, project, and code security settings.  |
 {%- endif %}
 
 {%- ifversion fpt or ghec or ghes > 3.2 or ghae %}

diff --git a/...g-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md b/...g-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md
@@ -47,6 +47,7 @@ You can set up streaming to S3 with access keys or, to avoid storing long-lived
 
 - [Setting up streaming to S3 with access keys](#setting-up-streaming-to-s3-with-access-keys)
 - [Setting up streaming to S3 with OpenID Connect](#setting-up-streaming-to-s3-with-openid-connect)
+- [Disabling streaming to S3 with OpenID Connect](#disabling-streaming-to-s3-with-openid-connect)
 
 #### Setting up streaming to S3 with access keys
 {% endif %}
@@ -123,6 +124,13 @@ For information on creating or accessing your access key ID and secret key, see
    - Under "ARN Role" type the ARN role you noted earlier. For example, `arn:aws::iam::1234567890:role/github-audit-log-streaming-role`.
 {% data reusables.audit_log.streaming-check-s3-endpoint %}
 {% data reusables.enterprise.verify-audit-log-streaming-endpoint %}
+
+#### Disabling streaming to S3 with OpenID Connect
+
+If you want to disable streaming to S3 with OIDC for any reason, such as the discovery of a security vulnerability in OIDC, delete the {% data variables.product.prodname_dotcom %} OIDC provider you created in AWS when you set up streaming. For more information, see [Creating OpenID Connect (OIDC) identity providers](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_oidc.html) in the AWS documentation.
+
+Then, set up streaming with access keys until the vulnerability is resolved. For more information, see "[Setting up streaming to S3 with access keys](#setting-up-streaming-to-s3-with-access-keys)."
+
 {% endif %}
 
 ### Setting up streaming to Azure Blob Storage

diff --git a/...n/managing-commit-signature-verification/about-commit-signature-verification.md b/...n/managing-commit-signature-verification/about-commit-signature-verification.md
@@ -70,7 +70,7 @@ To sign commits using GPG and have those commits verified on {% data variables.p
 
 1. [Check for existing GPG keys](/articles/checking-for-existing-gpg-keys)
 2. [Generate a new GPG key](/articles/generating-a-new-gpg-key)
-3. [Add a new GPG key to your GitHub account](/articles/adding-a-new-gpg-key-to-your-github-account)
+3. [Add a GPG key to your GitHub account](/articles/adding-a-gpg-key-to-your-github-account)
 4. [Tell Git about your signing key](/articles/telling-git-about-your-signing-key)
 5. [Sign commits](/articles/signing-commits)
 6. [Sign tags](/articles/signing-tags)

diff --git a/...naging-commit-signature-verification/adding-a-gpg-key-to-your-github-account.md b/...naging-commit-signature-verification/adding-a-gpg-key-to-your-github-account.md
@@ -0,0 +1,69 @@
+---
+title: Adding a GPG key to your GitHub account
+intro: 'To configure your account on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %} to use your new (or existing) GPG key, you''ll also need the key to your account.'
+redirect_from:
+  - /articles/adding-a-gpg-key-to-your-github-account
+  - /github/authenticating-to-github/adding-a-new-gpg-key-to-your-github-account
+  - /github/authenticating-to-github/managing-commit-signature-verification/adding-a-new-gpg-key-to-your-github-account
+  - /articles/updating-an-expired-gpg-key
+  - /authentication/troubleshooting-commit-signature-verification/updating-an-expired-gpg-key
+  - /github/authenticating-to-github/updating-an-expired-gpg-key
+  - /github/authenticating-to-github/troubleshooting-commit-signature-verification/updating-an-expired-gpg-key
+  - /authentication/managing-commit-signature-verification/adding-a-new-gpg-key-to-your-github-account
+versions:
+  fpt: '*'
+  ghes: '*'
+  ghae: '*'
+  ghec: '*'
+topics:
+  - Identity
+  - Access management
+shortTitle: Add a GPG key
+---
+
+## About addition of GPG keys to your account
+
+To sign commits associated with your account on {% data variables.product.product_name %}, you can add a public GPG key to your personal account. Before you add a key, you should check for existing keys. If you don't find any existing keys, you can generate and copy a new key. For more information, see "[Checking for existing GPG keys](/articles/checking-for-existing-gpg-keys)" and "[Generating a new GPG key](/articles/generating-a-new-gpg-key)."
+
+You can add multiple public keys to your account on {% data variables.product.product_name %}. Commits signed by any of the corresponding private keys will show as verified. If you remove a public key, any commits signed by the corresponding private key will no longer show as verified.
+
+{% ifversion upload-expired-or-revoked-gpg-key %}
+To verify as many of your commits as possible, you can add expired and revoked keys. If the key meets all other verification requirements, commits that were previously signed by any of the corresponding private keys will show as verified and indicate that their signing key is expired or revoked.
+
+![A verified commit whose key expired](/assets/images/help/settings/gpg-verified-with-expired-key.png)
+{% endif %}
+
+{% data reusables.gpg.supported-gpg-key-algorithms %}
+
+When verifying a signature, {% data variables.product.product_name %} extracts the signature and attempts to parse its key ID. The key ID is then matched with keys added to {% data variables.product.product_name %}. Until a matching GPG key is added to {% data variables.product.product_name %}, it cannot verify your signatures.
+
+## GPG キーの追加
+
+{% data reusables.user-settings.access_settings %}
+{% data reusables.user-settings.ssh %}
+3. [**New GPG key**] をクリックします。 ![GPG キーボタン](/assets/images/help/settings/gpg-add-gpg-key.png)
+4. [Key] フィールドに、[GPG キーを生成](/articles/generating-a-new-gpg-key)したときにコピーした GPG キーを貼り付けます。 ![キーフィールド](/assets/images/help/settings/gpg-key-paste.png)
+5. [**Add GPG key**] をクリックします。 ![キーの追加ボタン](/assets/images/help/settings/gpg-add-key.png)
+6. 処理を確認するには、{% data variables.product.product_name %}のパスワードを入力します。
+
+{% ifversion upload-expired-or-revoked-gpg-key %}
+{% else %}
+## 期限切れ GPG キーを更新する
+
+署名を検証するとき、{% data variables.product.product_name %} は、キーが取り消しまたは期限切れになっていないか確認します。 もしサインインのキーが取り消しまたは期限切れになっている場合、{% data variables.product.product_name %} は、お客様の署名を検証できません。
+
+If your key is expired, you must [update its expiration](https://www.gnupg.org/gph/en/manual.html#AEN329), export the new key, delete the expired key in your account on {% data variables.product.product_name %}, and add the new key to your account as described above. キーが他のすべての検証の要件を満たしている限り、過去のコミットとタグは、検証済みとして表示されます。
+
+キーが取り消されている場合、プライマリーまたは取り消されていない他のキーを使って、コミットに署名します。
+
+キーが無効でキーセットに他に有効なキーを所有していないが、新しいクレデンシャルのセットで新しい GPG キーを作成した場合、取り消されたまたは期限切れのキーで作成されたコミットは、未検証として表示され続けます。 Also, your new credentials will not be able to re-sign or verify your old commits and tags.
+{% endif %}
+
+## 参考リンク
+
+- [既存の GPG キーのチェック](/articles/checking-for-existing-gpg-keys)
+- [新しい GPG キーの生成](/articles/generating-a-new-gpg-key)
+- 「[Git へ署名キーを伝える](/articles/telling-git-about-your-signing-key)」
+- [GPG キーとメールの関連付け](/articles/associating-an-email-with-your-gpg-key)
+- [GPG キーを使ったコミットとタグへの署名](/articles/signing-commits-and-tags-using-gpg)
+- [コミット署名の検証について](/articles/about-commit-signature-verification)