diff --git a/translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md b/translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md
index 57084beb98..baf34206bf 100644
--- a/translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md
+++ b/translations/ja-JP/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/merging-multiple-user-accounts.md
@@ -20,6 +20,12 @@ shortTitle: Merge multiple user accounts
{% endtip %}
+{% warning %}
+
+**Warning:** Organization and repository access permissions aren't transferable between accounts. If the account you want to delete has an existing access permission, an organization owner or repository administrator will need to invite the account that you want to keep.
+
+{% endwarning %}
+
1. [Transfer any repositories](/articles/how-to-transfer-a-repository) from the account you want to delete to the account you want to keep. Issues, pull requests, and wikis are transferred as well. Verify the repositories exist on the account you want to keep.
2. [Update the remote URLs](/github/getting-started-with-github/managing-remote-repositories) in any local clones of the repositories that were moved.
3. [Delete the account](/articles/deleting-your-user-account) you no longer want to use.
diff --git a/translations/ja-JP/content/actions/deployment/managing-your-deployments/viewing-deployment-history.md b/translations/ja-JP/content/actions/deployment/managing-your-deployments/viewing-deployment-history.md
index a940a03bc6..17ecdbe875 100644
--- a/translations/ja-JP/content/actions/deployment/managing-your-deployments/viewing-deployment-history.md
+++ b/translations/ja-JP/content/actions/deployment/managing-your-deployments/viewing-deployment-history.md
@@ -24,6 +24,6 @@ To view current and past deployments, click **Environments** on the home page of
The deployments page displays the last active deployment of each environment for your repository. If the deployment includes an environment URL, a **View deployment** button that links to the URL is shown next to the deployment.
-The activity log shows the deployment history for your environments. By default, only the most recent deployment for an environment has an `Active` status; all previously active deployments have an `Inactive` status. For more information on automatic inactivation of deployments, see "[Inactive deployments](/rest/reference/repos#inactive-deployments)."
+The activity log shows the deployment history for your environments. By default, only the most recent deployment for an environment has an `Active` status; all previously active deployments have an `Inactive` status. For more information on automatic inactivation of deployments, see "[Inactive deployments](/rest/reference/deployments#inactive-deployments)."
You can also use the REST API to get information about deployments. For more information, see "[Repositories](/rest/reference/repos#deployments)."
diff --git a/translations/ja-JP/content/actions/learn-github-actions/events-that-trigger-workflows.md b/translations/ja-JP/content/actions/learn-github-actions/events-that-trigger-workflows.md
index d21e833b8c..56e92056f6 100644
--- a/translations/ja-JP/content/actions/learn-github-actions/events-that-trigger-workflows.md
+++ b/translations/ja-JP/content/actions/learn-github-actions/events-that-trigger-workflows.md
@@ -307,7 +307,7 @@ on:
### `deployment_status`
-Runs your workflow anytime a third party provides a deployment status, which triggers the `deployment_status` event. Deployments created with a commit SHA may not have a Git ref. For information about the REST API, see "[Create a deployment status](/rest/reference/repos#create-a-deployment-status)."
+Runs your workflow anytime a third party provides a deployment status, which triggers the `deployment_status` event. Deployments created with a commit SHA may not have a Git ref. For information about the REST API, see "[Create a deployment status](/rest/reference/deployments#create-a-deployment-status)."
| Webhook event payload | Activity types | `GITHUB_SHA` | `GITHUB_REF` |
| --------------------- | -------------- | ------------ | -------------|
@@ -701,7 +701,7 @@ on:
{% note %}
-**Note:** The webhook payload available to GitHub Actions does not include the `added`, `removed`, and `modified` attributes in the `commit` object. You can retrieve the full commit object using the REST API. For more information, see "[Get a commit](/rest/reference/repos#get-a-commit)".
+**Note:** The webhook payload available to GitHub Actions does not include the `added`, `removed`, and `modified` attributes in the `commit` object. You can retrieve the full commit object using the REST API. For more information, see "[Get a commit](/rest/reference/commits#get-a-commit)".
{% endnote %}
diff --git a/translations/ja-JP/content/admin/configuration/managing-connections-between-your-enterprise-accounts/connecting-your-enterprise-account-to-github-enterprise-cloud.md b/translations/ja-JP/content/admin/configuration/managing-connections-between-your-enterprise-accounts/connecting-your-enterprise-account-to-github-enterprise-cloud.md
index 27df363d25..ac01707283 100644
--- a/translations/ja-JP/content/admin/configuration/managing-connections-between-your-enterprise-accounts/connecting-your-enterprise-account-to-github-enterprise-cloud.md
+++ b/translations/ja-JP/content/admin/configuration/managing-connections-between-your-enterprise-accounts/connecting-your-enterprise-account-to-github-enterprise-cloud.md
@@ -34,15 +34,19 @@ To configure a connection, your proxy configuration must allow connectivity to `
After enabling {% data variables.product.prodname_github_connect %}, you will be able to enable features such as unified search and unified contributions. For more information about all of the features available, see "[Managing connections between your enterprise accounts](/admin/configuration/managing-connections-between-your-enterprise-accounts)."
-When you connect {% data variables.product.product_location %} to {% data variables.product.prodname_ghe_cloud %}, a record on {% data variables.product.prodname_dotcom_the_website %} stores information about the connection:
+When you connect {% data variables.product.product_location %} to {% data variables.product.prodname_ghe_cloud %}, or enable {% data variables.product.prodname_github_connect %} features, a record on {% data variables.product.prodname_dotcom_the_website %} stores information about the connection:
{% ifversion ghes %}
- The public key portion of your {% data variables.product.prodname_ghe_server %} license
- A hash of your {% data variables.product.prodname_ghe_server %} license
- The customer name on your {% data variables.product.prodname_ghe_server %} license
- The version of {% data variables.product.product_location_enterprise %}{% endif %}
-- The hostname of your {% data variables.product.product_name %} instance
+- The hostname of {% data variables.product.product_location %}
- The organization or enterprise account on {% data variables.product.prodname_dotcom_the_website %} that's connected to {% data variables.product.product_location %}
- The authentication token that's used by {% data variables.product.product_location %} to make requests to {% data variables.product.prodname_dotcom_the_website %}
+- If Transport Layer Security (TLS) is enabled and configured on {% data variables.product.product_location %}{% ifversion ghes %}
+- The {% data variables.product.prodname_github_connect %} features that are enabled on {% data variables.product.product_location %}, and the date and time of enablement{% endif %}
+
+{% data variables.product.prodname_github_connect %} syncs the above connection data between {% data variables.product.product_location %} and {% data variables.product.prodname_ghe_cloud %} weekly, from the day and approximate time that {% data variables.product.prodname_github_connect %} was enabled.
Enabling {% data variables.product.prodname_github_connect %} also creates a {% data variables.product.prodname_github_app %} owned by your {% data variables.product.prodname_ghe_cloud %} organization or enterprise account. {% data variables.product.product_name %} uses the {% data variables.product.prodname_github_app %}'s credentials to make requests to {% data variables.product.prodname_dotcom_the_website %}.
{% ifversion ghes %}
diff --git a/translations/ja-JP/content/admin/enterprise-management/configuring-clustering/about-clustering.md b/translations/ja-JP/content/admin/enterprise-management/configuring-clustering/about-clustering.md
index b96897a617..77aa3f9b25 100644
--- a/translations/ja-JP/content/admin/enterprise-management/configuring-clustering/about-clustering.md
+++ b/translations/ja-JP/content/admin/enterprise-management/configuring-clustering/about-clustering.md
@@ -1,10 +1,10 @@
---
-title: クラスタリングについて
-intro: '{% data variables.product.prodname_ghe_server %} クラスタリングを利用することで、{% data variables.product.prodname_ghe_server %} を構成するサービス群を複数のノードにまたがってスケールアウトできるようになります。'
+title: About clustering
+intro: '{% data variables.product.prodname_ghe_server %} clustering allows services that make up {% data variables.product.prodname_ghe_server %} to be scaled out across multiple nodes.'
redirect_from:
- /enterprise/admin/clustering/overview
- /enterprise/admin/clustering/about-clustering
- - /enterprise/admin/clustering/clustering-overview/
+ - /enterprise/admin/clustering/clustering-overview
- /enterprise/admin/enterprise-management/about-clustering
- /admin/enterprise-management/about-clustering
versions:
@@ -14,23 +14,22 @@ topics:
- Clustering
- Enterprise
---
+## Clustering architecture
-## クラスタリングのアーキテクチャ
+{% data variables.product.prodname_ghe_server %} is comprised of a set of services. In a cluster, these services run across multiple nodes and requests are load balanced between them. Changes are automatically stored with redundant copies on separate nodes. Most of the services are equal peers with other instances of the same service. The exceptions to this are the `mysql-server` and `redis-server` services. These operate with a single _primary_ node with one or more _replica_ nodes.
-{% data variables.product.prodname_ghe_server %}は、一連のサービスから構成されています。 クラスタでは、これらのサービスは複数のノードにまたがって動作し、リクエストはそれらのノード間でロードバランスされます。 変更は、冗長なコピーと共に個別のノードに自動的に保存されます。 ほとんどのサービスは、同じサービスの他のインスタンスと同等のピア群です。 ただし`mysql-server`と`redis-server`サービスは例外です。 これらは1つの_プライマリ_ノードと、1つ以上の_レプリカ_ノード上で動作します。
+Learn more about [services required for clustering](/enterprise/{{ currentVersion }}/admin/enterprise-management/about-cluster-nodes#services-required-for-clustering).
-[クラスタリングに必要なサービスの詳細](/enterprise/{{ currentVersion }}/admin/enterprise-management/about-cluster-nodes#services-required-for-clustering)をご覧ください。
+## Is clustering right for my organization?
-## クラスタリングは組織に適切か？
+{% data reusables.enterprise_clustering.clustering-scalability %} However, setting up a redundant and scalable cluster can be complex and requires careful planning. This additional complexity will need to be planned for during installation, disaster recovery scenarios, and upgrades.
-{% data reusables.enterprise_clustering.clustering-scalability %}とはいえ、冗長性のあるスケーラブルなクラスタのセットアップは複雑であり、かつ、注意深い計画が必要です。 この追加の複雑さによって、インストール、システム災害復旧およびアップグレードについて計画することが必要となります。
+{% data variables.product.prodname_ghe_server %} requires low latency between nodes and is not intended for redundancy across geographic locations.
-{% data variables.product.prodname_ghe_server %} ではノード間のレイテンシが低いことが必要であり、地理的に離れた場所にまたがる冗長性を意図したものではありません。
-
-クラスタリングは冗長性を提供しますが、High Availability構成を置き換えることを意図したものではありません。 詳細は「[High Availability 構成](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-github-enterprise-server-for-high-availability)」を参照してください。 プライマリ／セカンダリフェイルオーバー設定はクラスタリングよりもはるかにシンプルであり、多くの組織の要求に応えます。 詳しくは[クラスタリングと高可用性との違い](/enterprise/{{ currentVersion }}/admin/guides/clustering/differences-between-clustering-and-high-availability-ha/)を参照してください。
+Clustering provides redundancy, but it is not intended to replace a High Availability configuration. For more information, see [High Availability configuration](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-github-enterprise-server-for-high-availability). A primary/secondary failover configuration is far simpler than clustering and will serve the needs of many organizations. For more information, see [Differences between Clustering and High Availability](/enterprise/{{ currentVersion }}/admin/guides/clustering/differences-between-clustering-and-high-availability-ha/).
{% data reusables.package_registry.packages-cluster-support %}
-## クラスタリングを利用するには？
+## How do I get access to clustering?
-クラスタリングは特定のスケーリングの状況のために設計されており、すべての組織を対象としたものではありません。 クラスタリングをご検討される場合は、専任の担当者または {% data variables.contact.contact_enterprise_sales %} にお問い合わせください。
+Clustering is designed for specific scaling situations and is not intended for every organization. If clustering is something you'd like to consider, please contact your dedicated representative or {% data variables.contact.contact_enterprise_sales %}.
diff --git a/translations/ja-JP/content/admin/enterprise-management/configuring-clustering/index.md b/translations/ja-JP/content/admin/enterprise-management/configuring-clustering/index.md
index 0cd21559db..3738fe80e6 100644
--- a/translations/ja-JP/content/admin/enterprise-management/configuring-clustering/index.md
+++ b/translations/ja-JP/content/admin/enterprise-management/configuring-clustering/index.md
@@ -1,10 +1,10 @@
---
-title: クラスタリングの設定
-intro: クラスタリングについて、そしてHigh Availabilityとの差異にについて学んでください。
+title: Configuring clustering
+intro: Learn about clustering and differences with high availability.
redirect_from:
- /enterprise/admin/clustering/setting-up-the-cluster-instances
- /enterprise/admin/clustering/managing-a-github-enterprise-server-cluster
- - /enterprise/admin/guides/clustering/managing-a-github-enterprise-cluster/
+ - /enterprise/admin/guides/clustering/managing-a-github-enterprise-cluster
- /enterprise/admin/enterprise-management/configuring-clustering
versions:
ghes: '*'
diff --git a/translations/ja-JP/content/admin/enterprise-management/configuring-high-availability/index.md b/translations/ja-JP/content/admin/enterprise-management/configuring-high-availability/index.md
index e42f86a7fb..f2287f14df 100644
--- a/translations/ja-JP/content/admin/enterprise-management/configuring-high-availability/index.md
+++ b/translations/ja-JP/content/admin/enterprise-management/configuring-high-availability/index.md
@@ -1,12 +1,12 @@
---
-title: High Availability の設定
+title: Configuring high availability
redirect_from:
- /enterprise/admin/installation/configuring-github-enterprise-server-for-high-availability
- - /enterprise/admin/guides/installation/high-availability-cluster-configuration/
- - /enterprise/admin/guides/installation/high-availability-configuration/
- - /enterprise/admin/guides/installation/configuring-github-enterprise-for-high-availability/
+ - /enterprise/admin/guides/installation/high-availability-cluster-configuration
+ - /enterprise/admin/guides/installation/high-availability-configuration
+ - /enterprise/admin/guides/installation/configuring-github-enterprise-for-high-availability
- /enterprise/admin/enterprise-management/configuring-high-availability
-intro: '{% data variables.product.prodname_ghe_server %} は、プライマリアプライアンスに影響を及ぼすハードウェア障害や重大なネットワーク障害が発生した場合に、サービスの中断を最小限に抑えるように設計された、運用の High Availability モードをサポートしています。'
+intro: '{% data variables.product.prodname_ghe_server %} supports a high availability mode of operation designed to minimize service disruption in the event of hardware failure or major network outage affecting the primary appliance.'
versions:
ghes: '*'
topics:
diff --git a/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/configuring-collectd.md b/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/configuring-collectd.md
index b6cff63494..8d39fdb11a 100644
--- a/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/configuring-collectd.md
+++ b/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/configuring-collectd.md
@@ -1,9 +1,9 @@
---
-title: collectd のコンフィグレーション
-intro: '{% data variables.product.prodname_enterprise %}は、`collectd` でデータを収集し、外部の `collectd` に送信することができます。 CPU の使用率やメモリーとディスクの消費、ネットワークインタフェーストラフィックとエラー、仮想マシンの全体的な負荷などのデータを収集しています。'
+title: Configuring collectd
+intro: '{% data variables.product.prodname_enterprise %} can gather data with `collectd` and send it to an external `collectd` server. Among other metrics, we gather a standard set of data such as CPU utilization, memory and disk consumption, network interface traffic and errors, and the VM''s overall load.'
redirect_from:
- /enterprise/admin/installation/configuring-collectd
- - /enterprise/admin/articles/configuring-collectd/
+ - /enterprise/admin/articles/configuring-collectd
- /enterprise/admin/enterprise-management/configuring-collectd
- /admin/enterprise-management/configuring-collectd
versions:
@@ -16,15 +16,14 @@ topics:
- Monitoring
- Performance
---
+## Set up an external `collectd` server
-## 外部 `collectd` サーバーを設置
+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.
-{% data variables.product.product_location %}に`collectd` の転送をまだ有効にしていない場合は、外部の `collectd` サーバを設置する必要があります。 `collectd` サーバは、`collectd` 5.x 以降のバージョンを実行している必要があります。
+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`
-1. `collectd` サーバにログインする
-2. `collectd` を作成、または編集することで、ネットワークプラグインをロードし、適切な値をサーバとポートのディレクティブに追加する。 たいていのディストリビューションでは、これは `/etc/collectd/collectd.conf` にあります。
-
-`collectd` サーバを実行するための見本の*collectd.conf*
+An example *collectd.conf* to run a `collectd` server:
LoadPlugin network
...
@@ -33,34 +32,34 @@ topics:
Listen "0.0.0.0" "25826"
-## {% data variables.product.prodname_enterprise %}でcollectd転送を有効にする
+## Enable collectd forwarding on {% data variables.product.prodname_enterprise %}
-デフォルトでは、`collectd` 転送は {% data variables.product.prodname_enterprise %} で無効になっています。 次の手順に従って、`collectd` 転送を有効にして設定します。
+By default, `collectd` forwarding is disabled on {% data variables.product.prodname_enterprise %}. Follow the steps below to enable and configure `collectd` forwarding:
{% data reusables.enterprise_site_admin_settings.access-settings %}
{% data reusables.enterprise_site_admin_settings.management-console %}
-1. ログの転送設定の下にある、**Enable collectd forwarding** を選択する
-1. **Server address** の欄には {% data variables.product.prodname_enterprise %}のアプライアンスの統計を転送したい`collectd` サーバのアドレスを入力する。
-1. **Port**の欄には、`collectd` サーバーに接続するためのポートを入力する。 (デフォルトは 25826)
-1. **Cryptographic setup** のドロップダウンメニューでは、`collectd` サーバーとのコミュニケーションのセキュリティーレベルを選択する。 （なし、署名付きパケット、または暗号化されたパケット。）
+1. Below the log forwarding settings, select **Enable collectd forwarding**.
+1. In the **Server address** field, type the address of the `collectd` server to which you'd like to forward {% data variables.product.prodname_enterprise %} appliance statistics.
+1. In the **Port** field, type the port used to connect to the `collectd` server. (Defaults to 25826)
+1. In the **Cryptographic setup** dropdown menu, select the security level of communications with the `collectd` server. (None, signed packets, or encrypted packets.)
{% data reusables.enterprise_management_console.save-settings %}
-## collectd データの `ghe-export-graphs`でのエクスポート
+## Exporting collectd data with `ghe-export-graphs`
-`ghe-export-graphs` のコマンドラインツールは、`collectd` が RRD データベースに保存するデータをエクスポートします。 このコマンドは、データを XML にして、1つのTAR書庫（.tgz）にエクスポートします。
+The command-line tool `ghe-export-graphs` will export the data that `collectd` stores in RRD databases. This command turns the data into XML and exports it into a single tarball (.tgz).
-その主な用途は、Support Bundleを一括ダウンロードする必要なく、{% data variables.contact.contact_ent_support %}のチームに仮想マシンのパフォーマンスに関するデータ提供することです。 定期的なバックアップエクスポートに含めてはなりません。また、その逆のインポートもありません。 {% data variables.contact.contact_ent_support %}に連絡したとき、問題解決を容易にするため、このデータが必要となる場合があります。
+Its primary use is to provide the {% data variables.contact.contact_ent_support %} team with data about a VM's performance, without the need for downloading a full Support Bundle. It shouldn't be included in your regular backup exports and there is no import counterpart. If you contact {% data variables.contact.contact_ent_support %}, we may ask for this data to assist with troubleshooting.
-### 使い方
+### Usage
```shell
ssh -p 122 admin@[hostname] -- 'ghe-export-graphs' && scp -P 122 admin@[hostname]:~/graphs.tar.gz .
```
-## トラブルシューティング
+## Troubleshooting
-### 中心の collectd サーバはデータを受信していない
+### Central collectd server receives no data
-{% data variables.product.prodname_enterprise %} は `collectd` バージョン 5.x に付属しています。 `collectd` 5.x は、4.x リリースシリーズとの下位互換性がありません。 {% data variables.product.product_location %}から送られるデータを受信するには、中心の`collectd`サーバは 5.x 以上のバージョンでなければなりません。
+{% data variables.product.prodname_enterprise %} ships with `collectd` version 5.x. `collectd` 5.x is not backwards compatible with the 4.x release series. Your central `collectd` server needs to be at least version 5.x to accept data sent from {% data variables.product.product_location %}.
-他に質問や問題がある場合、{% data variables.contact.contact_ent_support %}までお問い合わせください。
+For help with further questions or issues, contact {% data variables.contact.contact_ent_support %}.
diff --git a/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/index.md b/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/index.md
index 658aea41ee..bb04a0812b 100644
--- a/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/index.md
+++ b/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/index.md
@@ -1,9 +1,9 @@
---
-title: アプライアンスを監視する
-intro: '{% data variables.product.product_location %} インスタンスの使用が時間とともに増加するにつれて、CPU、メモリ、ストレージなどのシステムリソースの利用率も増加します。 アプリケーションのパフォーマンスや可用性にマイナスの影響を及ぼすほど重大になる前に潜在的な問題に気づけるよう、モニタリングやアラートを設定することができます。'
+title: Monitoring your appliance
+intro: 'As use of {% data variables.product.product_location %} increases over time, the utilization of system resources, like CPU, memory, and storage will also increase. You can configure monitoring and alerting so that you''re aware of potential issues before they become critical enough to negatively impact application performance or availability.'
redirect_from:
- - /enterprise/admin/guides/installation/system-resource-monitoring-and-alerting/
- - /enterprise/admin/guides/installation/monitoring-your-github-enterprise-appliance/
+ - /enterprise/admin/guides/installation/system-resource-monitoring-and-alerting
+ - /enterprise/admin/guides/installation/monitoring-your-github-enterprise-appliance
- /enterprise/admin/installation/monitoring-your-github-enterprise-server-appliance
- /enterprise/admin/enterprise-management/monitoring-your-appliance
versions:
diff --git a/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/monitoring-using-snmp.md b/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/monitoring-using-snmp.md
index 2f83806ce8..83d8dda6b5 100644
--- a/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/monitoring-using-snmp.md
+++ b/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/monitoring-using-snmp.md
@@ -1,9 +1,9 @@
---
-title: SNMP での監視
-intro: '{% data variables.product.prodname_enterprise %}は、SNMP経由でディスクの使用や CPU の使用率、メモリーの使用などのデータを提供します。'
+title: Monitoring using SNMP
+intro: '{% data variables.product.prodname_enterprise %} provides data on disk usage, CPU utilization, memory usage, and more over SNMP.'
redirect_from:
- /enterprise/admin/installation/monitoring-using-snmp
- - /enterprise/admin/articles/monitoring-using-snmp/
+ - /enterprise/admin/articles/monitoring-using-snmp
- /enterprise/admin/enterprise-management/monitoring-using-snmp
- /admin/enterprise-management/monitoring-using-snmp
versions:
@@ -15,60 +15,66 @@ topics:
- Monitoring
- Performance
---
+SNMP is a common standard for monitoring devices over a network. We strongly recommend enabling SNMP so you can monitor the health of {% data variables.product.product_location %} and know when to add more memory, storage, or processor power to the host machine.
-SNMP とは、ネットワーク経由でデバイスを監視するための一般的基準です。 {% data variables.product.product_location %}のj状態を監視可能にし、いつホストのマシンにメモリやストレージ、処理能力を追加すべきかを知るために、SNMP を有効にすることを強くおすすめします。
+{% data variables.product.prodname_enterprise %} has a standard SNMP installation, so you can take advantage of the [many plugins](http://www.monitoring-plugins.org/doc/man/check_snmp.html) available for Nagios or for any other monitoring system.
-{% data variables.product.prodname_enterprise %} には標準の SNMP がインストールされているので、Nagios などのモニタリングシステムに対して利用可能な[数多くのプラグイン](http://www.monitoring-plugins.org/doc/man/check_snmp.html)を活用できます。
-
-## SNMP v2c を設定
+## Configuring SNMP v2c
{% data reusables.enterprise_site_admin_settings.access-settings %}
{% data reusables.enterprise_site_admin_settings.management-console %}
{% data reusables.enterprise_management_console.access-monitoring %}
{% data reusables.enterprise_management_console.enable-snmp %}
-4. **Community string** の欄では、新しいコミュニティ文字列を入力する。 空白のままだと、`public`という設定になります。 
+4. In the **Community string** field, enter a new community string. If left blank, this defaults to `public`.
+
{% data reusables.enterprise_management_console.save-settings %}
-5. SNMP に対応している別のワークステーションで次のコマンドを実行して、SNMP のコンフィグレーションをテストする。
+5. Test your SNMP configuration by running the following command on a separate workstation with SNMP support in your network:
```shell
# community-string is your community string
# hostname is the IP or domain of your Enterprise instance
$ snmpget -v 2c -c community-string -O e hostname hrSystemDate.0
```
-これにより、{% data variables.product.product_location %} ホストでのシステム時刻が返されます。
+This should return the system time on {% data variables.product.product_location %} host.
-## ユーザベースのセキュリティ
+## User-based security
-SNMP v3 を有効にすると、ユーザセキュリティモデル (USM) により、強化されたユーザベースのセキュリティを利用できます。 ユーザごとに、以下のセキュリティレベルを指定できます:
-- `noAuthNoPriv`: このセキュリティレベルは認証もプライバシーも提供しません。
-- `authNoPriv`: このセキュリティレベルは認証を提供しますがプライバシーは提供しません。 アプライアンスを照会するには、ユーザ名とパスワード (最低 8 文字) が必要です。 SNMPv2 と同様に、情報は暗号化されずに送信されます。 可能な認証プロトコルは MD5 または SHA であり、デフォルトは SHA です。
-- `authPriv`: このセキュリティレベルはプライバシーと共に認証を提供します。 8 文字以上の認証パスワードを含む認証が必要であり、返信は暗号化されます。 プライバシーパスワードは必須ではありませんが、指定する場合は 8 文字以上でなければなりません。 プライバシーパスワードが指定されない場合は、認証パスワードが使用されます。 プライバシープロトコルは DES または AES のいずれかが可能であり、デフォルトは AES です。
+If you enable SNMP v3, you can take advantage of increased user based security through the User Security Model (USM). For each unique user, you can specify a security level:
+- `noAuthNoPriv`: This security level provides no authentication and no privacy.
+- `authNoPriv`: This security level provides authentication but no privacy. To query the appliance you'll need a username and password (that must be at least eight characters long). Information is sent without encryption, similar to SNMPv2. The authentication protocol can be either MD5 or SHA and defaults to SHA.
+- `authPriv`: This security level provides authentication with privacy. Authentication, including a minimum eight-character authentication password, is required and responses are encrypted. A privacy password is not required, but if provided it must be at least eight characters long. If a privacy password isn't provided, the authentication password is used. The privacy protocol can be either DES or AES and defaults to AES.
-## SNMP v3 用にユーザーを設定する
+## Configuring users for SNMP v3
{% data reusables.enterprise_site_admin_settings.access-settings %}
{% data reusables.enterprise_site_admin_settings.management-console %}
{% data reusables.enterprise_management_console.access-monitoring %}
{% data reusables.enterprise_management_console.enable-snmp %}
-4. [**SNMP v3**] を選択します。 
-5. [Username] に、SNMP v3 ユーザの固有なユーザ名を入力します。 
-6. [**Security Level**] ドロップダウンメニューで、SNMP v3 ユーザ ー用のセキュリティレベルをクリックします。 
-7. セキュリティレベルが `authnopriv` である SNMP v3 ユーザの場合: 
+4. Select **SNMP v3**.
+
+5. In "Username", type the unique username of your SNMP v3 user.
+
+6. In the **Security Level** dropdown menu, click the security level for your SNMP v3 user.
+
+7. For SNMP v3 users with the `authnopriv` security level:
+ 
- {% data reusables.enterprise_management_console.authentication-password %}
- {% data reusables.enterprise_management_console.authentication-protocol %}
-8. セキュリティレベルが `authpriv` である SNMP v3 ユーザの場合: 
+8. For SNMP v3 users with the `authpriv` security level:
+ 
- {% data reusables.enterprise_management_console.authentication-password %}
- {% data reusables.enterprise_management_console.authentication-protocol %}
- - 任意で、[Privacy password] にプライバシーパスワードを入力します。
- - [Privacy password] の右側にある [**Protocol**] ドロップダウンメニューで、使用するプライバシープロトコル方式をクリックします。
-9. [**Add user**] をクリックします。 
+ - Optionally, in "Privacy password", type the privacy password.
+ - On the right side of "Privacy password", in the **Protocol** dropdown menu, click the privacy protocol method you want to use.
+9. Click **Add user**.
+
{% data reusables.enterprise_management_console.save-settings %}
-#### SNMP データの照会
+#### Querying SNMP data
-アプライアンスに関するハードウェアレベルとソフトウェアレベルの両方の情報が SNMP v3 で利用できます。 `noAuthNoPriv` と `authNoPriv` のセキュリティレベルでは暗号化とプライバシーが欠如しているため、結果の SNMP レポートから `hrSWRun` の表 (1.3.6.1.2.1.25.4) は除外されます。 セキュリティレベル `authPriv` を使用している場合は、この表が掲載されます。 詳しい情報については、「[OID のリファレンスドキュメンテーション](http://oidref.com/1.3.6.1.2.1.25.4)」を参照してください。
+Both hardware and software-level information about your appliance is available with SNMP v3. Due to the lack of encryption and privacy for the `noAuthNoPriv` and `authNoPriv` security levels, we exclude the `hrSWRun` table (1.3.6.1.2.1.25.4) from the resulting SNMP reports. We include this table if you're using the `authPriv` security level. For more information, see the "[OID reference documentation](http://oidref.com/1.3.6.1.2.1.25.4)."
-SNMP v2c では、アプライアンスに関するハードウェアレベルの情報のみが利用できます。 {% data variables.product.prodname_enterprise %} 内のアプリケーションとサービスには、メトリックスを報告するように設定された OID がありません。 いくつかの MIB が利用できます。ネットワーク内において SNMP をサポートしている別のワークステーションで `snmpwalk` を実行することで、利用できる MIB を確認できます。
+With SNMP v2c, only hardware-level information about your appliance is available. The applications and services within {% data variables.product.prodname_enterprise %} do not have OIDs configured to report metrics. Several MIBs are available, which you can see by running `snmpwalk` on a separate workstation with SNMP support in your network:
```shell
# community-string is your community string
@@ -76,40 +82,40 @@ SNMP v2c では、アプライアンスに関するハードウェアレベル
$ snmpwalk -v 2c -c community-string -O e hostname
```
-SNMP に対して利用可能な MIB のうち、最も有用なものは `HOST-RESOURCES-MIB` (1.3.6.1.2.1.25) です。 この MIB のいくつかの重要なオブジェクトについては、以下の表を参照してください:
+Of the available MIBs for SNMP, the most useful is `HOST-RESOURCES-MIB` (1.3.6.1.2.1.25). See the table below for some important objects in this MIB:
-| 名前 | OID | 説明 |
-| -------------------------- | ------------------------ | ---------------------------------------- |
-| hrSystemDate.2 | 1.3.6.1.2.1.25.1.2 | ホストから見たローカルの日付と時間。 |
-| hrSystemUptime.0 | 1.3.6.1.2.1.25.1.1.0 | 前回ホストが起動してからの時間。 |
-| hrMemorySize.0 | 1.3.6.1.2.1.25.2.2.0 | ホストが持っているRAMの容量。 |
-| hrSystemProcesses.0 | 1.3.6.1.2.1.25.1.6.0 | 現在、ホストでロードされている、または作動しているプロセスのコンテキストの数。 |
-| hrStorageUsed.1 | 1.3.6.1.2.1.25.2.3.1.6.1 | hrStorageAllocationUnits のホストの使用ストレージ領域。 |
-| hrStorageAllocationUnits.1 | 1.3.6.1.2.1.25.2.3.1.4.1 | hrStorageAllocationUnit のバイトでのサイズ |
+| Name | OID | Description |
+| ---- | --- | ----------- |
+| hrSystemDate.2 | 1.3.6.1.2.1.25.1.2 | The hosts notion of the local date and time of day. |
+| hrSystemUptime.0 | 1.3.6.1.2.1.25.1.1.0 | How long it's been since the host was last initialized. |
+| hrMemorySize.0 | 1.3.6.1.2.1.25.2.2.0 | The amount of RAM on the host. |
+| hrSystemProcesses.0 | 1.3.6.1.2.1.25.1.6.0 | The number of process contexts currently loaded or running on the host. |
+| hrStorageUsed.1 | 1.3.6.1.2.1.25.2.3.1.6.1 | The amount of storage space consumed on the host, in hrStorageAllocationUnits. |
+| hrStorageAllocationUnits.1 | 1.3.6.1.2.1.25.2.3.1.4.1 | The size, in bytes, of an hrStorageAllocationUnit |
-たとえば、SNMP v3 で `hrMemorySize` を照会するには、ネットワークで SNMP をサポートしている別のワークステーションで次のコマンドを実行します:
+For example, to query for `hrMemorySize` with SNMP v3, run the following command on a separate workstation with SNMP support in your network:
```shell
-# username はあなたの SNMP v3 ユーザの一意のユーザ名
-# auth password は認証パスワード
-# privacy password はプライバシーパスワード
-# hostname はあなたの Enterprise インスタンスの IP またはドメイン
+# username is the unique username of your SNMP v3 user
+# auth password is the authentication password
+# privacy password is the privacy password
+# hostname is the IP or domain of your Enterprise instance
$ snmpget -v 3 -u username -l authPriv \
-A "auth password" -a SHA \
-X "privacy password" -x AES \
-O e hostname HOST-RESOURCES-MIB::hrMemorySize.0
```
-SNMP v2c で `hrMemorySize` を照会するには、ネットワークで SNMP をサポートしている別のワークステーションで次のコマンドを実行します:
+With SNMP v2c, to query for `hrMemorySize`, run the following command on a separate workstation with SNMP support in your network:
```shell
-# community-string はあなたのコミュニティ文字列
-# hostname はあなたの Enterprise インスタンスの IP またはドメイン
+# community-string is your community string
+# hostname is the IP or domain of your Enterprise instance
snmpget -v 2c -c community-string hostname HOST-RESOURCES-MIB::hrMemorySize.0
```
{% tip %}
-**注釈:** アプライアンスで実行中のサービスに関する情報の漏洩を防ぐために、SNMP v3 でセキュリティレベル `authPriv` を使用していない限り、結果の SNMP レポートから `hrSWRun` の表 (1.3.6.1.2.1.25.4) は除外されます。 セキュリティレベル `authPriv` を使用している場合は、`hrSWRun` の表が掲載されます。
+**Note:** To prevent leaking information about services running on your appliance, we exclude the `hrSWRun` table (1.3.6.1.2.1.25.4) from the resulting SNMP reports unless you're using the `authPriv` security level with SNMP v3. If you're using the `authPriv` security level, we include the `hrSWRun` table.
{% endtip %}
-SNMP での一般的なシステム属性に対する OID マッピングの詳しい情報については、「[CPU、メモリ、ディスクの統計情報に対する Linux SNMP OID](http://www.linux-admins.net/2012/02/linux-snmp-oids-for-cpumemory-and-disk.html)」を参照してください。
+For more information on OID mappings for common system attributes in SNMP, see "[Linux SNMP OID’s for CPU, Memory and Disk Statistics](http://www.linux-admins.net/2012/02/linux-snmp-oids-for-cpumemory-and-disk.html)".
diff --git a/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/recommended-alert-thresholds.md b/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/recommended-alert-thresholds.md
index 50f80f425f..fff12c9155 100644
--- a/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/recommended-alert-thresholds.md
+++ b/translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/recommended-alert-thresholds.md
@@ -1,8 +1,8 @@
---
-title: アラートの推奨閾値
-intro: '{% data variables.product.prodname_ghe_server %} アプライアンスのパフォーマンスに影響を与える前に、システムリソースの問題を通知するようにアラートを設定できます。'
+title: Recommended alert thresholds
+intro: 'You can configure an alert to notify you of system resource issues before they affect your {% data variables.product.prodname_ghe_server %} appliance''s performance.'
redirect_from:
- - /enterprise/admin/guides/installation/about-recommended-alert-thresholds/
+ - /enterprise/admin/guides/installation/about-recommended-alert-thresholds
- /enterprise/admin/installation/about-recommended-alert-thresholds
- /enterprise/admin/installation/recommended-alert-thresholds
- /enterprise/admin/enterprise-management/recommended-alert-thresholds
@@ -16,38 +16,37 @@ topics:
- Monitoring
- Performance
- Storage
-shortTitle: アラートの推奨閾値
+shortTitle: Recommended alert thresholds
---
+## Monitoring storage
-## ストレージのモニタリング
+We recommend that you monitor both the root and user storage devices and configure an alert with values that allow for ample response time when available disk space is low.
-ルート及びユーザストレージデバイスの両方をモニタリングし、利用可能なディスク領域が少なくなったときに十分な対応時間が持てるような値でアラートを設定することをおすすめします。
+| Severity | Threshold |
+| -------- | --------- |
+| **Warning** | Disk use exceeds 70% of total available |
+| **Critical** | Disk use exceeds 85% of total available |
-| 重要度 | 閾値 |
-| ------------ | -------------------- |
-| **Warning** | ディスクの使用量が総容量の70%を超えた |
-| **Critical** | ディスクの使用量が総容量の85%を超えた |
+You can adjust these values based on the total amount of storage allocated, historical growth patterns, and expected time to respond. We recommend over-allocating storage resources to allow for growth and prevent the downtime required to allocate additional storage.
-これらの値は、割り当てられたストレージの総量、過去の増大パターン、対応が求められる時間に基づいて調整できます。 ストレージリソースは、増加を許容し、追加ストレージの割り当てに必要なダウンタイムを回避するために、多めに割り当てておくことをおすすめします。
+## Monitoring CPU and load average usage
-## CPUとロードアベレージのモニタリング
+Although it is normal for CPU usage to fluctuate based on resource-intense Git operations, we recommend configuring an alert for abnormally high CPU utilization, as prolonged spikes can mean your instance is under-provisioned. We recommend monitoring the fifteen-minute system load average for values nearing or exceeding the number of CPU cores allocated to the virtual machine.
-リソース集約的なGitの操作によってCPUの利用状況が変動するのは通常のことですが、異常に高いCPU利用状況にはアラートを設定することをおすすめします。これは、長引くスパイクはインスタンスのプロビジョニングが不足しているということかもしれないためです。 15分間のシステムロードアベレージが、仮想マシンに割り当てられたCPUコア数に近いかそれを超える値になっていないかをモニタリングすることをおすすめします。
+| Severity | Threshold |
+| -------- | --------- |
+| **Warning** | Fifteen minute load average exceeds 1x CPU cores |
+| **Critical** | Fifteen minute load average exceeds 2x CPU cores |
-| 重要度 | 閾値 |
-| ------------ | -------------------------- |
-| **Warning** | 15分間のロードアベレージが1x CPUコアを超える |
-| **Critical** | 15分間のロードアベレージが2x CPUコアを超える |
+We also recommend that you monitor virtualization "steal" time to ensure that other virtual machines running on the same host system are not using all of the instance's resources.
-また、仮想化の"steal"時間をモニタリングして、同一ホスト上で動作している他の仮想マシンがインスタンスのリソースをすべて使ってしまっていることがないことを確認するようおすすめします。
+## Monitoring memory usage
-## メモリの利用状況のモニタリング
+The amount of physical memory allocated to {% data variables.product.product_location %} can have a large impact on overall performance and application responsiveness. The system is designed to make heavy use of the kernel disk cache to speed up Git operations. We recommend that the normal RSS working set fit within 50% of total available RAM at peak usage.
-{% data variables.product.product_location %}に割り当てられている物理メモリの量は、全体的なパフォーマンスとアプリケーションの反応性に大きな影響があります。 システムは、Gitの処理を高速化するためにカーネルのディスクキャッシュを頻繁に利用するよう設計されています。 ピークの利用状況で、通常のRSSワーキングセットがRAMの総容量の50%以内に収まるようにすることをおすすめします。
+| Severity | Threshold |
+| -------- | --------- |
+| **Warning** | Sustained RSS usage exceeds 50% of total available memory |
+| **Critical** | Sustained RSS usage exceeds 70% of total available memory |
-| 重要度 | 閾値 |
-| ------------ | ------------------------------- |
-| **Warning** | 持続的にRSSの利用状況が利用可能なメモリ総量の50%を超える |
-| **Critical** | 持続的にRSSの利用状況が利用可能なメモリ総量の70%を超える |
-
-メモリが使い切られると、カーネルOOMキラーはRAMを大量に使っているアプリケーションプロセスを強制的にkillしてメモリリソースを解放しようとします。これは、サービスの中断につながることがあります。 通常の処理の状況で必要になる以上のメモリを仮想マシンに割り当てることをおすすめします。
+If memory is exhausted, the kernel OOM killer will attempt to free memory resources by forcibly killing RAM heavy application processes, which could result in a disruption of service. We recommend allocating more memory to the virtual machine than is required in the normal course of operations.
diff --git a/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/index.md b/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/index.md
index 5653ca1770..126dce06e2 100644
--- a/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/index.md
+++ b/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/index.md
@@ -1,9 +1,9 @@
---
-title: 仮想マシンと物理リソースのアップデート
-intro: 仮想ソフトウェアと仮想ハードウェアをアップグレードするためには、インスタンスのダウンタイムが必要になるので、事前にアップグレードについて計画をしておいてください。
+title: Updating the virtual machine and physical resources
+intro: 'Upgrading the virtual software and virtual hardware requires some downtime for your instance, so be sure to plan your upgrade in advance.'
redirect_from:
- - '/enterprise/{{ currentVersion }}/admin/guides/installation/upgrading-the-vm/'
- - '/enterprise/{{ currentVersion }}/admin/guides/installation/upgrading-physical-resources/'
+ - '/enterprise/{{ currentVersion }}/admin/guides/installation/upgrading-the-vm'
+ - '/enterprise/{{ currentVersion }}/admin/guides/installation/upgrading-physical-resources'
- /enterprise/admin/installation/updating-the-virtual-machine-and-physical-resources
- /enterprise/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources
versions:
diff --git a/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/migrating-from-github-enterprise-1110x-to-2123.md b/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/migrating-from-github-enterprise-1110x-to-2123.md
index 3f02b0725d..912f655881 100644
--- a/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/migrating-from-github-enterprise-1110x-to-2123.md
+++ b/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/migrating-from-github-enterprise-1110x-to-2123.md
@@ -1,16 +1,16 @@
---
-title: GitHub Enterprise 11.10.xから2.1.23への移行
+title: Migrating from GitHub Enterprise 11.10.x to 2.1.23
redirect_from:
- /enterprise/admin/installation/migrating-from-github-enterprise-1110x-to-2123
- - /enterprise/admin-guide/migrating/
- - /enterprise/admin/articles/migrating-github-enterprise/
- - /enterprise/admin/guides/installation/migrating-from-github-enterprise-v11-10-34x/
- - /enterprise/admin/articles/upgrading-to-a-newer-release/
- - /enterprise/admin/guides/installation/migrating-to-a-different-platform-or-from-github-enterprise-11-10-34x/
+ - /enterprise/admin-guide/migrating
+ - /enterprise/admin/articles/migrating-github-enterprise
+ - /enterprise/admin/guides/installation/migrating-from-github-enterprise-v11-10-34x
+ - /enterprise/admin/articles/upgrading-to-a-newer-release
+ - /enterprise/admin/guides/installation/migrating-to-a-different-platform-or-from-github-enterprise-11-10-34x
- /enterprise/admin/guides/installation/migrating-from-github-enterprise-11-10-x-to-2-1-23
- /enterprise/admin/enterprise-management/migrating-from-github-enterprise-1110x-to-2123
- /admin/enterprise-management/migrating-from-github-enterprise-1110x-to-2123
-intro: '{% data variables.product.prodname_enterprise %}11.10.xから2.1.23へ移行するには、新しいアプライアンスのインスタンスをセットアップし、以前のインスタンスからデータを移行しなければなりません。'
+intro: 'To migrate from {% data variables.product.prodname_enterprise %} 11.10.x to 2.1.23, you''ll need to set up a new appliance instance and migrate data from the previous instance.'
versions:
ghes: '*'
type: how_to
@@ -20,50 +20,52 @@ topics:
- Upgrades
shortTitle: Migrate from 11.10.x to 2.1.23
---
+Migrations from {% data variables.product.prodname_enterprise %} 11.10.348 and later are supported. Migrating from {% data variables.product.prodname_enterprise %} 11.10.348 and earlier is not supported. You must first upgrade to 11.10.348 in several upgrades. For more information, see the 11.10.348 upgrading procedure, "[Upgrading to the latest release](/enterprise/11.10.340/admin/articles/upgrading-to-the-latest-release/)."
-{% data variables.product.prodname_enterprise %}11.10.348以降からの移行がサポートされています。 {% data variables.product.prodname_enterprise %}11.10.348以前からの移行はサポートされていません。 いくつかのアップグレードを経て、まず11.10.348にアップグレードしなければなりません。 詳しい情報については11.10.348のアップグレード手順"[最新リリースへのアップグレード](/enterprise/11.10.340/admin/articles/upgrading-to-the-latest-release/)"を参照してください。
+To upgrade to the latest version of {% data variables.product.prodname_enterprise %}, you must first migrate to {% data variables.product.prodname_ghe_server %} 2.1, then you can follow the normal upgrade process. For more information, see "[Upgrading {% data variables.product.prodname_enterprise %}](/enterprise/admin/guides/installation/upgrading-github-enterprise-server/)".
-最新バージョンの {% data variables.product.prodname_enterprise %} にアップグレードするには、まず {% data variables.product.prodname_ghe_server %} 2.1 に移行する必要があります。その後、通常のアップグレードプロセスに従うことができます。 詳細は「[{% data variables.product.prodname_enterprise %} をアップグレードする](/enterprise/admin/guides/installation/upgrading-github-enterprise-server/)」参照してください。
+## Prepare for the migration
-## 移行の準備
-
-1. プロビジョニング及びインストールガイドをレビューし、{% data variables.product.prodname_enterprise %}2.1.23を自分の環境にプロビジョニングして設定するのに必要な条件が満たされているかを確認してください。 詳しい情報については"[プロビジョニングとインストール](/enterprise/2.1/admin/guides/installation/provisioning-and-installation/)"を参照してください。
-2. 現在のインスタンスがサポートされているアップグレードバージョンを動作させていることを確認してください。
-3. 最新バージョンの {% data variables.product.prodname_enterprise_backup_utilities %} をセットアップします。 詳細は [{% data variables.product.prodname_enterprise_backup_utilities %}](https://github.com/github/backup-utils) を参照してください。
- - {% data variables.product.prodname_enterprise_backup_utilities %}を使ってすでにスケジューリングされたバックアップを設定しているなら、最新バージョンにアップデートしたことを確認してください。
- - 現時点でスケジューリングされたバックアップを動作させていないなら、{% data variables.product.prodname_enterprise_backup_utilities %}をセットアップしてください。
-4. `ghe-backup`コマンドを使って、現在のインスタンスの初めてのフルバックアップスナップショットを取ってください。 現在のインスタンスですでにスケジューリングされたバックアップを設定しているなら、インスタンスのスナップショットを取る必要はありません。
+1. Review the Provisioning and Installation guide and check that all prerequisites needed to provision and configure {% data variables.product.prodname_enterprise %} 2.1.23 in your environment are met. For more information, see "[Provisioning and Installation](/enterprise/2.1/admin/guides/installation/provisioning-and-installation/)."
+2. Verify that the current instance is running a supported upgrade version.
+3. Set up the latest version of the {% data variables.product.prodname_enterprise_backup_utilities %}. For more information, see [{% data variables.product.prodname_enterprise_backup_utilities %}](https://github.com/github/backup-utils).
+ - If you have already configured scheduled backups using {% data variables.product.prodname_enterprise_backup_utilities %}, make sure you have updated to the latest version.
+ - If you are not currently running scheduled backups, set up {% data variables.product.prodname_enterprise_backup_utilities %}.
+4. Take an initial full backup snapshot of the current instance using the `ghe-backup` command. If you have already configured scheduled backups for your current instance, you don't need to take a snapshot of your instance.
{% tip %}
- **Tip:**スナップショットを取る間は、インスタンスをオンラインのままにして利用し続けられます。 移行作業のメンテナンスモードの間、別のスナップショットを取ることができます。 バックアップはインクリメンタルなので、この初期スナップショットは最終のスナップショットへのデータ転送量を減らしてくれます。それによって、メンテナンスウィンドウが短くなるかもしれません。
+ **Tip:** You can leave the instance online and in active use during the snapshot. You'll take another snapshot during the maintenance portion of the migration. Since backups are incremental, this initial snapshot reduces the amount of data transferred in the final snapshot, which may shorten the maintenance window.
{% endtip %}
-5. ユーザーネットワークトラフィックを新しいインスタンスに切り替える方法を決定します。 移行した後に、すべての HTTP と Git のネットワークトラフィックは新しいインスタンスに送信されます。
- - **DNS** - この方法はシンプルであり、あるデータセンターから他のデータセンターへの移行であってもうまく働くことから、この方法はすべての環境でおすすめします。 移行を開始する前に、既存のDNSレコードのTTLを5分以下にして、変更が伝播するようにしてください。 移行が完了したら、DNSレコードを新しいインスタンスのIPアドレスを指すように更新してください。
- - **IPアドレスの割り当て** - この方法が利用できるのはVMWareからVMWareへの移行の場合のみであり、DNSを使う方法が利用できない場合以外にはおすすめできません。 移行を始める前に、古いインスタンスをシャットダウンしてそのIPアドレスを新しいインスタンスに割り当てる必要があります。
-6. メンテナンスウィンドウをスケジューリングしてください。 メンテナンスウィンドウには、データをバックアップホストから新しいインスタンスに転送するのに十分な時間が含まれていなければならず、その長さはバックアップスナップショットのサイズと利用可能なネットワーク帯域に基づいて変化します。 この間、現在のインスタンスは利用できなくなり、新しいインスタンスへの移行の間はメンテナンスモードになります。
+5. Determine the method for switching user network traffic to the new instance. After you've migrated, all HTTP and Git network traffic directs to the new instance.
+ - **DNS** - We recommend this method for all environments, as it's simple and works well even when migrating from one datacenter to another. Before starting migration, reduce the existing DNS record's TTL to five minutes or less and allow the change to propagate. Once the migration is complete, update the DNS record(s) to point to the IP address of the new instance.
+ - **IP address assignment** - This method is only available on VMware to VMware migration and is not recommended unless the DNS method is unavailable. Before starting the migration, you'll need to shut down the old instance and assign its IP address to the new instance.
+6. Schedule a maintenance window. The maintenance window should include enough time to transfer data from the backup host to the new instance and will vary based on the size of the backup snapshot and available network bandwidth. During this time your current instance will be unavailable and in maintenance mode while you migrate to the new instance.
-## 移行の実施
+## Perform the migration
-1. 新しい{% data variables.product.prodname_enterprise %}2.1インスタンスをプロビジョニングしてください。 詳しい情報については、ターゲットのプラットフォームの"[プロビジョニングとインストール](/enterprise/2.1/admin/guides/installation/provisioning-and-installation/)"ガイドを参照してください。
-2. ブラウザで新しいレプリカアプライアンスのIPアドレスにアクセスして、所有する{% data variables.product.prodname_enterprise %}のライセンスをアップロードしてください。
-3. 管理者パスワードを設定してください。
-5. **Migrate（移行）**をクリックしてください。 
-6. バックアップホストへのアクセス用のSSHキーを"Add new SSH key（新しいSSHキーの追加）"に貼り付けてください。 
-7. [**Add key**] をクリックしてから、[**Continue**] をクリックします。
-8. 新しいインスタンスへデータを移行するためにバックアップホストで実行する`ghe-restore`コマンドをコピーしてください。 
-9. 古いインスタンスでメンテナンスモードを有効化し、すべてのアクティブなプロセスが完了するのを待ってください。 詳しい情報については"[メンテナンスモードの有効化とスケジューリング](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-and-scheduling-maintenance-mode)"を参照してください。
+1. Provision a new {% data variables.product.prodname_enterprise %} 2.1 instance. For more information, see the "[Provisioning and Installation](/enterprise/2.1/admin/guides/installation/provisioning-and-installation/)" guide for your target platform.
+2. In a browser, navigate to the new replica appliance's IP address and upload your {% data variables.product.prodname_enterprise %} license.
+3. Set an admin password.
+5. Click **Migrate**.
+
+6. Paste your backup host access SSH key into "Add new SSH key".
+
+7. Click **Add key** and then click **Continue**.
+8. Copy the `ghe-restore` command that you'll run on the backup host to migrate data to the new instance.
+
+9. Enable maintenance mode on the old instance and wait for all active processes to complete. For more information, see "[Enabling and scheduling maintenance mode](/enterprise/{{ currentVersion }}/admin/guides/installation/enabling-and-scheduling-maintenance-mode)."
{% note %}
- **ノート:** この時点から、インスタンスは通常の利用ができなくなります。
+ **Note:** The instance will be unavailable for normal use from this point forward.
{% endnote %}
-10. バックアップホストで、`ghe-backup` コマンドを実行して最終的なバックアップスナップショットを作成します。 これにより、古いインスタンスからすべてのデータが確実にキャプチャされます。
-11. バックアップホストで、新しいインスタンスの復元ステータス画面でコピーした `ghe-restore` コマンドを実行して、最新のスナップショットを復元します。
+10. On the backup host, run the `ghe-backup` command to take a final backup snapshot. This ensures that all data from the old instance is captured.
+11. On the backup host, run the `ghe-restore` command you copied on the new instance's restore status screen to restore the latest snapshot.
```shell
$ ghe-restore 169.254.1.1
The authenticity of host '169.254.1.1:122' can't be established.
@@ -84,15 +86,17 @@ shortTitle: Migrate from 11.10.x to 2.1.23
Visit https://169.254.1.1/setup/settings to review appliance configuration.
```
-12. 新しいインスタンスの復元ステータス画面に戻って、復元が完了したことを確認します。
-13. [**Continue to settings**] をクリックして、前のインスタンスからインポートされた設定情報を確認して調整します。 
-14. **Save settings（設定の保存）**をクリックしてください。
+12. Return to the new instance's restore status screen to see that the restore completed.
+
+13. Click **Continue to settings** to review and adjust the configuration information and settings that were imported from the previous instance.
+
+14. Click **Save settings**.
{% note %}
- **メモ:** 設定を適用してサーバーを再起動した後は、新しいインスタンスを使用できます。
+ **Note:** You can use the new instance after you've applied configuration settings and restarted the server.
{% endnote %}
-15. DNS または IP アドレスの割り当てのどちらかを使用して、ユーザーのネットワークトラフィックを古いインスタンスから新しいインスタンスに切り替えます。
-16. 最新のパッチリリース {{ currentVersion }} にアップグレードします。 詳細は「[{% data variables.product.prodname_ghe_server %} をアップグレードする](/enterprise/admin/guides/installation/upgrading-github-enterprise-server/)」を参照してください。
+15. Switch user network traffic from the old instance to the new instance using either DNS or IP address assignment.
+16. Upgrade to the latest patch release of {{ currentVersion }}. For more information, see "[Upgrading {% data variables.product.prodname_ghe_server %}](/enterprise/admin/guides/installation/upgrading-github-enterprise-server/)."
diff --git a/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrade-requirements.md b/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrade-requirements.md
index 2111abfe4f..67ec886148 100644
--- a/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrade-requirements.md
+++ b/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrade-requirements.md
@@ -3,7 +3,7 @@ title: Upgrade requirements
intro: 'Before upgrading {% data variables.product.prodname_ghe_server %}, review these recommendations and requirements to plan your upgrade strategy.'
redirect_from:
- /enterprise/admin/installation/upgrade-requirements
- - /enterprise/admin/guides/installation/finding-the-current-github-enterprise-release/
+ - /enterprise/admin/guides/installation/finding-the-current-github-enterprise-release
- /enterprise/admin/enterprise-management/upgrade-requirements
- /admin/enterprise-management/upgrade-requirements
versions:
diff --git a/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md b/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md
index 4f60cb3784..7d618961ca 100644
--- a/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md
+++ b/translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md
@@ -3,15 +3,15 @@ title: Upgrading GitHub Enterprise Server
intro: 'Upgrade {% data variables.product.prodname_ghe_server %} to get the latest features and security updates.'
redirect_from:
- /enterprise/admin/installation/upgrading-github-enterprise-server
- - /enterprise/admin/articles/upgrading-to-the-latest-release/
- - /enterprise/admin/articles/migrations-and-upgrades/
- - /enterprise/admin/guides/installation/upgrading-the-github-enterprise-virtual-machine/
- - /enterprise/admin/guides/installation/upgrade-packages-for-older-releases/
- - /enterprise/admin/articles/upgrading-older-installations/
- - /enterprise/admin/hidden/upgrading-older-installations/
- - /enterprise/admin/hidden/upgrading-github-enterprise-using-a-hotpatch-early-access-program/
- - /enterprise/admin/hidden/upgrading-github-enterprise-using-a-hotpatch/
- - /enterprise/admin/guides/installation/upgrading-github-enterprise/
+ - /enterprise/admin/articles/upgrading-to-the-latest-release
+ - /enterprise/admin/articles/migrations-and-upgrades
+ - /enterprise/admin/guides/installation/upgrading-the-github-enterprise-virtual-machine
+ - /enterprise/admin/guides/installation/upgrade-packages-for-older-releases
+ - /enterprise/admin/articles/upgrading-older-installations
+ - /enterprise/admin/hidden/upgrading-older-installations
+ - /enterprise/admin/hidden/upgrading-github-enterprise-using-a-hotpatch-early-access-program
+ - /enterprise/admin/hidden/upgrading-github-enterprise-using-a-hotpatch
+ - /enterprise/admin/guides/installation/upgrading-github-enterprise
- /enterprise/admin/enterprise-management/upgrading-github-enterprise-server
- /admin/enterprise-management/upgrading-github-enterprise-server
versions:
diff --git a/translations/ja-JP/content/admin/enterprise-support/overview/about-github-premium-support-for-github-enterprise-server.md b/translations/ja-JP/content/admin/enterprise-support/overview/about-github-premium-support-for-github-enterprise-server.md
index c26d306359..19b17f289b 100644
--- a/translations/ja-JP/content/admin/enterprise-support/overview/about-github-premium-support-for-github-enterprise-server.md
+++ b/translations/ja-JP/content/admin/enterprise-support/overview/about-github-premium-support-for-github-enterprise-server.md
@@ -2,8 +2,8 @@
title: About GitHub Premium Support for GitHub Enterprise Server
intro: '{% data variables.contact.premium_support %} is a paid, supplemental support offering for {% data variables.product.prodname_enterprise %} customers.'
redirect_from:
- - /enterprise/admin/guides/enterprise-support/about-premium-support-for-github-enterprise/
- - /enterprise/admin/guides/enterprise-support/about-premium-support/
+ - /enterprise/admin/guides/enterprise-support/about-premium-support-for-github-enterprise
+ - /enterprise/admin/guides/enterprise-support/about-premium-support
- /enterprise/admin/enterprise-support/about-github-premium-support-for-github-enterprise-server
- /admin/enterprise-support/about-github-premium-support-for-github-enterprise-server
versions:
diff --git a/translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/index.md b/translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/index.md
index 1bb8a2e3d8..68f0cb423b 100644
--- a/translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/index.md
+++ b/translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/index.md
@@ -1,8 +1,8 @@
---
-title: GitHub Support からの支援を受ける
-intro: 'Enterprise のさまざまな問題をレポートするには{% data variables.contact.enterprise_support %} に連絡してください。'
+title: Receiving help from GitHub Support
+intro: 'You can contact {% data variables.contact.enterprise_support %} to report a range of issues for your enterprise.'
redirect_from:
- - /enterprise/admin/guides/enterprise-support/receiving-help-from-github-enterprise-support/
+ - /enterprise/admin/guides/enterprise-support/receiving-help-from-github-enterprise-support
- /enterprise/admin/enterprise-support/receiving-help-from-github-support
versions:
ghes: '*'
diff --git a/translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/providing-data-to-github-support.md b/translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/providing-data-to-github-support.md
index 2e6d49cb05..66c4f8ca9d 100644
--- a/translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/providing-data-to-github-support.md
+++ b/translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/providing-data-to-github-support.md
@@ -2,9 +2,9 @@
title: Providing data to GitHub Support
intro: 'Since {% data variables.contact.github_support %} doesn''t have access to your environment, we require some additional information from you.'
redirect_from:
- - /enterprise/admin/guides/installation/troubleshooting/
- - /enterprise/admin/articles/support-bundles/
- - /enterprise/admin/guides/enterprise-support/providing-data-to-github-enterprise-support/
+ - /enterprise/admin/guides/installation/troubleshooting
+ - /enterprise/admin/articles/support-bundles
+ - /enterprise/admin/guides/enterprise-support/providing-data-to-github-enterprise-support
- /enterprise/admin/enterprise-support/providing-data-to-github-support
- /admin/enterprise-support/providing-data-to-github-support
versions:
diff --git a/translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/reaching-github-support.md b/translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/reaching-github-support.md
index 70b1836838..9e60d8c73a 100644
--- a/translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/reaching-github-support.md
+++ b/translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/reaching-github-support.md
@@ -2,7 +2,7 @@
title: Reaching GitHub Support
intro: 'Contact {% data variables.contact.enterprise_support %} using the {% ifversion ghes %}{% data variables.product.prodname_ghe_server %} {% data variables.enterprise.management_console %} or{% endif %} the support portal.'
redirect_from:
- - /enterprise/admin/guides/enterprise-support/reaching-github-enterprise-support/
+ - /enterprise/admin/guides/enterprise-support/reaching-github-enterprise-support
- /enterprise/admin/enterprise-support/reaching-github-support
- /admin/enterprise-support/reaching-github-support
versions:
diff --git a/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-dependency-insights-in-your-enterprise.md b/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-dependency-insights-in-your-enterprise.md
index 76756a757e..3756eb9670 100644
--- a/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-dependency-insights-in-your-enterprise.md
+++ b/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-dependency-insights-in-your-enterprise.md
@@ -4,7 +4,7 @@ intro: 'You can enforce policies for dependency insights within your enterprise'
permissions: Enterprise owners can enforce policies for dependency insights in an enterprise.
product: '{% data reusables.gated-features.enterprise-accounts %}'
redirect_from:
- - /articles/enforcing-a-policy-on-dependency-insights/
+ - /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
- /github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
@@ -22,14 +22,16 @@ shortTitle: Policies for dependency insights
## About policies for dependency insights in your enterprise
-Dependency insights show all packages that repositories within your enterprise's organizations depend on. Dependency insights include aggregated information about security advisories and licenses. 詳細は「[Organization のインサイトを表示する](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization)」を参照してください。
+Dependency insights show all packages that repositories within your enterprise's organizations depend on. Dependency insights include aggregated information about security advisories and licenses. For more information, see "[Viewing insights for your organization](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization)."
## Enforcing a policy for visibility of dependency insights
-Across all organizations owned by your enterprise, you can control whether organization members can view dependency insights. You can also allow owners to administer the setting on the organization level. 詳細は「[Organization dependency insights の可視性を変更する](/organizations/managing-organization-settings/changing-the-visibility-of-your-organizations-dependency-insights)」を参照してください。
+Across all organizations owned by your enterprise, you can control whether organization members can view dependency insights. You can also allow owners to administer the setting on the organization level. For more information, see "[Changing the visibility of your organization's dependency insights](/organizations/managing-organization-settings/changing-the-visibility-of-your-organizations-dependency-insights)."
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.policies-tab %}
-3. In the left sidebar, click **Organizations**. 
-4. [Organization projects] で、設定変更についての情報を確認します。 {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
-5. [Organization policies] で、ドロップダウンメニューを使用してポリシーを選択します。 
+3. In the left sidebar, click **Organizations**.
+ 
+4. Under "Organization policies", review the information about changing the setting. {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
+5. Under "Organization policies", use the drop-down menu and choose a policy.
+ 
diff --git a/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md b/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
index 5e3c5e4bc6..580c1dcf78 100644
--- a/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
+++ b/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md
@@ -5,8 +5,8 @@ permissions: Enterprise owners can enforce policies for security settings in an
product: '{% data reusables.gated-features.enterprise-accounts %}'
miniTocMaxHeadingLevel: 3
redirect_from:
- - /articles/enforcing-security-settings-for-organizations-in-your-business-account/
- - /articles/enforcing-security-settings-for-organizations-in-your-enterprise-account/
+ - /articles/enforcing-security-settings-for-organizations-in-your-business-account
+ - /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
@@ -34,27 +34,29 @@ You can enforce policies to control the security settings for organizations owne
Enterprise owners can require that organization members, billing managers, and outside collaborators in all organizations owned by an enterprise use two-factor authentication to secure their personal accounts.
-Before you can require 2FA for all organizations owned by your enterprise, you must enable two-factor authentication for your own account. 詳細は「[2 要素認証 (2FA) でアカウントを保護する](/articles/securing-your-account-with-two-factor-authentication-2fa/)」を参照してください。
+Before you can require 2FA for all organizations owned by your enterprise, you must enable two-factor authentication for your own account. For more information, see "[Securing your account with two-factor authentication (2FA)](/articles/securing-your-account-with-two-factor-authentication-2fa/)."
{% warning %}
-**警告:**
+**Warnings:**
-- When you require two-factor authentication for your enterprise, members, outside collaborators, and billing managers (including bot accounts) in all organizations owned by your enterprise who do not use 2FA will be removed from the organization and lose access to its repositories. Organization のプライベートリポジトリのフォークへのアクセスも失います。 Organization から削除されてから 3 か月以内に、削除されたユーザが自分の個人アカウントで 2 要素認証を有効にすれば、そのユーザのアクセス権限および設定を復元できます。 詳しい情報については、「[Organization の以前のメンバーを回復する](/articles/reinstating-a-former-member-of-your-organization)」を参照してください。
+- When you require two-factor authentication for your enterprise, members, outside collaborators, and billing managers (including bot accounts) in all organizations owned by your enterprise who do not use 2FA will be removed from the organization and lose access to its repositories. They will also lose access to their forks of the organization's private repositories. You can reinstate their access privileges and settings if they enable two-factor authentication for their personal account within three months of their removal from your organization. For more information, see "[Reinstating a former member of your organization](/articles/reinstating-a-former-member-of-your-organization)."
- Any organization owner, member, billing manager, or outside collaborator in any of the organizations owned by your enterprise who disables 2FA for their personal account after you've enabled required two-factor authentication will automatically be removed from the organization.
- If you're the sole owner of a enterprise that requires two-factor authentication, you won't be able to disable 2FA for your personal account without disabling required two-factor authentication for the enterprise.
{% endwarning %}
-2 要素認証の使用を義務化する前に、Organization のメンバー、外部コラボレーター、支払いマネージャーに通知をして、各自に自分のアカウントで 2 要素認証をセットアップしてもらってください。 Organization のオーナーは、メンバーと外部コラボレーターがすでに 2 要素認証を使用しているかどうかを、各 Organization の [People] ページで確認できます。 詳細は「[Organization 内のユーザが 2 要素認証を有効にしているか確認する](/articles/viewing-whether-users-in-your-organization-have-2fa-enabled)」を参照してください。
+Before you require use of two-factor authentication, we recommend notifying organization members, outside collaborators, and billing managers and asking them to set up 2FA for their accounts. Organization owners can see if members and outside collaborators already use 2FA on each organization's People page. For more information, see "[Viewing whether users in your organization have 2FA enabled](/articles/viewing-whether-users-in-your-organization-have-2fa-enabled)."
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
{% data reusables.enterprise-accounts.security-tab %}
-4. [Two-factor authentication] で、設定変更に関する情報を確認します。 {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
-5. [Two-factor authentication] で、[**Require two-factor authentication for all organizations in your business**] を選択し、[**Save**] をクリックします。 
-6. If prompted, read the information about members and outside collaborators who will be removed from the organizations owned by your enterprise. To confirm the change, type your enterprise's name, then click **Remove members & require two-factor authentication**. 
-7. Optionally, if any members or outside collaborators are removed from the organizations owned by your enterprise, we recommend sending them an invitation to reinstate their former privileges and access to your organization. 彼らが招待状を受け取ることができるようにするには、まず各ユーザーが 2 要素認証を有効にする必要があります。
+4. Under "Two-factor authentication", review the information about changing the setting. {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
+5. Under "Two-factor authentication", select **Require two-factor authentication for all organizations in your business**, then click **Save**.
+ 
+6. If prompted, read the information about members and outside collaborators who will be removed from the organizations owned by your enterprise. To confirm the change, type your enterprise's name, then click **Remove members & require two-factor authentication**.
+ 
+7. Optionally, if any members or outside collaborators are removed from the organizations owned by your enterprise, we recommend sending them an invitation to reinstate their former privileges and access to your organization. Each person must enable two-factor authentication before they can accept your invitation.
{% endif %}
@@ -64,7 +66,7 @@ Before you can require 2FA for all organizations owned by your enterprise, you m
{% ifversion ghae %}
-You can restrict network traffic to your enterprise on {% data variables.product.product_name %}. 詳しい情報については、「[Enterprise へのネットワークトラフィックを制限する](/admin/configuration/configuring-your-enterprise/restricting-network-traffic-to-your-enterprise)」を参照してください。
+You can restrict network traffic to your enterprise on {% data variables.product.product_name %}. For more information, see "[Restricting network traffic to your enterprise](/admin/configuration/configuring-your-enterprise/restricting-network-traffic-to-your-enterprise)."
{% elsif ghec %}
@@ -72,11 +74,11 @@ Enterprise owners can restrict access to assets owned by organizations in an ent
{% data reusables.identity-and-permissions.ip-allow-lists-cidr-notation %}
-{% data reusables.identity-and-permissions.ip-allow-lists-enable %} {% data reusables.identity-and-permissions.ip-allow-lists-enterprise %}
+{% data reusables.identity-and-permissions.ip-allow-lists-enable %} {% data reusables.identity-and-permissions.ip-allow-lists-enterprise %}
-許可 IP アドレスを、Organization ごとに設定することもできます。 詳細は「[ Organization に対する許可 IP アドレスを管理する](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization)」を参照してください。
+You can also configure allowed IP addresses for an individual organization. For more information, see "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization)."
-### 許可 IP アドレスを追加する
+### Adding an allowed IP address
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
@@ -85,19 +87,20 @@ Enterprise owners can restrict access to assets owned by organizations in an ent
{% data reusables.identity-and-permissions.ip-allow-lists-add-description %}
{% data reusables.identity-and-permissions.ip-allow-lists-add-entry %}
-### {% data variables.product.prodname_github_apps %}によるアクセスの許可
+### Allowing access by {% data variables.product.prodname_github_apps %}
{% data reusables.identity-and-permissions.ip-allow-lists-githubapps-enterprise %}
-### 許可 IP アドレスを有効化する
+### Enabling allowed IP addresses
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
{% data reusables.enterprise-accounts.security-tab %}
-3. [IP allow list] で、「**Enable IP allow list**」を選択します。 
-4. [**Save**] をクリックします。
+3. Under "IP allow list", select **Enable IP allow list**.
+ 
+4. Click **Save**.
-### 許可 IP アドレスを編集する
+### Editing an allowed IP address
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
@@ -105,9 +108,9 @@ Enterprise owners can restrict access to assets owned by organizations in an ent
{% data reusables.identity-and-permissions.ip-allow-lists-edit-entry %}
{% data reusables.identity-and-permissions.ip-allow-lists-edit-ip %}
{% data reusables.identity-and-permissions.ip-allow-lists-edit-description %}
-8. [**Update**] をクリックします。
+8. Click **Update**.
-### 許可 IP アドレスを削除する
+### Deleting an allowed IP address
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
@@ -115,7 +118,7 @@ Enterprise owners can restrict access to assets owned by organizations in an ent
{% data reusables.identity-and-permissions.ip-allow-lists-delete-entry %}
{% data reusables.identity-and-permissions.ip-allow-lists-confirm-deletion %}
-### IP許可リストで {% data variables.product.prodname_actions %} を使用する
+### Using {% data variables.product.prodname_actions %} with an IP allow list
{% data reusables.github-actions.ip-allow-list-self-hosted-runners %}
@@ -125,9 +128,9 @@ Enterprise owners can restrict access to assets owned by organizations in an ent
## Managing SSH certificate authorities for your enterprise
-You can use a SSH certificate authorities (CA) to allow members of any organization owned by your enterprise to access that organization's repositories using SSH certificates you provide. {% data reusables.organizations.can-require-ssh-cert %}詳しい情報については、「[SSS 認証局について](/organizations/managing-git-access-to-your-organizations-repositories/about-ssh-certificate-authorities)」を参照してください。
+You can use a SSH certificate authorities (CA) to allow members of any organization owned by your enterprise to access that organization's repositories using SSH certificates you provide. {% data reusables.organizations.can-require-ssh-cert %} For more information, see "[About SSH certificate authorities](/organizations/managing-git-access-to-your-organizations-repositories/about-ssh-certificate-authorities)."
-### SSH 認証局を追加する
+### Adding an SSH certificate authority
{% data reusables.organizations.add-extension-to-cert %}
@@ -137,9 +140,9 @@ You can use a SSH certificate authorities (CA) to allow members of any organizat
{% data reusables.organizations.new-ssh-ca %}
{% data reusables.organizations.require-ssh-cert %}
-### SSH認証局を削除する
+### Deleting an SSH certificate authority
-CAを削除すると、元に戻すことはできません。 同じCAを使用したくなった場合には、そのCAを再びアップロードする必要があります。
+Deleting a CA cannot be undone. If you want to use the same CA in the future, you'll need to upload the CA again.
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
@@ -148,7 +151,7 @@ CAを削除すると、元に戻すことはできません。 同じCAを使用
{% ifversion ghec or ghae %}
-## 参考リンク
+## Further reading
- "[About identity and access management for your enterprise](/admin/authentication/managing-identity-and-access-for-your-enterprise/about-identity-and-access-management-for-your-enterprise)"
diff --git a/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-project-board-policies-in-your-enterprise.md b/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-project-board-policies-in-your-enterprise.md
index b6b9fc82d5..251c60ac98 100644
--- a/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-project-board-policies-in-your-enterprise.md
+++ b/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-project-board-policies-in-your-enterprise.md
@@ -4,8 +4,8 @@ intro: 'You can enforce policies for projects within your enterprise''s organiza
permissions: Enterprise owners can enforce policies for project boards in an enterprise.
product: '{% data reusables.gated-features.enterprise-accounts %}'
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-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
- /github/setting-up-and-managing-your-enterprise/enforcing-project-board-policies-in-your-enterprise-account
@@ -24,24 +24,26 @@ shortTitle: Project board policies
## About policies for project boards in your enterprise
-You can enforce policies to control how members of your enterprise on {% data variables.product.product_name %} manage project boards. You can also allow organization owners to manage policies for project boards. 詳細は「[プロジェクトボードについて](/issues/organizing-your-work-with-project-boards/managing-project-boards/about-project-boards)」を参照してください。
+You can enforce policies to control how members of your enterprise on {% data variables.product.product_name %} manage project boards. You can also allow organization owners to manage policies for project boards. For more information, see "[About project boards](/issues/organizing-your-work-with-project-boards/managing-project-boards/about-project-boards)."
-## Organization 全体のプロジェクトボードでポリシーを施行する
+## Enforcing a policy for organization-wide project boards
Across all organizations owned by your enterprise, you can enable or disable organization-wide project boards, or allow owners to administer the setting on the organization level.
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.policies-tab %}
{% data reusables.enterprise-accounts.projects-tab %}
-4. [Organization projects] で、設定変更についての情報を読みます。 {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
-5. [Organization projects] で、ドロップダウンメニューを使用してポリシーを選択します。 
+4. Under "Organization projects", review the information about changing the setting. {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
+5. Under "Organization projects", use the drop-down menu and choose a policy.
+ 
-## リポジトリのプロジェクトボードでのポリシーを施行する
+## Enforcing a policy for repository project boards
Across all organizations owned by your enterprise, you can enable or disable repository-level project boards, or allow owners to administer the setting on the organization level.
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.policies-tab %}
{% data reusables.enterprise-accounts.projects-tab %}
-4. [Repository projects で、設定変更についての情報を確認します。 {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
-5. [Repository projects] で、ドロップダウンメニューを使用してポリシーを選択します。 
+4. Under "Repository projects", review the information about changing the setting. {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
+5. Under "Repository projects", use the drop-down menu and choose a policy.
+ 
diff --git a/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise.md b/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise.md
index 68e7fb8975..be790e0250 100644
--- a/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise.md
+++ b/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise.md
@@ -10,26 +10,26 @@ redirect_from:
- /enterprise/admin/user-management/restricting-repository-creation-in-your-instance
- /enterprise/admin/user-management/preventing-users-from-deleting-organization-repositories
- /enterprise/admin/installation/setting-git-push-limits
- - /enterprise/admin/guides/installation/git-server-settings/
- - /enterprise/admin/articles/setting-git-push-limits/
+ - /enterprise/admin/guides/installation/git-server-settings
+ - /enterprise/admin/articles/setting-git-push-limits
- /enterprise/admin/user-management/allowing-admins-to-enable-anonymous-git-read-access-to-public-repositories
- /enterprise/admin/installation/disabling-the-merge-conflict-editor-for-pull-requests-between-repositories
- /enterprise/admin/developer-workflow/blocking-force-pushes-on-your-appliance
- /enterprise/admin/developer-workflow/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization
- /enterprise/admin/developer-workflow/blocking-force-pushes-to-a-repository
- - /enterprise/admin/articles/blocking-force-pushes-on-your-appliance/
- - /enterprise/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access-to-a-repository/
+ - /enterprise/admin/articles/blocking-force-pushes-on-your-appliance
+ - /enterprise/admin/guides/user-management/preventing-users-from-changing-anonymous-git-read-access-to-a-repository
- /enterprise/admin/user-management/preventing-users-from-changing-anonymous-git-read-access
- - /enterprise/admin/articles/blocking-force-pushes-to-a-repository/
- - /enterprise/admin/articles/block-force-pushes/
- - /enterprise/admin/articles/blocking-force-pushes-for-a-user-account/
- - /enterprise/admin/articles/blocking-force-pushes-for-an-organization/
- - /enterprise/admin/articles/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization/
+ - /enterprise/admin/articles/blocking-force-pushes-to-a-repository
+ - /enterprise/admin/articles/block-force-pushes
+ - /enterprise/admin/articles/blocking-force-pushes-for-a-user-account
+ - /enterprise/admin/articles/blocking-force-pushes-for-an-organization
+ - /enterprise/admin/articles/blocking-force-pushes-to-repositories-owned-by-a-user-account-or-organization
- /enterprise/admin/developer-workflow/blocking-force-pushes
- /enterprise/admin/policies/enforcing-repository-management-policies-in-your-enterprise
- /admin/policies/enforcing-repository-management-policies-in-your-enterprise
- - /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-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
- /github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account
diff --git a/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-team-policies-in-your-enterprise.md b/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-team-policies-in-your-enterprise.md
index 1b7cff8c01..14860a36f6 100644
--- a/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-team-policies-in-your-enterprise.md
+++ b/translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-team-policies-in-your-enterprise.md
@@ -4,8 +4,8 @@ intro: 'You can enforce policies for teams in your enterprise''s organizations,
permissions: Enterprise owners can enforce policies for teams in an enterprise.
product: '{% data reusables.gated-features.enterprise-accounts %}'
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-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
- /github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account
@@ -24,14 +24,16 @@ shortTitle: Team policies
## About policies for teams in your enterprise
-You can enforce policies to control how members of your enterprise on {% data variables.product.product_name %} manage teams. You can also allow organization owners to manage policies for teams. 詳細は「[Team について](/organizations/organizing-members-into-teams/about-teams)」を参照してください。
+You can enforce policies to control how members of your enterprise on {% data variables.product.product_name %} manage teams. You can also allow organization owners to manage policies for teams. For more information, see "[About teams](/organizations/organizing-members-into-teams/about-teams)."
-## Team ディスカッションでポリシーを施行する
+## Enforcing a policy for team discussions
-Across all organizations owned by your enterprise, you can enable or disable team discussions, or allow owners to administer the setting on the organization level. 詳しい情報については[Team ディスカッションについて](/organizations/collaborating-with-your-team/about-team-discussions/)を参照してください。
+Across all organizations owned by your enterprise, you can enable or disable team discussions, or allow owners to administer the setting on the organization level. For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions/)."
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.policies-tab %}
-3. 左サイトバーで [**Teams**] をクリックします。 
-4. [Team discussions] で、設定変更に関する情報を確認します。 {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
-5. [Team discussions] で、ドロップダウンメニューを使用してポリシーを選択します。 
+3. In the left sidebar, click **Teams**.
+ 
+4. Under "Team discussions", review the information about changing the setting. {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
+5. Under "Team discussions", use the drop-down menu and choose a policy.
+ 
diff --git a/translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md b/translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md
index 9b74d60545..48b09b3704 100644
--- a/translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md
+++ b/translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md
@@ -82,14 +82,14 @@ The `$GITHUB_VIA` variable is available in the pre-receive hook environment when
| Value | Action | More information |
| :- | :- | :- |
-| auto-merge deployment api
| Automatic merge of the base branch via a deployment created with the API | "[Repositories](/rest/reference/repos#create-a-deployment)" in the REST API documentation |
+| auto-merge deployment api
| Automatic merge of the base branch via a deployment created with the API | "[Create a deployment](/rest/reference/deployments#create-a-deployment)" in the REST API documentation |
| blob#save
| Change to a file's contents in the web interface | "[Editing files](/repositories/working-with-files/managing-files/editing-files)" |
-| branch merge api
| Merge of a branch via the API | "[Repositories](/rest/reference/repos#merge-a-branch)" in the REST API documentation |
+| branch merge api
| Merge of a branch via the API | "[Merge a branch](/rest/reference/branches#merge-a-branch)" in the REST API documentation |
| branches page delete button
| Deletion of a branch in the web interface | "[Creating and deleting branches within your repository](/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository#deleting-a-branch)" |
| git refs create api
| Creation of a ref via the API | "[Git database](/rest/reference/git#create-a-reference)" in the REST API documentation |
| git refs delete api
| Deletion of a ref via the API | "[Git database](/rest/reference/git#delete-a-reference)" in the REST API documentation |
| git refs update api
| Update of a ref via the API | "[Git database](/rest/reference/git#update-a-reference)" in the REST API documentation |
-| git repo contents api
| Change to a file's contents via the API | "[Repositories](/rest/reference/repos#create-or-update-file-contents)" in the REST API documentation |
+| git repo contents api
| Change to a file's contents via the API | "[Create or update file contents](/rest/reference/repos#create-or-update-file-contents)" in the REST API documentation |
| merge base into head
| Update of the topic branch from the base branch when the base branch requires strict status checks (via **Update branch** in a pull request, for example) | "[About protected branches](/github/administering-a-repository/about-protected-branches#require-status-checks-before-merging)" |
| pull request branch delete button
| Deletion of a topic branch from a pull request in the web interface | "[Deleting and restoring branches in a pull request](/github/administering-a-repository/deleting-and-restoring-branches-in-a-pull-request#deleting-a-branch-used-for-a-pull-request)" |
| pull request branch undo button
| Restoration of a topic branch from a pull request in the web interface | "[Deleting and restoring branches in a pull request](/github/administering-a-repository/deleting-and-restoring-branches-in-a-pull-request#restoring-a-deleted-branch)" |
diff --git a/translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md b/translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md
index f3457669b2..1a2e868839 100644
--- a/translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md
+++ b/translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md
@@ -3,7 +3,7 @@ title: Managing pre-receive hooks on the GitHub Enterprise Server appliance
intro: 'Configure how people will use pre-receive hooks within their {% data variables.product.prodname_ghe_server %} appliance.'
redirect_from:
- /enterprise/admin/developer-workflow/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance
- - /enterprise/admin/guides/developer-workflow/managing-pre-receive-hooks-on-the-github-enterprise-appliance/
+ - /enterprise/admin/guides/developer-workflow/managing-pre-receive-hooks-on-the-github-enterprise-appliance
- /enterprise/admin/policies/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance
- /admin/policies/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance
versions:
diff --git a/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/exporting-migration-data-from-your-enterprise.md b/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/exporting-migration-data-from-your-enterprise.md
index 16e63c47a3..f3d8b48da6 100644
--- a/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/exporting-migration-data-from-your-enterprise.md
+++ b/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/exporting-migration-data-from-your-enterprise.md
@@ -2,12 +2,12 @@
title: Exporting migration data from your enterprise
intro: 'To change platforms or move from a trial instance to a production instance, you can export migration data from a {% data variables.product.prodname_ghe_server %} instance by preparing the instance, locking the repositories, and generating a migration archive.'
redirect_from:
- - /enterprise/admin/guides/migrations/exporting-migration-data-from-github-enterprise/
+ - /enterprise/admin/guides/migrations/exporting-migration-data-from-github-enterprise
- /enterprise/admin/migrations/exporting-migration-data-from-github-enterprise-server
- /enterprise/admin/migrations/preparing-the-github-enterprise-server-source-instance
- /enterprise/admin/migrations/exporting-the-github-enterprise-server-source-repositories
- - /enterprise/admin/guides/migrations/preparing-the-github-enterprise-source-instance/
- - /enterprise/admin/guides/migrations/exporting-the-github-enterprise-source-repositories/
+ - /enterprise/admin/guides/migrations/preparing-the-github-enterprise-source-instance
+ - /enterprise/admin/guides/migrations/exporting-the-github-enterprise-source-repositories
- /enterprise/admin/user-management/exporting-migration-data-from-your-enterprise
- /admin/user-management/exporting-migration-data-from-your-enterprise
versions:
diff --git a/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/index.md b/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/index.md
index 3f9bc55727..2b27547b72 100644
--- a/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/index.md
+++ b/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/index.md
@@ -1,9 +1,9 @@
---
-title: Enterprise との間でデータを移行する
-intro: '{% data variables.product.prodname_ghe_server %} または {% data variables.product.prodname_dotcom_the_website %} からユーザ、Organization、およびリポジトリデータをエクスポートして、そのデータを {% data variables.product.product_location %} にインポートできます。'
+title: Migrating data to and from your enterprise
+intro: 'You can export user, organization, and repository data from {% data variables.product.prodname_ghe_server %} or {% data variables.product.prodname_dotcom_the_website %}, then import that data into {% data variables.product.product_location %}.'
redirect_from:
- - /enterprise/admin/articles/moving-a-repository-from-github-com-to-github-enterprise/
- - /enterprise/admin/categories/migrations-and-upgrades/
+ - /enterprise/admin/articles/moving-a-repository-from-github-com-to-github-enterprise
+ - /enterprise/admin/categories/migrations-and-upgrades
- /enterprise/admin/migrations/overview
- /enterprise/admin/user-management/migrating-data-to-and-from-your-enterprise
versions:
diff --git a/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/migrating-data-to-your-enterprise.md b/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/migrating-data-to-your-enterprise.md
index 3737d0e572..e6eedafa28 100644
--- a/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/migrating-data-to-your-enterprise.md
+++ b/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/migrating-data-to-your-enterprise.md
@@ -2,14 +2,14 @@
title: Migrating data to your enterprise
intro: 'After generating a migration archive, you can import the data to your target {% data variables.product.prodname_ghe_server %} instance. You''ll be able to review changes for potential conflicts before permanently applying the changes to your target instance.'
redirect_from:
- - /enterprise/admin/guides/migrations/importing-migration-data-to-github-enterprise/
+ - /enterprise/admin/guides/migrations/importing-migration-data-to-github-enterprise
- /enterprise/admin/migrations/applying-the-imported-data-on-github-enterprise-server
- /enterprise/admin/migrations/reviewing-migration-data
- /enterprise/admin/migrations/completing-the-import-on-github-enterprise-server
- - /enterprise/admin/guides/migrations/applying-the-imported-data-on-github-enterprise/
- - /enterprise/admin/guides/migrations/reviewing-the-imported-data/
- - /enterprise/admin/guides/migrations/completing-the-import-on-github-enterprise/
- - /enterprise/admin/guides/migrations/importing-migration-data-to-github-enterprise-server/
+ - /enterprise/admin/guides/migrations/applying-the-imported-data-on-github-enterprise
+ - /enterprise/admin/guides/migrations/reviewing-the-imported-data
+ - /enterprise/admin/guides/migrations/completing-the-import-on-github-enterprise
+ - /enterprise/admin/guides/migrations/importing-migration-data-to-github-enterprise-server
- /enterprise/admin/user-management/migrating-data-to-your-enterprise
- /admin/user-management/migrating-data-to-your-enterprise
versions:
diff --git a/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/preparing-to-migrate-data-to-your-enterprise.md b/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/preparing-to-migrate-data-to-your-enterprise.md
index 6096278f78..12b0ae88e1 100644
--- a/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/preparing-to-migrate-data-to-your-enterprise.md
+++ b/translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/preparing-to-migrate-data-to-your-enterprise.md
@@ -1,12 +1,12 @@
---
-title: Enterprise へのデータ移行の準備
-intro: '移行アーカイブを作成すると、ターゲットの {% data variables.product.prodname_ghe_server %} インスタンスにデータをインポートできます。 変更を恒久的にターゲットのインスタンスに適用する前に、潜在的なコンフリクトがないか変更をレビューできます。'
+title: Preparing to migrate data to your enterprise
+intro: 'After generating a migration archive, you can import the data to your target {% data variables.product.prodname_ghe_server %} instance. You''ll be able to review changes for potential conflicts before permanently applying the changes to your target instance.'
redirect_from:
- /enterprise/admin/migrations/preparing-the-migrated-data-for-import-to-github-enterprise-server
- /enterprise/admin/migrations/generating-a-list-of-migration-conflicts
- /enterprise/admin/migrations/reviewing-migration-conflicts
- /enterprise/admin/migrations/resolving-migration-conflicts-or-setting-up-custom-mappings
- - /enterprise/admin/guides/migrations/preparing-the-migrated-data-for-import-to-github-enterprise/
+ - /enterprise/admin/guides/migrations/preparing-the-migrated-data-for-import-to-github-enterprise
- /enterprise/admin/user-management/preparing-to-migrate-data-to-your-enterprise
- /admin/user-management/preparing-to-migrate-data-to-your-enterprise
versions:
@@ -17,10 +17,9 @@ topics:
- Migration
shortTitle: Prepare to migrate data
---
+## Preparing the migrated data for import to {% data variables.product.prodname_ghe_server %}
-## 移行したデータを {% data variables.product.prodname_ghe_server %} にインポートするための準備
-
-1. [`scp`](https://linuxacademy.com/blog/linux/ssh-and-scp-howto-tips-tricks#scp) コマンドを使って、ソースインスタンスまたは Organization から生成された移行アーカイブを {% data variables.product.prodname_ghe_server %} ターゲットにコピーします:
+1. Using the [`scp`](https://linuxacademy.com/blog/linux/ssh-and-scp-howto-tips-tricks#scp) command, copy the migration archive generated from your source instance or organization to your {% data variables.product.prodname_ghe_server %} target:
```shell
$ scp -P 122 /path/to/archive/MIGRATION_GUID.tar.gz admin@hostname:/home/admin/
@@ -28,122 +27,122 @@ shortTitle: Prepare to migrate data
{% data reusables.enterprise_installation.ssh-into-target-instance %}
-3. `ghe-migrator prepare` コマンドを使ってターゲットインスタンスにインポートするためのアーカイブを準備し、次のステップで使用する新たな移行 GUID を生成します。
+3. Use the `ghe-migrator prepare` command to prepare the archive for import on the target instance and generate a new Migration GUID for you to use in subsequent steps:
```shell
ghe-migrator prepare /home/admin/MIGRATION_GUID.tar.gz
```
- * 新たにインポートを試みるには、再び `ghe-migrator prepare` を実行して、新しい Migration GUID を取得します。
+ * To start a new import attempt, run `ghe-migrator prepare` again and get a new Migration GUID.
* {% data reusables.enterprise_migrations.specify-staging-path %}
-## 移行のコンフリクトのリストの生成
+## Generating a list of migration conflicts
-1. `ghe-migrator conflicts` コマンドに移行 GUID を付けて実行し、*conflicts.csv* ファイルを生成します。
+1. Using the `ghe-migrator conflicts` command with the Migration GUID, generate a *conflicts.csv* file:
```shell
$ ghe-migrator conflicts -g MIGRATION_GUID > conflicts.csv
```
- - コンフリクトが報告されなければ、「[Enterprise にデータを移行する](/enterprise/admin/guides/migrations/applying-the-imported-data-on-github-enterprise-server/)」のステップに従って安全にデータをインポートできます。
-2. コンフリクトがある場合は、[`scp`](https://linuxacademy.com/blog/linux/ssh-and-scp-howto-tips-tricks#scp) コマンドを使って *conflicts.csv* をローカルコンピュータにコピーします。
+ - If no conflicts are reported, you can safely import the data by following the steps in "[Migrating data to your enterprise](/enterprise/admin/guides/migrations/applying-the-imported-data-on-github-enterprise-server/)".
+2. If there are conflicts, using the [`scp`](https://linuxacademy.com/blog/linux/ssh-and-scp-howto-tips-tricks#scp) command, copy *conflicts.csv* to your local computer:
```shell
$ scp -P 122 admin@hostname:conflicts.csv ~/Desktop
```
-3. 「[移行コンフリクトの解決もしくはカスタムマッピングのセットアップ](#resolving-migration-conflicts-or-setting-up-custom-mappings)」に進みます。
+3. Continue to "[Resolving migration conflicts or setting up custom mappings](#resolving-migration-conflicts-or-setting-up-custom-mappings)".
-## 移行コンフリクトのレビュー
+## Reviewing migration conflicts
-1. テキストエディタもしくは[CSV互換のスプレッドシートソフトウェア](https://en.wikipedia.org/wiki/Comma-separated_values#Application_support)を使って*conflicts.csv*をオープンしてください。
-2. 以下の例とリファレンスのガイダンスと共に*conflicts.csv*ファイルをレビューし、インポートの際に適切なアクションが取られることを確認してください。
+1. Using a text editor or [CSV-compatible spreadsheet software](https://en.wikipedia.org/wiki/Comma-separated_values#Application_support), open *conflicts.csv*.
+2. With guidance from the examples and reference tables below, review the *conflicts.csv* file to ensure that the proper actions will be taken upon import.
-*conflicts.csv*ファイルには、コンフリクトの*移行マップ*と推奨アクションが含まれています。 移行マップは、ソースから移行されるデータと、そのデータがどのようにターゲットに適用されるかのリストです。
+The *conflicts.csv* file contains a *migration map* of conflicts and recommended actions. A migration map lists out both what data is being migrated from the source, and how the data will be applied to the target.
-| `model_name` | `source_url` | `target_url` | `recommended_action` |
-| -------------- | ------------------------------------------------------ | ------------------------------------------------------ | -------------------- |
-| `ユーザ` | `https://example-gh.source/octocat` | `https://example-gh.target/octocat` | `map` |
-| `Organization` | `https://example-gh.source/octo-org` | `https://example-gh.target/octo-org` | `map` |
-| `リポジトリ` | `https://example-gh.source/octo-org/widgets` | `https://example-gh.target/octo-org/widgets` | `rename` |
-| `Team` | `https://example-gh.source/orgs/octo-org/teams/admins` | `https://example-gh.target/orgs/octo-org/teams/admins` | `マージ` |
+| `model_name` | `source_url` | `target_url` | `recommended_action` |
+|--------------|--------------|------------|--------------------|
+| `user` | `https://example-gh.source/octocat` | `https://example-gh.target/octocat` | `map` |
+| `organization` | `https://example-gh.source/octo-org` | `https://example-gh.target/octo-org` | `map` |
+| `repository` | `https://example-gh.source/octo-org/widgets` | `https://example-gh.target/octo-org/widgets` | `rename` |
+| `team` | `https://example-gh.source/orgs/octo-org/teams/admins` | `https://example-gh.target/orgs/octo-org/teams/admins` | `merge` |
-*conflicts.csv*の各行には以下の情報があります。
+Each row in *conflicts.csv* provides the following information:
-| 名前 | 説明 |
-| -------------------- | --------------------------------------- |
-| `model_name` | 変更されるデータの種類。 |
-| `source_url` | データのソースURL。 |
-| `target_url` | 期待されるデータのターゲットURL。 |
-| `recommended_action` | データをインポートする際に`ghe-migrator`が行う推奨のアクション。 |
+| Name | Description |
+|--------------|---------------|
+| `model_name` | The type of data being changed. |
+| `source_url` | The source URL of the data. |
+| `target_url` | The expected target URL of the data. |
+| `recommended_action` | The preferred action `ghe-migrator` will take when importing the data. |
-### 各レコードタイプで可能なマッピング
+### Possible mappings for each record type
-データの転送時に`ghe-migrator`が行えるマッピングアクションは複数あります。
+There are several different mapping actions that `ghe-migrator` can take when transferring data:
-| `action` | 説明 | 適用可能なモデル |
-| --------------- | ---------------------------------------------------------- | -------------------------------- |
-| `import` | （デフォルト）ソースからのデータがターゲットにインポートされます。 | すべてのレコードタイプ |
-| `map` | ソースからのデータがターゲット上の既存のデータで置き換えられます。 | Users、organizations、repositories |
-| `rename` | ソースからのデータは名前が変更されてターゲットにコピーされます。 | Users、organizations、repositories |
-| `map_or_rename` | ターゲットが存在する場合、そのターゲットにマップします。 そうでない場合はインポートされたモデルの名前を変更します。 | ユーザ |
-| `マージ` | ソースからのデータはターゲット上の既存のデータと組み合わされます。 | Team |
+| `action` | Description | Applicable models |
+|------------------------|-------------|-------------------|
+| `import` | (default) Data from the source is imported to the target. | All record types
+| `map` | Data from the source is replaced by existing data on the target. | Users, organizations, repositories
+| `rename` | Data from the source is renamed, then copied over to the target. | Users, organizations, repositories
+| `map_or_rename` | If the target exists, map to that target. Otherwise, rename the imported model. | Users
+| `merge` | Data from the source is combined with existing data on the target. | Teams
-***conflicts.csv* ファイルを見直し、[`ghe-migrator audit`](/enterprise/admin/guides/migrations/reviewing-migration-data) を使って適切なアクションがとられることを確認するよう強くお勧めします。**問題がないようであれば、「[Enterprise へのデータの移行](/enterprise/admin/guides/migrations/applying-the-imported-data-on-github-enterprise-server)」に進むことができます。
+**We strongly suggest you review the *conflicts.csv* file and use [`ghe-migrator audit`](/enterprise/admin/guides/migrations/reviewing-migration-data) to ensure that the proper actions are being taken.** If everything looks good, you can continue to "[Migrating data to your enterprise](/enterprise/admin/guides/migrations/applying-the-imported-data-on-github-enterprise-server)".
-## 移行コンフリクトの解決もしくはカスタムマッピングのセットアップ
+## Resolving migration conflicts or setting up custom mappings
-`ghe-migrator`が正しくない変更を行うと考えられるときは、*conflicts.csv*内でデータを変更することによって修正をかけられます。 *conflicts.csv*内の任意の行を変更できます。
+If you believe that `ghe-migrator` will perform an incorrect change, you can make corrections by changing the data in *conflicts.csv*. You can make changes to any of the rows in *conflicts.csv*.
-たとえばソースの`octocat`ユーザがターゲットの`octocat`にマップされていることに気づいたとしましょう。
+For example, let's say you notice that the `octocat` user from the source is being mapped to `octocat` on the target:
-| `model_name` | `source_url` | `target_url` | `recommended_action` |
-| ------------ | ----------------------------------- | ----------------------------------- | -------------------- |
-| `ユーザ` | `https://example-gh.source/octocat` | `https://example-gh.target/octocat` | `map` |
+| `model_name` | `source_url` | `target_url` | `recommended_action` |
+|--------------|--------------|------------|--------------------|
+| `user` | `https://example-gh.source/octocat` | `https://example-gh.target/octocat` | `map`
-このユーザをターゲット上の他のユーザにマップさせることができます。 `octocat`が実際にはターゲットの`monalisa`だということを知っているとしましょう。 *conflicts.csv*の `target_url`を`monalisa`を指すように変更できます。
+You can choose to map the user to a different user on the target. Suppose you know that `octocat` should actually be `monalisa` on the target. You can change the `target_url` column in *conflicts.csv* to refer to `monalisa`:
-| `model_name` | `source_url` | `target_url` | `recommended_action` |
-| ------------ | ----------------------------------- | ------------------------------------ | -------------------- |
-| `ユーザ` | `https://example-gh.source/octocat` | `https://example-gh.target/monalisa` | `map` |
+| `model_name` | `source_url` | `target_url` | `recommended_action` |
+|--------------|--------------|------------|--------------------|
+| `user` | `https://example-gh.source/octocat` | `https://example-gh.target/monalisa` | `map`
-もう1つの例として、もしも`octo-org/widgets`リポジトリをターゲットインスタンス上では`octo-org/amazing-widgets`に名前を変えたいとすれば、`target_url`を`octo-org/amazing-widgets`に、`recommend_action`を`rename`に変更してください。
+As another example, if you want to rename the `octo-org/widgets` repository to `octo-org/amazing-widgets` on the target instance, change the `target_url` to `octo-org/amazing-widgets` and the `recommend_action` to `rename`:
-| `model_name` | `source_url` | `target_url` | `recommended_action` |
-| ------------ | -------------------------------------------- | ---------------------------------------------------- | -------------------- |
-| `リポジトリ` | `https://example-gh.source/octo-org/widgets` | `https://example-gh.target/octo-org/amazing-widgets` | `rename` |
+| `model_name` | `source_url` | `target_url` | `recommended_action` |
+|--------------|--------------|------------|--------------------|
+| `repository` | `https://example-gh.source/octo-org/widgets` | `https://example-gh.target/octo-org/amazing-widgets` | `rename` |
-### カスタムマッピングの追加
+### Adding custom mappings
-移行における一般的なシナリオは、移行されたユーザがターゲット上ではソース上とは異なるユーザ名を持つことです。
+A common scenario during a migration is for migrated users to have different usernames on the target than they have on the source.
-ソースのユーザ名のリストとターゲットのユーザー名のリストがあれば、カスタムマッピングのCSVファイルを構築し、各ユーザのユーザ名とコンテンツが移行の終了時点で正しく割り当てられているようにそのファイルを適用できます。
+Given a list of usernames from the source and a list of usernames on the target, you can build a CSV file with custom mappings and then apply it to ensure each user's username and content is correctly attributed to them at the end of a migration.
-[`ghe-migrator audit`](/enterprise/admin/guides/migrations/reviewing-migration-data)を使えば、カスタムマッピングを適用するのに必要なCSV形式で、移行されるユーザのCSVを素早く生成できます。
+You can quickly generate a CSV of users being migrated in the CSV format needed to apply custom mappings by using the [`ghe-migrator audit`](/enterprise/admin/guides/migrations/reviewing-migration-data) command:
```shell
$ ghe-migrator audit -m user -g MIGRATION_GUID > users.csv
```
-これで、このCSVを編集してマップあるいは名前を変更したい各ユーザに新しいURLを入力し、4番目の列を`map`あるいは`rename`を適切に更新できます。
+Now, you can edit that CSV and enter the new URL for each user you would like to map or rename, and then update the fourth column to have `map` or `rename` as appropriate.
-たとえばユーザ`octocat`の名前をターゲット`https://example-gh.target`上で`monalisa`に変更したいのであれば、以下の内容の行を作成します。
+For example, to rename the user `octocat` to `monalisa` on the target `https://example-gh.target` you would create a row with the following content:
-| `model_name` | `source_url` | `target_url` | `state` |
-| ------------ | ----------------------------------- | ------------------------------------ | -------- |
-| `ユーザ` | `https://example-gh.source/octocat` | `https://example-gh.target/monalisa` | `rename` |
+| `model_name` | `source_url` | `target_url` | `state` |
+|--------------|--------------|------------|--------------------|
+| `user` | `https://example-gh.source/octocat` | `https://example-gh.target/monalisa` | `rename`
-同じプロセスは、カスタムマッピングをサポートする各レコードのマッピングを作成するために使うことができます。 詳しい情報については[レコードに可能なマッピング上のテーブル](/enterprise/admin/guides/migrations/reviewing-migration-conflicts#possible-mappings-for-each-record-type)を参照してください。
+The same process can be used to create mappings for each record that supports custom mappings. For more information, see [our table on the possible mappings for records](/enterprise/admin/guides/migrations/reviewing-migration-conflicts#possible-mappings-for-each-record-type).
-### 修正された移行データの適用
+### Applying modified migration data
-1. 変更を加えた後、修正された *conflicts.csv* (または適切な形式のその他のマッピング *.csv*) を [`scp`](https://linuxacademy.com/blog/linux/ssh-and-scp-howto-tips-tricks#scp) コマンドを使ってターゲットインスタンスに適用します。
+1. After making changes, use the [`scp`](https://linuxacademy.com/blog/linux/ssh-and-scp-howto-tips-tricks#scp) command to apply your modified *conflicts.csv* (or any other mapping *.csv* file in the correct format) to the target instance:
```shell
$ scp -P 122 ~/Desktop/conflicts.csv admin@hostname:/home/admin/
```
-2. 修正された *.csv* ファイルへのパスと移行 GUID を渡して、`ghe-migrator map` を使い、移行データを再マップします。
+2. Re-map the migration data using the `ghe-migrator map` command, passing in the path to your modified *.csv* file and the Migration GUID:
```shell
$ ghe-migrator map -i conflicts.csv -g MIGRATION_GUID
```
-3. `ghe-migrator map -i conflicts.csv -g MIGRATION_GUID` がまだコンフリクトがあると報告してきた場合、移行のコンフリクト解決のプロセスをもう一度行ってください。
+3. If the `ghe-migrator map -i conflicts.csv -g MIGRATION_GUID` command reports that conflicts still exist, run through the migration conflict resolution process again.
diff --git a/translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/log-forwarding.md b/translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/log-forwarding.md
index 2eada513c4..7f6e8c800e 100644
--- a/translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/log-forwarding.md
+++ b/translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/log-forwarding.md
@@ -1,8 +1,8 @@
---
-title: ログの転送
-intro: '{% data variables.product.product_name %} は `syslog-ng` を使用して、{% ifversion ghes %} システム {% elsif ghae %} Git{% endif %} とアプリケーションログを指定したサーバーに転送します。'
+title: Log forwarding
+intro: '{% data variables.product.product_name %} uses `syslog-ng` to forward {% ifversion ghes %}system{% elsif ghae %}Git{% endif %} and application logs to the server you specify.'
redirect_from:
- - /enterprise/admin/articles/log-forwarding/
+ - /enterprise/admin/articles/log-forwarding
- /enterprise/admin/installation/log-forwarding
- /enterprise/admin/enterprise-management/log-forwarding
- /admin/enterprise-management/log-forwarding
@@ -20,33 +20,40 @@ topics:
## About log forwarding
-syslog-style 式のログストリームに対応するログ回収システムは、サポートしています。（例えば、[Logstash](http://logstash.net/) や [Splunk](http://docs.splunk.com/Documentation/Splunk/latest/Data/Monitornetworkports)など）
+Any log collection system that supports syslog-style log streams is supported (e.g., [Logstash](http://logstash.net/) and [Splunk](http://docs.splunk.com/Documentation/Splunk/latest/Data/Monitornetworkports)).
When you enable log forwarding, you must upload a CA certificate to encrypt communications between syslog endpoints. Your appliance and the remote syslog server will perform two-way SSL, each providing a certificate to the other and validating the certificate which is received.
-## ログの転送を有効化
+## Enabling log forwarding
{% ifversion ghes %}
-1. {% data variables.enterprise.management_console %}の設定ページの左サイドバーで**Monitoring**をクリックする。
-1. **Enable log forwarding** を選択する。
-1. [**Server address**] フィールドに、ログの転送先となるサーバーのアドレスを入力します。 コンマ区切りリストで複数のアドレスを指定できます。
-1. [Protocol] ドロップダウンメニューで、ログサーバーとの通信に使用するプロトコルを選択します。 そのプロトコルは指定されたすべてのログ送信先に適用されます。
-1. Optionally, select **Enable TLS**. We recommend enabling TLS according to your local security policies, especially if there are untrusted networks between the appliance and any remote log servers.
-1. To encrypt communication between syslog endpoints, click **Choose File** and choose a CA certificate for the remote syslog server. You should upload a CA bundle containing a concatenation of the certificates of the CAs involved in signing the certificate of the remote log server. 一連の証明書の全体が確認され、ルート証明書で終了しなければなりません。 詳しくは、[syslog-ng のドキュメントのTLSオプション](https://support.oneidentity.com/technical-documents/syslog-ng-open-source-edition/3.16/administration-guide/56#TOPIC-956599)を参照してください。
+1. On the {% data variables.enterprise.management_console %} settings page, in the left sidebar, click **Monitoring**.
+1. Select **Enable log forwarding**.
+1. In the **Server address** field, type the address of the server to which you want to forward logs. You can specify multiple addresses in a comma-separated list.
+1. In the Protocol drop-down menu, select the protocol to use to communicate with the log server. The protocol will apply to all specified log destinations.
+1. Optionally, select **Enable TLS**. We recommend enabling TLS according to your local security policies, especially if there are untrusted networks between the appliance and any remote log servers.
+1. To encrypt communication between syslog endpoints, click **Choose File** and choose a CA certificate for the remote syslog server. You should upload a CA bundle containing a concatenation of the certificates of the CAs involved in signing the certificate of the remote log server. The entire certificate chain will be validated, and must terminate in a root certificate. For more information, see [TLS options in the syslog-ng documentation](https://support.oneidentity.com/technical-documents/syslog-ng-open-source-edition/3.16/administration-guide/56#TOPIC-956599).
{% elsif ghae %}
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
-1. {% octicon "gear" aria-label="The Settings gear" %} [**Settings**] の下で、[**Log forwarding**] をクリックします。 ![[Log forwarding] タブ](/assets/images/enterprise/business-accounts/log-forwarding-tab.png)
-1. [Log forwarding] の下で、[**Enable log forwarding**] を選択します。 
-1. [Server address] の下に、ログを転送するサーバーのアドレスを入力します。 ![[Server address] フィールド](/assets/images/enterprise/business-accounts/server-address-field.png)
-1. [Protocol] ドロップダウンメニューを使用して、プロトコルを選択します。 ![[Protocol] ドロップダウンメニュー](/assets/images/enterprise/business-accounts/protocol-drop-down-menu.png)
-1. 必要に応じて、syslog エンドポイント間の TLS 暗号化通信を有効にするには、[**Enable TLS**] を選択します。 
-1. [Public certificate] の下に、x509 証明書を貼り付けます。 
-1. [**Save**] をクリックします。 ![ログ転送用の [Save] ボタン](/assets/images/enterprise/business-accounts/save-button-log-forwarding.png)
+1. Under {% octicon "gear" aria-label="The Settings gear" %} **Settings**, click **Log forwarding**.
+ 
+1. Under "Log forwarding", select **Enable log forwarding**.
+ 
+1. Under "Server address", enter the address of the server you want to forward logs to.
+ 
+1. Use the "Protocol" drop-down menu, and select a protocol.
+ 
+1. Optionally, to enable TLS encrypted communication between syslog endpoints, select **Enable TLS**.
+ 
+1. Under "Public certificate", paste your x509 certificate.
+ 
+1. Click **Save**.
+ 
{% endif %}
{% ifversion ghes %}
-## トラブルシューティング
+## Troubleshooting
-ログ転送で問題が発生した場合、 `http(s)://[hostname]/setup/diagnostics` のアウトプットファイルをメールに添付し、{% data variables.contact.contact_ent_support %}に連絡してください。
+If you run into issues with log forwarding, contact {% data variables.contact.contact_ent_support %} and attach the output file from `http(s)://[hostname]/setup/diagnostics` to your email.
{% endif %}
diff --git a/translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/managing-global-webhooks.md b/translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/managing-global-webhooks.md
index aeba3f8641..589354bd37 100644
--- a/translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/managing-global-webhooks.md
+++ b/translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/managing-global-webhooks.md
@@ -1,5 +1,5 @@
---
-title: グローバルwebhookの管理
+title: Managing global webhooks
shortTitle: Manage global webhooks
intro: You can configure global webhooks to notify external web servers when events occur within your enterprise.
permissions: Enterprise owners can manage global webhooks for an enterprise account.
@@ -9,7 +9,7 @@ redirect_from:
- /admin/user-management/managing-global-webhooks
- /admin/user-management/managing-users-in-your-enterprise/managing-global-webhooks
- /github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account/configuring-webhooks-for-organization-events-in-your-enterprise-account
- - /articles/configuring-webhooks-for-organization-events-in-your-business-account/
+ - /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
- /github/setting-up-and-managing-your-enterprise/configuring-webhooks-for-organization-events-in-your-enterprise-account
@@ -23,65 +23,77 @@ topics:
- Webhooks
---
-## グローバルwebhookについて
+## About global webhooks
-You can use global webhooks to notify an external web server when events occur within your enterprise. You can configure the server to receive the webhook's payload, then run an application or code that monitors, responds to, or enforces rules for user and organization management for your enterprise. 詳しい情報については、「[webhook](/developers/webhooks-and-events/webhooks)」を参照してください。
+You can use global webhooks to notify an external web server when events occur within your enterprise. You can configure the server to receive the webhook's payload, then run an application or code that monitors, responds to, or enforces rules for user and organization management for your enterprise. For more information, see "[Webhooks](/developers/webhooks-and-events/webhooks)."
For example, you can configure {% data variables.product.product_location %} to send a webhook when someone creates, deletes, or modifies a repository or organization within your enterprise. You can configure the server to automatically perform a task after receiving the webhook.
-
+
{% data reusables.enterprise_user_management.manage-global-webhooks-api %}
-## グローバルwebhookの追加
+## Adding a global webhook
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
{% data reusables.enterprise-accounts.hooks-tab %}
-5. **Add webhook（webhookの追加）**をクリックしてください。 
-6. ペイロードの受信に使用する URL を入力します。 
-7. **Content type（コンテントタイプ）**ドロップダウンメニューを使ってペイロードの形式をクリックすることもできます。 
-8. **Secret（秘密）**フィールドに、`secret`キーとして使う文字列を入力することもできます。 
-9. Optionally, if your payload URL is HTTPS and you would not like {% data variables.product.prodname_ghe_server %} to verify SSL certificates when delivering payloads, select **Disable SSL verification**. SSLの検証に関する情報を読んで、 **I understand my webhooks may not be secure（webhookがセキュアではないかもしれないことを理解しました）**をクリックしてください。 
+5. Click **Add webhook**.
+ 
+6. Type the URL where you'd like to receive payloads.
+ 
+7. Optionally, use the **Content type** drop-down menu, and click a payload format.
+ 
+8. Optionally, in the **Secret** field, type a string to use as a `secret` key.
+ 
+9. Optionally, if your payload URL is HTTPS and you would not like {% data variables.product.prodname_ghe_server %} to verify SSL certificates when delivering payloads, select **Disable SSL verification**. Read the information about SSL verification, then click **I understand my webhooks may not be secure**.
+ 
{% warning %}
- **警告:** SSL 検証は、フックのペイロードがセキュアにデリバリされることを保証するのに役立ちます。 SSL 検証を無効化することはおすすめしません。
+ **Warning:** SSL verification helps ensure that hook payloads are delivered securely. We do not recommend disabling SSL verification.
{% endwarning %}
-10. Decide if you'd like this webhook to trigger for every event or for selected events. 
- - すべてのイベントの場合は [**Send me everything**] を選択します。
- - 特定のイベントを選択するには [**Let me select individual events**] を選択します。
+10. Decide if you'd like this webhook to trigger for every event or for selected events.
+ 
+ - For every event, select **Send me everything**.
+ - To choose specific events, select **Let me select individual events**.
11. If you chose to select individual events, select the events that will trigger the webhook.
{% ifversion ghec %}
{% elsif ghes or ghae %}
{% endif %}
-12. Confirm that the **Active** checkbox is selected. 
-13. **Add webhook（webhookの追加）**をクリックしてください。
+12. Confirm that the **Active** checkbox is selected.
+ 
+13. Click **Add webhook**.
-## グローバルwebhookの編集
+## Editing a global webhook
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
{% data reusables.enterprise-accounts.hooks-tab %}
-5. 編集したいwebhookの隣の**Edit（編集）**をクリックしてください。 
-6. webhookの設定の更新。
-7. **Update webhook（webhookの更新）**をクリックしてください。
+5. Next to the webhook you'd like to edit, click **Edit**.
+ 
+6. Update the webhook's settings.
+7. Click **Update webhook**.
-## グローバルwebhookの削除
+## Deleting a global webhook
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
{% data reusables.enterprise-accounts.hooks-tab %}
-5. 削除したいwebhookの隣の**Delete（削除）**をクリックしてください。 
-6. webhookの削除に関する情報を読んで、**Yes, delete webhook（はい、webhookを削除します）**をクリックしてください。 
+5. Next to the webhook you'd like to delete, click **Delete**.
+ 
+6. Read the information about deleting a webhook, then click **Yes, delete webhook**.
+ 
-## 最近のデリバリとレスポンスの表示
+## Viewing recent deliveries and responses
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.settings-tab %}
{% data reusables.enterprise-accounts.hooks-tab %}
-5. webhook のリストで、デリバリを見たい webhook をクリックします。 
-6. [Recent deliveries（最近のデリバリ）] の下で、詳細を表示したいデリバリをクリックしてください。 
+5. In the list of webhooks, click the webhook for which you'd like to see deliveries.
+ 
+6. Under "Recent deliveries", click a delivery to view details.
+ 
diff --git a/translations/ja-JP/content/billing/managing-billing-for-git-large-file-storage/index.md b/translations/ja-JP/content/billing/managing-billing-for-git-large-file-storage/index.md
index f611526e6f..1705e89890 100644
--- a/translations/ja-JP/content/billing/managing-billing-for-git-large-file-storage/index.md
+++ b/translations/ja-JP/content/billing/managing-billing-for-git-large-file-storage/index.md
@@ -1,12 +1,12 @@
---
-title: Git Large File Storage の支払いを管理する
+title: Managing billing for Git Large File Storage
shortTitle: Git Large File Storage
-intro: '{% data variables.large_files.product_name_long %} の使用状況を確認したり、アップグレードまたはダウンロードしたりすることができます。'
+intro: 'You can view usage for, upgrade, and downgrade {% data variables.large_files.product_name_long %}.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage
- - /articles/managing-large-file-storage-and-bandwidth-for-your-personal-account/
- - /articles/managing-large-file-storage-and-bandwidth-for-your-organization/
- - /articles/managing-storage-and-bandwidth-usage/
+ - /articles/managing-large-file-storage-and-bandwidth-for-your-personal-account
+ - /articles/managing-large-file-storage-and-bandwidth-for-your-organization
+ - /articles/managing-storage-and-bandwidth-usage
- /articles/managing-billing-for-git-large-file-storage
versions:
fpt: '*'
diff --git a/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md b/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md
index f7be1e6215..6d6d6bba9d 100644
--- a/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md
+++ b/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md
@@ -1,10 +1,10 @@
---
-title: GitHub Marketplace アプリケーションのキャンセル
-intro: '{% data variables.product.prodname_marketplace %}のアプリケーションは、いつでもアカウントからキャンセルおよび削除できます。'
+title: Canceling a GitHub Marketplace app
+intro: 'You can cancel and remove a {% data variables.product.prodname_marketplace %} app from your account at any time.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/canceling-a-github-marketplace-app
- - /articles/canceling-an-app-for-your-personal-account/
- - /articles/canceling-an-app-for-your-organization/
+ - /articles/canceling-an-app-for-your-personal-account
+ - /articles/canceling-an-app-for-your-organization
- /articles/canceling-a-github-marketplace-app
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app
versions:
@@ -17,30 +17,29 @@ topics:
- Organizations
- Trials
- User account
-shortTitle: Marketplaceアプリケーションのキャンセル
+shortTitle: Cancel a Marketplace app
---
+When you cancel an app, your subscription remains active until the end of your current billing cycle. The cancellation takes effect on your next billing date. For more information, see "[About billing for {% data variables.product.prodname_marketplace %}](/articles/about-billing-for-github-marketplace)."
-アプリケーションをキャンセルすると、そのプランは現在の支払いサイクルが終わるまで有効のままとなり、 次の支払いサイクルで無効となります。 詳しい情報については、[{% data variables.product.prodname_marketplace %}の支払いについて](/articles/about-billing-for-github-marketplace)を参照してください。
-
-有料プランの無料トライアルをキャンセルすると、そのプランはすぐにキャンセルされ、キャンセルしたアプリケーションにアクセスできなくなります。 無料トライアル期間中にキャンセルしない場合、アカウントで設定された支払い方法で、トライアル期間の終了時にプランに対して課金されます。 詳しい情報については、[{% data variables.product.prodname_marketplace %}の支払いについて](/articles/about-billing-for-github-marketplace)を参照してください。
+When you cancel a free trial on a paid plan, your subscription is immediately canceled and you will lose access to the app. If you don't cancel your free trial within the trial period, the payment method on file for your account will be charged for the plan you chose at the end of the trial period. For more information, see "[About billing for {% data variables.product.prodname_marketplace %}](/articles/about-billing-for-github-marketplace)."
{% data reusables.marketplace.downgrade-marketplace-only %}
-## 個人アカウントのアプリケーションをキャンセルする
+## Canceling an app for your personal account
{% data reusables.user_settings.access_settings %}
{% data reusables.user_settings.billing_plans %}
{% data reusables.marketplace.cancel-app-billing-settings %}
{% data reusables.marketplace.cancel-app %}
-## 個人アカウントのアプリケーション無料トライアルをキャンセルする
+## Canceling a free trial for an app for your personal account
{% data reusables.user_settings.access_settings %}
{% data reusables.user_settings.billing_plans %}
{% data reusables.marketplace.cancel-free-trial-billing-settings %}
{% data reusables.marketplace.cancel-app %}
-## Organization の無料トライアルをキャンセルする
+## Canceling an app for your organization
{% data reusables.marketplace.marketplace-org-perms %}
@@ -51,7 +50,7 @@ shortTitle: Marketplaceアプリケーションのキャンセル
{% data reusables.marketplace.cancel-app-billing-settings %}
{% data reusables.marketplace.cancel-app %}
-## Organization のアプリケーション無料トライアルをキャンセルする
+## Canceling a free trial for an app for your organization
{% data reusables.marketplace.marketplace-org-perms %}
diff --git a/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md b/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md
index 48a008006b..8a8f94379f 100644
--- a/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md
+++ b/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md
@@ -1,10 +1,10 @@
---
-title: GitHub Marketplace アプリケーションの支払いプランをダウングレード
-intro: '別の支払いプランを使用したい場合は、{% data variables.product.prodname_marketplace %} アプリケーションをいつでもダウングレードできます。'
+title: Downgrading the billing plan for a GitHub Marketplace app
+intro: 'If you''d like to use a different billing plan, you can downgrade your {% data variables.product.prodname_marketplace %} app at any time.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-the-billing-plan-for-a-github-marketplace-app
- - /articles/downgrading-an-app-for-your-personal-account/
- - /articles/downgrading-an-app-for-your-organization/
+ - /articles/downgrading-an-app-for-your-personal-account
+ - /articles/downgrading-an-app-for-your-organization
- /articles/downgrading-the-billing-plan-for-a-github-marketplace-app
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app
versions:
@@ -16,14 +16,13 @@ topics:
- Marketplace
- Organizations
- User account
-shortTitle: 支払いプランのダウングレード
+shortTitle: Downgrade billing plan
---
-
-アプリケーションをダウングレードしても、現在の支払いサイクルが終了するまでプランは有効のままです。 ダウングレードは次回の支払い日に有効となります。 詳しい情報については、[{% data variables.product.prodname_marketplace %}の支払いについて](/articles/about-billing-for-github-marketplace)を参照してください。
+When you downgrade an app, your subscription remains active until the end of your current billing cycle. The downgrade takes effect on your next billing date. For more information, see "[About billing for {% data variables.product.prodname_marketplace %}](/articles/about-billing-for-github-marketplace)."
{% data reusables.marketplace.downgrade-marketplace-only %}
-## 個人アカウントのアプリケーションをダウングレードする
+## Downgrading an app for your personal account
{% data reusables.user_settings.access_settings %}
{% data reusables.user_settings.billing_plans %}
@@ -32,7 +31,7 @@ shortTitle: 支払いプランのダウングレード
{% data reusables.marketplace.choose-new-quantity %}
{% data reusables.marketplace.issue-plan-changes %}
-## Organization のアプリケーションをダウングレードする
+## Downgrading an app for your organization
{% data reusables.marketplace.marketplace-org-perms %}
@@ -44,6 +43,6 @@ shortTitle: 支払いプランのダウングレード
{% data reusables.marketplace.choose-new-quantity %}
{% data reusables.marketplace.issue-plan-changes %}
-## 参考リンク
+## Further reading
-- "[{% data variables.product.prodname_marketplace %}アプリケーションをキャンセルする](/articles/canceling-a-github-marketplace-app/)"
+- "[Canceling a {% data variables.product.prodname_marketplace %} app](/articles/canceling-a-github-marketplace-app/)"
diff --git a/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/index.md b/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/index.md
index 7b8ea273dc..3b0caf19f6 100644
--- a/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/index.md
+++ b/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/index.md
@@ -1,11 +1,11 @@
---
-title: GitHub Marketplace アプリの支払いを管理する
-shortTitle: GitHub Marketplaceアプリケーション
-intro: '{% data variables.product.prodname_marketplace %} アプリのアップグレード、ダウングレード、キャンセルはいつでもできます。'
+title: Managing billing for GitHub Marketplace apps
+shortTitle: GitHub Marketplace apps
+intro: 'You can upgrade, downgrade, or cancel {% data variables.product.prodname_marketplace %} apps at any time.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps
- - /articles/managing-your-personal-account-s-apps/
- - /articles/managing-your-organization-s-apps/
+ - /articles/managing-your-personal-account-s-apps
+ - /articles/managing-your-organization-s-apps
- /articles/managing-billing-for-github-marketplace-apps
versions:
fpt: '*'
diff --git a/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md b/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md
index baef8bbe30..d381202232 100644
--- a/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md
+++ b/translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md
@@ -1,10 +1,10 @@
---
-title: GitHub Marketplace アプリケーションの支払いプランをアップグレードする
-intro: '{% data variables.product.prodname_marketplace %} アプリケーションを別のプランにいつでもアップグレードすることができます。'
+title: Upgrading the billing plan for a GitHub Marketplace app
+intro: 'You can upgrade your {% data variables.product.prodname_marketplace %} app to a different plan at any time.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-the-billing-plan-for-a-github-marketplace-app
- - /articles/upgrading-an-app-for-your-personal-account/
- - /articles/upgrading-an-app-for-your-organization/
+ - /articles/upgrading-an-app-for-your-personal-account
+ - /articles/upgrading-an-app-for-your-organization
- /articles/upgrading-the-billing-plan-for-a-github-marketplace-app
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app
versions:
@@ -16,12 +16,11 @@ topics:
- Organizations
- Upgrades
- User account
-shortTitle: 支払いプランのアップグレード
+shortTitle: Upgrade billing plan
---
+When you upgrade an app, your payment method is charged a prorated amount based on the time remaining until your next billing date. For more information, see "[About billing for {% data variables.product.prodname_marketplace %}](/articles/about-billing-for-github-marketplace)."
-アプリケーションをアップグレードすると、支払い方法により、次の請求日までの残り時間に基づいて比例配分額を請求されます。 詳しい情報については、[{% data variables.product.prodname_marketplace %}の支払いについて](/articles/about-billing-for-github-marketplace)を参照してください。
-
-## 個人アカウントのアプリケーションをアップグレードする
+## Upgrading an app for your personal account
{% data reusables.user_settings.access_settings %}
{% data reusables.user_settings.billing_plans %}
@@ -30,7 +29,7 @@ shortTitle: 支払いプランのアップグレード
{% data reusables.marketplace.choose-new-quantity %}
{% data reusables.marketplace.issue-plan-changes %}
-## Organization のアプリケーションをアップグレードする
+## Upgrading an app for your organization
{% data reusables.marketplace.marketplace-org-perms %}
diff --git a/translations/ja-JP/content/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts.md b/translations/ja-JP/content/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts.md
index e06218f0e9..30be96c9c4 100644
--- a/translations/ja-JP/content/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts.md
+++ b/translations/ja-JP/content/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts.md
@@ -1,14 +1,14 @@
---
-title: GitHub アカウントの支払いについて
-intro: '{% data variables.product.company_short %} は、すべての開発者あるいは Team に対して無償版と有償版の製品が用意されています。'
+title: About billing for GitHub accounts
+intro: '{% data variables.product.company_short %} offers free and paid products for every developer or team.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-accounts
- - /articles/what-is-the-total-cost-of-using-an-organization-account/
- - /articles/what-are-the-costs-of-using-an-organization-account/
- - /articles/what-plan-should-i-choose/
- - /articles/do-you-have-custom-plans/
- - /articles/user-account-billing-plans/
- - /articles/organization-billing-plans/
+ - /articles/what-is-the-total-cost-of-using-an-organization-account
+ - /articles/what-are-the-costs-of-using-an-organization-account
+ - /articles/what-plan-should-i-choose
+ - /articles/do-you-have-custom-plans
+ - /articles/user-account-billing-plans
+ - /articles/organization-billing-plans
- /articles/github-s-billing-plans
- /articles/about-billing-for-github-accounts
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/about-billing-for-github-accounts
@@ -21,20 +21,22 @@ topics:
- Discounts
- Fundamentals
- Upgrades
-shortTitle: 支払いについて
+shortTitle: About billing
---
-アカウントで利用できる製品に関する詳しい情報については「[{% data variables.product.prodname_dotcom %}の製品](/articles/github-s-products)」を参照してください。 各製品の料金と機能の全リストは <{% data variables.product.pricing_url %}> に掲載されています。 {% data variables.product.product_name %} はカスタムの製品やプランは提供しません。
+For more information about the products available for your account, see "[{% data variables.product.prodname_dotcom %}'s products](/articles/github-s-products)." You can see pricing and a full list of features for each product at <{% data variables.product.pricing_url %}>. {% data variables.product.product_name %} does not offer custom products or subscriptions.
-支払いは月単位あるいは年単位を選択でき、プランのアップグレードやダウングレードはいつでもできます。 詳細は「[ {% data variables.product.prodname_dotcom %} の支払いを管理する](/articles/managing-billing-for-your-github-account)」を参照してください。
+You can choose monthly or yearly billing, and you can upgrade or downgrade your subscription at any time. For more information, see "[Managing billing for your {% data variables.product.prodname_dotcom %} account](/articles/managing-billing-for-your-github-account)."
-既存の {% data variables.product.product_name %} の支払い情報で追加の機能や製品をご購入いただくことができます。 詳細は「[ {% data variables.product.prodname_dotcom %} の支払いについて](/articles/about-billing-on-github)」を参照してください。
+You can purchase other features and products with your existing {% data variables.product.product_name %} payment information. For more information, see "[About billing on {% data variables.product.prodname_dotcom %}](/articles/about-billing-on-github)."
+
+{% data reusables.accounts.accounts-billed-separately %}
{% data reusables.user_settings.context_switcher %}
{% tip %}
-**ヒント:** {% data variables.product.prodname_dotcom %} では、アカデミック割引をご利用いただける確認済みの生徒およびアカデミック機関向けのプログラムをご用意しています。 詳しい情報については [{% data variables.product.prodname_education %}](https://education.github.com/) にアクセスして下さい。
+**Tip:** {% data variables.product.prodname_dotcom %} has programs for verified students and academic faculty, which include academic discounts. For more information, visit [{% data variables.product.prodname_education %}](https://education.github.com/).
{% endtip %}
diff --git a/translations/ja-JP/content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md b/translations/ja-JP/content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md
index 0396eec2d5..6209f8ad3b 100644
--- a/translations/ja-JP/content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md
+++ b/translations/ja-JP/content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md
@@ -1,11 +1,11 @@
---
-title: GitHub アカウントの割引プラン
-intro: '{% data variables.product.product_name %}は、学生、教師、教育機関、非営利団体、図書館などに割引を提供しています。'
+title: Discounted subscriptions for GitHub accounts
+intro: '{% data variables.product.product_name %} provides discounts to students, educators, educational institutions, nonprofits, and libraries.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/discounted-subscriptions-for-github-accounts
- - /articles/discounted-personal-accounts/
- - /articles/discounted-organization-accounts/
- - /articles/discounted-billing-plans/
+ - /articles/discounted-personal-accounts
+ - /articles/discounted-organization-accounts
+ - /articles/discounted-billing-plans
- /articles/discounted-subscriptions-for-github-accounts
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts
versions:
@@ -18,29 +18,28 @@ topics:
- Discounts
- Nonprofits
- User account
-shortTitle: 割引されたサブスクリプション
+shortTitle: Discounted subscriptions
---
-
{% tip %}
-**参考**: {% data variables.product.prodname_dotcom %}の割引は他の有料製品や有料機能のプランには適用されません。
+**Tip**: Discounts for {% data variables.product.prodname_dotcom %} do not apply to subscriptions for other paid products and features.
{% endtip %}
-## 個人アカウントへの割引
+## Discounts for personal accounts
-{% data variables.product.prodname_free_user %} で学生と教員が無制限のパブリックリポジトリとプライベートリポジトリを使用できることに加えて、検証済みの学生は {% data variables.product.prodname_student_pack %} に申請し、{% data variables.product.prodname_dotcom %} パートナーからのさらなるメリットを受けていただけます。 詳しい情報については、「[学生向け開発者パックに応募する](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack)」を参照してください。
+In addition to the unlimited public and private repositories for students and faculty with {% data variables.product.prodname_free_user %}, verified students can apply for the {% data variables.product.prodname_student_pack %} to receive additional benefits from {% data variables.product.prodname_dotcom %} partners. For more information, see "[Apply for a student developer pack](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack)."
-## 学校・大学向け割引
+## Discounts for schools and universities
-検証済みの教職員は教育や学術研究の目的で {% data variables.product.prodname_team %} に申し込むことができます。 詳しい情報については、「[教室や研究で {% data variables.product.prodname_dotcom %} を使う](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research)」を参照してください。 また、学生のために教材をお求めいただくこともできます。 詳しい情報については [{% data variables.product.prodname_education %}](https://education.github.com/) にアクセスして下さい。
+Verified academic faculty can apply for {% data variables.product.prodname_team %} for teaching or academic research. For more information, see "[Use {% data variables.product.prodname_dotcom %} in your classroom and research](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research)." You can also request educational materials goodies for your students. For more information, visit [{% data variables.product.prodname_education %}](https://education.github.com/).
-## 非営利目的や図書館への割引
+## Discounts for nonprofits and libraries
-{% data variables.product.product_name %} は、無制限のプライベートリポジトリ、無制限のコラボレータ、無制限の機能付きの Organization 向け {% data variables.product.prodname_team %} を、501(c)3 (または同等) の資格を持つ Organization および図書館に無料で提供しています。 自分の Organization への割引を[非営利目的ページ](https://github.com/nonprofit)でリクエストできます。
+{% data variables.product.product_name %} provides free {% data variables.product.prodname_team %} for organizations with unlimited private repositories, unlimited collaborators, and a full feature set to qualifying 501(c)3 (or equivalent) organizations and libraries. You can request a discount for your organization on [our nonprofit page](https://github.com/nonprofit).
-すでに有料プランに契約されている Organization の場合、非営利目的の割引が適用され次第、Organization の最後の取引が返金されます。
+If your organization already has a paid subscription, your organization's last transaction will be refunded once your nonprofit discount has been applied.
-## 参考リンク
+## Further reading
-- "[{% data variables.product.prodname_dotcom %} の支払いについて](/articles/about-billing-on-github)"
+- "[About billing on {% data variables.product.prodname_dotcom %}](/articles/about-billing-on-github)"
diff --git a/translations/ja-JP/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md b/translations/ja-JP/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md
index d907d6d2cd..cdaa744340 100644
--- a/translations/ja-JP/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md
+++ b/translations/ja-JP/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md
@@ -1,20 +1,20 @@
---
-title: GitHub プランをダウングレードする
+title: Downgrading your GitHub subscription
intro: 'You can downgrade the subscription for any type of account on {% data variables.product.product_location %} at any time.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-your-github-subscription
- - /articles/downgrading-your-personal-account-s-billing-plan/
- - /articles/how-do-i-cancel-my-account/
- - /articles/downgrading-a-user-account-to-free/
- - /articles/removing-paid-seats-from-your-organization/
- - /articles/downgrading-your-organization-s-paid-seats/
- - /articles/downgrading-your-organization-s-billing-plan/
- - /articles/downgrading-an-organization-with-per-seat-pricing-to-free/
- - /articles/downgrading-an-organization-with-per-repository-pricing-to-free/
- - /articles/downgrading-your-organization-to-free/
- - /articles/downgrading-your-organization-from-the-business-plan-to-the-team-plan/
- - /articles/downgrading-your-organization-from-github-business-cloud-to-the-team-plan/
- - /articles/downgrading-your-github-billing-plan/
+ - /articles/downgrading-your-personal-account-s-billing-plan
+ - /articles/how-do-i-cancel-my-account
+ - /articles/downgrading-a-user-account-to-free
+ - /articles/removing-paid-seats-from-your-organization
+ - /articles/downgrading-your-organization-s-paid-seats
+ - /articles/downgrading-your-organization-s-billing-plan
+ - /articles/downgrading-an-organization-with-per-seat-pricing-to-free
+ - /articles/downgrading-an-organization-with-per-repository-pricing-to-free
+ - /articles/downgrading-your-organization-to-free
+ - /articles/downgrading-your-organization-from-the-business-plan-to-the-team-plan
+ - /articles/downgrading-your-organization-from-github-business-cloud-to-the-team-plan
+ - /articles/downgrading-your-github-billing-plan
- /articles/downgrading-your-github-subscription
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/downgrading-your-github-subscription
versions:
@@ -26,63 +26,71 @@ topics:
- Organizations
- Repositories
- User account
-shortTitle: サブスクリプションのダウングレード
+shortTitle: Downgrade subscription
---
+## Downgrading your {% data variables.product.product_name %} subscription
-## {% data variables.product.product_name %}プランのダウングレード
+When you downgrade your user account or organization's subscription, pricing and account feature changes take effect on your next billing date. Changes to your paid user account or organization subscription does not affect subscriptions or payments for other paid {% data variables.product.prodname_dotcom %} features. For more information, see "[How does upgrading or downgrading affect the billing process?](/articles/how-does-upgrading-or-downgrading-affect-the-billing-process)."
-ユーザアカウントまたはOrganizationのプランをダウングレードした場合、価格とアカウント機能の変更は次の請求日から有効になります。 有料のユーザアカウントまたはOrganizationのプランを変更しても、他の有料{% data variables.product.prodname_dotcom %} 機能のプランや支払いには影響しません。 詳細は「[アップグレードやダウングレードは支払い処理にどのように影響しますか?](/articles/how-does-upgrading-or-downgrading-affect-the-billing-process)」を参照してください。
+## Downgrading your user account's subscription
-## ユーザアカウントのプランをダウングレードする
-
-ユーザアカウントを{% data variables.product.prodname_pro %}から{% data variables.product.prodname_free_user %}にダウングレードした場合、プライベートリポジトリでの高度なコードレビューツールにはアクセスできなくなります。 {% data reusables.gated-features.more-info %}
+If you downgrade your user account from {% data variables.product.prodname_pro %} to {% data variables.product.prodname_free_user %}, the account will lose access to advanced code review tools on private repositories. {% data reusables.gated-features.more-info %}
{% data reusables.user_settings.access_settings %}
{% data reusables.user_settings.billing_plans %}
-1. "Current plan（現在のプラン）"の下で、**Edit（編集）**ドロップダウンを使い、**Downgrade to Free（Freeへのダウングレード）**をクリックしてください。 
-5. 次回の請求日にユーザアカウントがアクセスできなくなる機能に関する情報を読み、[**I understand. Continue with downgrade**] をクリックします。 ![[Continue with downgrade] ボタン](/assets/images/help/billing/continue-with-downgrade.png)
+1. Under "Current plan", use the **Edit** drop-down and click **Downgrade to Free**.
+ 
+5. Read the information about the features your user account will no longer have access to on your next billing date, then click **I understand. Continue with downgrade**.
+ 
-プライベートリポジトリに {% data variables.product.prodname_pages %} サイトを公開し、カスタムドメインを追加した場合、ドメイン乗っ取りのリスクを回避するため、{% data variables.product.prodname_pro %} から {% data variables.product.prodname_free_user %} にダウングレードする前に DNS レコードを削除または更新します。 詳しい情報については、「[{% data variables.product.prodname_pages %} サイト用のカスタムドメインを管理する](/articles/managing-a-custom-domain-for-your-github-pages-site)」を参照してください。
+If you published a {% data variables.product.prodname_pages %} site in a private repository and added a custom domain, remove or update your DNS records before downgrading from {% data variables.product.prodname_pro %} to {% data variables.product.prodname_free_user %}, to avoid the risk of a domain takeover. For more information, see "[Managing a custom domain for your {% data variables.product.prodname_pages %} site](/articles/managing-a-custom-domain-for-your-github-pages-site)."
-## Organizationのプランをダウングレードする
+## Downgrading your organization's subscription
{% data reusables.dotcom_billing.org-billing-perms %}
-Organizationを{% data variables.product.prodname_team %}から{% data variables.product.prodname_free_team %}にダウングレードした場合、そのアカウントはチームの高度なコラボレーションおよび管理ツールにはアクセスできなくなります。
+If you downgrade your organization from {% data variables.product.prodname_team %} to {% data variables.product.prodname_free_team %} for an organization, the account will lose access to advanced collaboration and management tools for teams.
-Organizationを{% data variables.product.prodname_ghe_cloud %}から{% data variables.product.prodname_team %}または{% data variables.product.prodname_free_team %}にダウングレードした場合、そのアカウントは高度なセキュリティ、コンプライアンス、およびデプロイメントコントロールにアクセスできなくなります。 {% data reusables.gated-features.more-info %}
+If you downgrade your organization from {% data variables.product.prodname_ghe_cloud %} to {% data variables.product.prodname_team %} or {% data variables.product.prodname_free_team %}, the account will lose access to advanced security, compliance, and deployment controls. {% data reusables.gated-features.more-info %}
{% data reusables.organizations.billing-settings %}
-1. "Current plan（現在のプラン）"の下で、[**Edit**] ドロップダウンから必要なダウングレード オプションをクリックします。 ![[Downgrade] ボタン](/assets/images/help/billing/downgrade-option-button.png)
+1. Under "Current plan", use the **Edit** drop-down and click the downgrade option you want.
+ 
{% data reusables.dotcom_billing.confirm_cancel_org_plan %}
-## 従来のリポジトリ単位の支払いを使用しているOrganizationのプランをダウングレードする
+## Downgrading an organization's subscription with legacy per-repository pricing
{% data reusables.dotcom_billing.org-billing-perms %}
-{% data reusables.dotcom_billing.switch-legacy-billing %}詳しい情報については、「[Organization をリポジトリごとからユーザごとに切り替える](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription#switching-your-organization-from-per-repository-to-per-user-pricing)」を参照してください。
+{% data reusables.dotcom_billing.switch-legacy-billing %} For more information, see "[Switching your organization from per-repository to per-user pricing](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription#switching-your-organization-from-per-repository-to-per-user-pricing)."
{% data reusables.organizations.billing-settings %}
-5. [Subscriptions] の下にある [Edit] ドロップダウンメニューから [**Edit plan**] をクリックします。 ![[Edit Plan] ドロップダウン](/assets/images/help/billing/edit-plan-dropdown.png)
-1. [Billing/Plans] で、変更する必要があるプランの横にある [**Downgrade**] をクリックします。 ![[Downgrade] ボタン](/assets/images/help/billing/downgrade-plan-option-button.png)
-1. アカウントをダウングレードする理由を入力し、[**Downgrade plan**] をクリックします。 ![ダウングレードの理由を入力するテキストボックスと [Downgrade] ボタン](/assets/images/help/billing/downgrade-plan-button.png)
+5. Under "Subscriptions", select the "Edit" drop-down, and click **Edit plan**.
+ 
+1. Under "Billing/Plans", next to the plan you want to change, click **Downgrade**.
+ 
+1. Enter the reason you're downgrading your account, then click **Downgrade plan**.
+ 
-## Organization から有料シートを削除する
+## Removing paid seats from your organization
-Organization が使用する有料シート数を減らすには、Organization からメンバーを削除するか、メンバーを外部コラボレーターに変更してアクセス権をパブリックリポジトリに限定する方法があります。 詳しい情報については、以下を参照してください。
-- "[Organization からメンバーを削除する](/articles/removing-a-member-from-your-organization)"
-- [Organizatin のメンバーを外部のコラボレータに変換する](/articles/converting-an-organization-member-to-an-outside-collaborator)
-- [Organizationのリポジトリへの個人のアクセスの管理](/articles/managing-an-individual-s-access-to-an-organization-repository)
+To reduce the number of paid seats your organization uses, you can remove members from your organization or convert members to outside collaborators and give them access to only public repositories. For more information, see:
+- "[Removing a member from your organization](/articles/removing-a-member-from-your-organization)"
+- "[Converting an organization member to an outside collaborator](/articles/converting-an-organization-member-to-an-outside-collaborator)"
+- "[Managing an individual's access to an organization repository](/articles/managing-an-individual-s-access-to-an-organization-repository)"
{% data reusables.organizations.billing-settings %}
-1. "Current plan（現在のプラン）"の下で、**Edit（編集）**ドロップダウンを使い、**Remove seats（シートの削除）**をクリックしてください。 ![[Remove Seats] ドロップダウン](/assets/images/help/billing/remove-seats-dropdown.png)
-1. [Remove seats] の下でダウングレードするシート数を選択します。 ![[Remove Seats] オプション](/assets/images/help/billing/remove-seats-amount.png)
-1. 次回請求日の新しい支払いに関する情報を確認し、[**Remove seats**] をクリックします。 ![[Remove Seats] ボタン](/assets/images/help/billing/remove-seats-button.png)
+1. Under "Current plan", use the **Edit** drop-down and click **Remove seats**.
+ 
+1. Under "Remove seats", select the number of seats you'd like to downgrade to.
+ 
+1. Review the information about your new payment on your next billing date, then click **Remove seats**.
+ 
-## 参考リンク
+## Further reading
-- "[{% data variables.product.prodname_dotcom %}の製品](/articles/github-s-products)"
-- [アップグレードあるいはダウングレードの支払いプロセスへの影響は？](/articles/how-does-upgrading-or-downgrading-affect-the-billing-process)
-- 「[{% data variables.product.prodname_dotcom %} の支払いについて](/articles/about-billing-on-github)」
-- 「[支払い方法を削除する](/articles/removing-a-payment-method)」
-- [ユーザごとの価格付けについて](/articles/about-per-user-pricing)
+- "[{% data variables.product.prodname_dotcom %}'s products](/articles/github-s-products)"
+- "[How does upgrading or downgrading affect the billing process?](/articles/how-does-upgrading-or-downgrading-affect-the-billing-process)"
+- "[About billing on {% data variables.product.prodname_dotcom %}](/articles/about-billing-on-github)."
+- "[Removing a payment method](/articles/removing-a-payment-method)"
+- "[About per-user pricing](/articles/about-per-user-pricing)"
diff --git a/translations/ja-JP/content/billing/managing-billing-for-your-github-account/index.md b/translations/ja-JP/content/billing/managing-billing-for-your-github-account/index.md
index 8ce2d21968..7801363423 100644
--- a/translations/ja-JP/content/billing/managing-billing-for-your-github-account/index.md
+++ b/translations/ja-JP/content/billing/managing-billing-for-your-github-account/index.md
@@ -1,17 +1,17 @@
---
-title: GitHub アカウントの支払いを管理する
-shortTitle: GitHubアカウント
+title: Managing billing for your GitHub account
+shortTitle: Your GitHub account
intro: '{% ifversion fpt %}{% data variables.product.product_name %} offers free and paid products for every account. You can upgrade, downgrade, and view pending changes to your account''s subscription at any time.{% elsif ghec or ghes or ghae %}You can manage billing for {% data variables.product.product_name %}{% ifversion ghae %}.{% elsif ghec or ghes %} from your enterprise account on {% data variables.product.prodname_dotcom_the_website %}.{% endif %}{% endif %}'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account
- - /categories/97/articles/
- - /categories/paying-for-user-accounts/
- - /articles/paying-for-your-github-user-account/
- - /articles/managing-billing-on-github/
- - /articles/changing-your-personal-account-s-billing-plan/
- - /categories/billing/
- - /categories/3/articles/
- - /articles/managing-your-organization-s-paid-seats/
+ - /categories/97/articles
+ - /categories/paying-for-user-accounts
+ - /articles/paying-for-your-github-user-account
+ - /articles/managing-billing-on-github
+ - /articles/changing-your-personal-account-s-billing-plan
+ - /categories/billing
+ - /categories/3/articles
+ - /articles/managing-your-organization-s-paid-seats
- /articles/managing-billing-for-your-github-account
versions:
fpt: '*'
diff --git a/translations/ja-JP/content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md b/translations/ja-JP/content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md
index 82e5a8e8b3..fee3631236 100644
--- a/translations/ja-JP/content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md
+++ b/translations/ja-JP/content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md
@@ -1,22 +1,23 @@
---
title: Upgrading your GitHub subscription
intro: 'You can upgrade the subscription for any type of account on {% data variables.product.product_location %} at any time.'
+miniTocMaxHeadingLevel: 3
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription
- - /articles/upgrading-your-personal-account-s-billing-plan/
- - /articles/upgrading-your-personal-account/
- - /articles/upgrading-your-personal-account-from-free-to-a-paid-account/
- - /articles/upgrading-your-personal-account-from-free-to-paid-with-a-credit-card/
- - /articles/upgrading-your-personal-account-from-free-to-paid-with-paypal/
- - /articles/500-error-while-upgrading/
- - /articles/upgrading-your-organization-s-billing-plan/
- - /articles/changing-your-organization-billing-plan/
- - /articles/upgrading-your-organization-account-from-free-to-paid-with-a-credit-card/
- - /articles/upgrading-your-organization-account-from-free-to-paid-with-paypal/
- - /articles/upgrading-your-organization-account/
- - /articles/switching-from-per-repository-to-per-user-pricing/
- - /articles/adding-seats-to-your-organization/
- - /articles/upgrading-your-github-billing-plan/
+ - /articles/upgrading-your-personal-account-s-billing-plan
+ - /articles/upgrading-your-personal-account
+ - /articles/upgrading-your-personal-account-from-free-to-a-paid-account
+ - /articles/upgrading-your-personal-account-from-free-to-paid-with-a-credit-card
+ - /articles/upgrading-your-personal-account-from-free-to-paid-with-paypal
+ - /articles/500-error-while-upgrading
+ - /articles/upgrading-your-organization-s-billing-plan
+ - /articles/changing-your-organization-billing-plan
+ - /articles/upgrading-your-organization-account-from-free-to-paid-with-a-credit-card
+ - /articles/upgrading-your-organization-account-from-free-to-paid-with-paypal
+ - /articles/upgrading-your-organization-account
+ - /articles/switching-from-per-repository-to-per-user-pricing
+ - /articles/adding-seats-to-your-organization
+ - /articles/upgrading-your-github-billing-plan
- /articles/upgrading-your-github-subscription
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/upgrading-your-github-subscription
versions:
@@ -30,9 +31,16 @@ topics:
- User account
shortTitle: Upgrade your subscription
---
+
+## About subscription upgrades
+
+{% data reusables.accounts.accounts-billed-separately %}
+
+When you upgrade the subscription for an account, the upgrade changes the paid features available for that account only, and not any other accounts you use.
+
## Upgrading your personal account's subscription
-You can upgrade your personal account from {% data variables.product.prodname_free_user %} to {% data variables.product.prodname_pro %} to get advanced code review tools on private repositories. {% data reusables.gated-features.more-info %}
+You can upgrade your personal account from {% data variables.product.prodname_free_user %} to {% data variables.product.prodname_pro %} to get advanced code review tools on private repositories owned by your user account. Upgrading your personal account does not affect any organizations you may manage or repositories owned by those organizations. {% data reusables.gated-features.more-info %}
{% data reusables.user_settings.access_settings %}
{% data reusables.user_settings.billing_plans %}
@@ -45,9 +53,13 @@ You can upgrade your personal account from {% data variables.product.prodname_fr
{% data reusables.dotcom_billing.enter-payment-info %}
{% data reusables.dotcom_billing.finish_upgrade %}
-## Upgrading your organization's subscription
+## Managing your organization's subscription
-You can upgrade your organization from {% data variables.product.prodname_free_team %} for an organization to {% data variables.product.prodname_team %} to access advanced collaboration and management tools for teams, or upgrade your organization to {% data variables.product.prodname_ghe_cloud %} for additional security, compliance, and deployment controls. {% data reusables.gated-features.more-info-org-products %}
+You can upgrade your organization's subscription to a different product, add seats to your existing product, or switch from per-repository to per-user pricing.
+
+### Upgrading your organization's subscription
+
+You can upgrade your organization from {% data variables.product.prodname_free_team %} for an organization to {% data variables.product.prodname_team %} to access advanced collaboration and management tools for teams, or upgrade your organization to {% data variables.product.prodname_ghe_cloud %} for additional security, compliance, and deployment controls. Upgrading an organization does not affect your personal account or repositories owned by your personal account. {% data reusables.gated-features.more-info-org-products %}
{% data reusables.dotcom_billing.org-billing-perms %}
@@ -66,7 +78,7 @@ If you upgraded your organization to {% data variables.product.prodname_ghe_clou
If you'd like to use an enterprise account with {% data variables.product.prodname_ghe_cloud %}, contact {% data variables.contact.contact_enterprise_sales %}. For more information, see "[About enterprise accounts](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
-## Adding seats to your organization
+### Adding seats to your organization
If you'd like additional users to have access to your {% data variables.product.prodname_team %} organization's private repositories, you can purchase more seats anytime.
@@ -75,7 +87,7 @@ If you'd like additional users to have access to your {% data variables.product.
{% data reusables.dotcom_billing.number-of-seats %}
{% data reusables.dotcom_billing.confirm-add-seats %}
-## Switching your organization from per-repository to per-user pricing
+### Switching your organization from per-repository to per-user pricing
{% data reusables.dotcom_billing.switch-legacy-billing %} For more information, see "[About per-user pricing](/articles/about-per-user-pricing)."
diff --git a/translations/ja-JP/content/billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription.md b/translations/ja-JP/content/billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription.md
index 9bd7420984..6b946551a5 100644
--- a/translations/ja-JP/content/billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription.md
+++ b/translations/ja-JP/content/billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription.md
@@ -1,11 +1,11 @@
---
-title: プランの保留中の変更の表示と管理
-intro: 次回の請求日に発効する前に、プランの保留中の変更を表示およびキャンセルできます。
+title: Viewing and managing pending changes to your subscription
+intro: You can view and cancel pending changes to your subscriptions before they take effect on your next billing date.
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/viewing-and-managing-pending-changes-to-your-subscription
- - /articles/viewing-and-managing-pending-changes-to-your-personal-account-s-billing-plan/
- - /articles/viewing-and-managing-pending-changes-to-your-organization-s-billing-plan/
- - /articles/viewing-and-managing-pending-changes-to-your-billing-plan/
+ - /articles/viewing-and-managing-pending-changes-to-your-personal-account-s-billing-plan
+ - /articles/viewing-and-managing-pending-changes-to-your-organization-s-billing-plan
+ - /articles/viewing-and-managing-pending-changes-to-your-billing-plan
- /articles/viewing-and-managing-pending-changes-to-your-subscription
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription
versions:
@@ -15,14 +15,13 @@ type: how_to
topics:
- Organizations
- User account
-shortTitle: サブスクリプションの変更の保留
+shortTitle: Pending subscription changes
---
+You can cancel pending changes to your account's subscription as well as pending changes to your subscriptions to other paid features and products.
-アカウントのプランに対する保留中の変更、および他の有料機能や製品へのプランの保留中の変更をキャンセルすることができます。
+When you cancel a pending change, your subscription will not change on your next billing date (unless you make a subsequent change to your subscription before your next billing date).
-保留中の変更をキャンセルしても、次回の請求日にプランが変更されることはありません (次回の請求日より前にプランに変更を加えない限り)。
-
-## 個人アカウントのプランに対する保留中の変更の表示と管理
+## Viewing and managing pending changes to your personal account's subscription
{% data reusables.user_settings.access_settings %}
{% data reusables.user_settings.billing_plans %}
@@ -30,13 +29,13 @@ shortTitle: サブスクリプションの変更の保留
{% data reusables.dotcom_billing.cancel-pending-changes %}
{% data reusables.dotcom_billing.confirm-cancel-pending-changes %}
-## Organization のプランに対する保留中の変更の表示と管理
+## Viewing and managing pending changes to your organization's subscription
{% data reusables.organizations.billing-settings %}
{% data reusables.dotcom_billing.review-pending-changes %}
{% data reusables.dotcom_billing.cancel-pending-changes %}
{% data reusables.dotcom_billing.confirm-cancel-pending-changes %}
-## 参考リンク
+## Further reading
-- "[{% data variables.product.prodname_dotcom %}の製品](/articles/github-s-products)"
+- "[{% data variables.product.prodname_dotcom %}'s products](/articles/github-s-products)"
diff --git a/translations/ja-JP/content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md b/translations/ja-JP/content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md
index c29d5e80a8..0454458409 100644
--- a/translations/ja-JP/content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md
+++ b/translations/ja-JP/content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md
@@ -1,16 +1,16 @@
---
-title: 領収書に情報を追加する
-intro: '{% data variables.product.product_name %} の領収書には、税金や会社あるいは国が求める会計情報などの情報を加えることができます。'
+title: Adding information to your receipts
+intro: 'You can add extra information to your {% data variables.product.product_name %} receipts, such as tax or accounting information required by your company or country.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/adding-information-to-your-receipts
- - /articles/can-i-add-my-credit-card-number-to-my-receipts/
- - /articles/can-i-add-extra-information-to-my-receipts--2/
- - /articles/how-can-i-add-extra-information-to-my-receipts/
- - /articles/could-you-add-my-card-number-to-my-receipts/
- - /articles/how-can-i-add-extra-information-to-my-personal-account-s-receipts/
- - /articles/adding-information-to-your-personal-account-s-receipts/
- - /articles/how-can-i-add-extra-information-to-my-organization-s-receipts/
- - /articles/adding-information-to-your-organization-s-receipts/
+ - /articles/can-i-add-my-credit-card-number-to-my-receipts
+ - /articles/can-i-add-extra-information-to-my-receipts--2
+ - /articles/how-can-i-add-extra-information-to-my-receipts
+ - /articles/could-you-add-my-card-number-to-my-receipts
+ - /articles/how-can-i-add-extra-information-to-my-personal-account-s-receipts
+ - /articles/adding-information-to-your-personal-account-s-receipts
+ - /articles/how-can-i-add-extra-information-to-my-organization-s-receipts
+ - /articles/adding-information-to-your-organization-s-receipts
- /articles/adding-information-to-your-receipts
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/adding-information-to-your-receipts
versions:
@@ -21,29 +21,28 @@ topics:
- Organizations
- Receipts
- User account
-shortTitle: 領収書への追加
+shortTitle: Add to your receipts
---
-
-領収書には、{% data variables.product.prodname_dotcom %} プランと合わせて[他の有料の機能や製品](/articles/about-billing-on-github)のプランが含まれます。
+Your receipts include your {% data variables.product.prodname_dotcom %} subscription as well as any subscriptions for [other paid features and products](/articles/about-billing-on-github).
{% warning %}
-**警告**: セキュリティ上の理由から、領収書には秘密情報や財務情報 (クレジットカード番号など) を含めないように強くおすすめします。
+**Warning**: For security reasons, we strongly recommend against including any confidential or financial information (such as credit card numbers) on your receipts.
{% endwarning %}
-## 個人アカウントの領収書への情報の追加
+## Adding information to your personal account's receipts
{% data reusables.user_settings.access_settings %}
{% data reusables.user_settings.billing_plans %}
{% data reusables.user_settings.payment-info-link %}
{% data reusables.dotcom_billing.extra_info_receipt %}
-## Organization の領収書への情報の追加
+## Adding information to your organization's receipts
{% note %}
-**メモ**: {% data reusables.dotcom_billing.org-billing-perms %}
+**Note**: {% data reusables.dotcom_billing.org-billing-perms %}
{% endnote %}
diff --git a/translations/ja-JP/content/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method.md b/translations/ja-JP/content/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method.md
index ac58416110..bb9fc0e76c 100644
--- a/translations/ja-JP/content/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method.md
+++ b/translations/ja-JP/content/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method.md
@@ -3,18 +3,18 @@ title: Adding or editing a payment method
intro: You can add a payment method to your account or update your account's existing payment method at any time.
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/adding-or-editing-a-payment-method
- - /articles/updating-your-personal-account-s-payment-method/
- - /articles/how-do-i-update-my-credit-card/
- - /articles/updating-your-account-s-credit-card/
- - /articles/updating-your-personal-account-s-credit-card/
- - /articles/updating-your-personal-account-s-paypal-information/
- - /articles/does-github-provide-invoicing/
- - /articles/switching-payment-methods-for-your-personal-account/
- - /articles/paying-for-your-github-organization-account/
- - /articles/updating-your-organization-s-credit-card/
- - /articles/updating-your-organization-s-paypal-information/
- - /articles/updating-your-organization-s-payment-method/
- - /articles/switching-payment-methods-for-your-organization/
+ - /articles/updating-your-personal-account-s-payment-method
+ - /articles/how-do-i-update-my-credit-card
+ - /articles/updating-your-account-s-credit-card
+ - /articles/updating-your-personal-account-s-credit-card
+ - /articles/updating-your-personal-account-s-paypal-information
+ - /articles/does-github-provide-invoicing
+ - /articles/switching-payment-methods-for-your-personal-account
+ - /articles/paying-for-your-github-organization-account
+ - /articles/updating-your-organization-s-credit-card
+ - /articles/updating-your-organization-s-paypal-information
+ - /articles/updating-your-organization-s-payment-method
+ - /articles/switching-payment-methods-for-your-organization
- /articles/adding-or-editing-a-payment-method
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/adding-or-editing-a-payment-method
versions:
diff --git a/translations/ja-JP/content/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle.md b/translations/ja-JP/content/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle.md
index d7ffb3da03..539ae1e931 100644
--- a/translations/ja-JP/content/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle.md
+++ b/translations/ja-JP/content/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle.md
@@ -1,11 +1,11 @@
---
-title: 支払いサイクル期間の変更
-intro: アカウントのプランや、その他有料機能、有料製品は、月次または年次のサイクルで支払うことができます。
+title: Changing the duration of your billing cycle
+intro: You can pay for your account's subscription and other paid features and products on a monthly or yearly billing cycle.
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/changing-the-duration-of-your-billing-cycle
- - /articles/monthly-and-yearly-billing/
- - /articles/switching-between-monthly-and-yearly-billing-for-your-personal-account/
- - /articles/switching-between-monthly-and-yearly-billing-for-your-organization/
+ - /articles/monthly-and-yearly-billing
+ - /articles/switching-between-monthly-and-yearly-billing-for-your-personal-account
+ - /articles/switching-between-monthly-and-yearly-billing-for-your-organization
- /articles/changing-the-duration-of-your-billing-cycle
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle
versions:
@@ -16,30 +16,31 @@ topics:
- Organizations
- Repositories
- User account
-shortTitle: 支払いサイクル
+shortTitle: Billing cycle
---
+When you change your billing cycle's duration, your {% data variables.product.prodname_dotcom %} subscription, along with any other paid features and products, will be moved to your new billing cycle on your next billing date.
-支払いサイクル期間を変更すると、{% data variables.product.prodname_dotcom %}のプランおよびその他の有料機能、有料製品は、次の支払日から新しい支払いサイクルに移行します。
-
-## 個人アカウントの支払いサイクル期間の変更
+## Changing the duration of your personal account's billing cycle
{% data reusables.user_settings.access_settings %}
{% data reusables.user_settings.billing_plans %}
{% data reusables.dotcom_billing.change_plan_duration %}
{% data reusables.dotcom_billing.confirm_duration_change %}
-## Organization の支払いサイクル期間の変更
+## Changing the duration of your organization's billing cycle
{% data reusables.dotcom_billing.org-billing-perms %}
-### ユーザ単位プランの期間の変更
+### Changing the duration of a per-user subscription
{% data reusables.organizations.billing-settings %}
{% data reusables.dotcom_billing.change_plan_duration %}
{% data reusables.dotcom_billing.confirm_duration_change %}
-### 過去のリポジトリ単位プランの期間の変更
+### Changing the duration of a legacy per-repository plan
{% data reusables.organizations.billing-settings %}
-4. [Billing overview] で、[**Change plan**] をクリックします。 ![[Billing overview] の [Change plan] ボタン](/assets/images/help/billing/billing_overview_change_plan.png)
-5. ページの右上で [**Switch to monthly billing**] または [**Switch to yearly billing**] をクリックします。 
+4. Under "Billing overview", click **Change plan**.
+ 
+5. At the top right corner, click **Switch to monthly billing** or **Switch to yearly billing**.
+ 
diff --git a/translations/ja-JP/content/billing/managing-your-github-billing-settings/index.md b/translations/ja-JP/content/billing/managing-your-github-billing-settings/index.md
index c671023452..c8d94f174f 100644
--- a/translations/ja-JP/content/billing/managing-your-github-billing-settings/index.md
+++ b/translations/ja-JP/content/billing/managing-your-github-billing-settings/index.md
@@ -1,15 +1,15 @@
---
-title: GitHub の支払い設定を管理する
-shortTitle: 支払い設定
-intro: お使いのアカウントの支払い設定は、アカウントに追加する各有料機能または製品に適用されます。 支払い方法、支払いサイクル、支払い請求先メールアドレスなどの設定を管理できます。 また、ご利用のプラン、請求日、支払い履歴、過去の領収証などの支払い情報を表示することもできます。
+title: Managing your GitHub billing settings
+shortTitle: Billing settings
+intro: 'Your account''s billing settings apply to every paid feature or product you add to the account. You can manage settings like your payment method, billing cycle, and billing email. You can also view billing information such as your subscription, billing date, payment history, and past receipts.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings
- - /articles/viewing-and-managing-your-personal-account-s-billing-information/
- - /articles/paying-for-user-accounts/
- - /articles/viewing-and-managing-your-organization-s-billing-information/
- - /articles/paying-for-organization-accounts/
- - /categories/paying-for-organization-accounts/articles/
- - /categories/99/articles/
+ - /articles/viewing-and-managing-your-personal-account-s-billing-information
+ - /articles/paying-for-user-accounts
+ - /articles/viewing-and-managing-your-organization-s-billing-information
+ - /articles/paying-for-organization-accounts
+ - /categories/paying-for-organization-accounts/articles
+ - /categories/99/articles
- /articles/managing-your-github-billing-settings
versions:
fpt: '*'
diff --git a/translations/ja-JP/content/billing/managing-your-github-billing-settings/redeeming-a-coupon.md b/translations/ja-JP/content/billing/managing-your-github-billing-settings/redeeming-a-coupon.md
index f28ad08eeb..2a416cdc8f 100644
--- a/translations/ja-JP/content/billing/managing-your-github-billing-settings/redeeming-a-coupon.md
+++ b/translations/ja-JP/content/billing/managing-your-github-billing-settings/redeeming-a-coupon.md
@@ -1,11 +1,11 @@
---
-title: クーポンを利用する
-intro: 'クーポンがある場合、{% data variables.product.prodname_dotcom %} の有料プランに利用できます。'
+title: Redeeming a coupon
+intro: 'If you have a coupon, you can redeem it towards a paid {% data variables.product.prodname_dotcom %} subscription.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/redeeming-a-coupon
- - /articles/where-do-i-add-a-coupon-code/
- - /articles/redeeming-a-coupon-for-your-personal-account/
- - /articles/redeeming-a-coupon-for-organizations/
+ - /articles/where-do-i-add-a-coupon-code
+ - /articles/redeeming-a-coupon-for-your-personal-account
+ - /articles/redeeming-a-coupon-for-organizations
- /articles/redeeming-a-coupon
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/redeeming-a-coupon
versions:
@@ -18,23 +18,24 @@ topics:
- Organizations
- User account
---
-
-{% data variables.product.product_name %}では、クーポンを適用する前にアカウントの支払いをした場合の返金はできません。 また、適用先のアカウントを間違えた場合にも、利用したクーポンの移譲や新たなクーポンの発行はできません。 クーポンを利用する前に、クーポンを正しいアカウントに適用していることを確認してください。
+{% data variables.product.product_name %} can't issue a refund if you pay for an account before applying a coupon. We also can't transfer a redeemed coupon or give you a new coupon if you apply it to the wrong account. Confirm that you're applying the coupon to the correct account before you redeem a coupon.
{% data reusables.dotcom_billing.coupon-expires %}
-クーポンは {% data variables.product.prodname_marketplace %}アプリケーションの有料プランには適用できません。
+You cannot apply coupons to paid plans for {% data variables.product.prodname_marketplace %} apps.
-## 個人アカウントでクーポンを利用する
+## Redeeming a coupon for your personal account
{% data reusables.dotcom_billing.enter_coupon_code_on_redeem_page %}
-4. [Redeem your coupon] の下で、*個人*アカウントのユーザ名の横にある [**Choose**] をクリックします。 
+4. Under "Redeem your coupon", click **Choose** next to your *personal* account's username.
+ 
{% data reusables.dotcom_billing.redeem_coupon %}
-## Organization でクーポンを利用する
+## Redeeming a coupon for your organization
{% data reusables.dotcom_billing.org-billing-perms %}
{% data reusables.dotcom_billing.enter_coupon_code_on_redeem_page %}
-4. 「Redeem your coupon」の下で、クーポンを適用する *Organization* の横にある [**Choose**] をクリックします。 まだ存在していない新しい Organization にクーポンを適用する場合は、[**Create a new organization**] をクリックします。 
+4. Under "Redeem your coupon", click **Choose** next to the *organization* you want to apply the coupon to. If you'd like to apply your coupon to a new organization that doesn't exist yet, click **Create a new organization**.
+ 
{% data reusables.dotcom_billing.redeem_coupon %}
diff --git a/translations/ja-JP/content/billing/managing-your-github-billing-settings/removing-a-payment-method.md b/translations/ja-JP/content/billing/managing-your-github-billing-settings/removing-a-payment-method.md
index ac01064771..8e7fe2ed0b 100644
--- a/translations/ja-JP/content/billing/managing-your-github-billing-settings/removing-a-payment-method.md
+++ b/translations/ja-JP/content/billing/managing-your-github-billing-settings/removing-a-payment-method.md
@@ -1,12 +1,12 @@
---
-title: 支払い方法を削除する
-intro: '{% data variables.product.prodname_dotcom %} の有料プランで支払い方法を使用していない場合、その支払い方法を削除すればアカウントに保存されなくなります。'
+title: Removing a payment method
+intro: 'If you aren''t using your payment method for any paid subscriptions on {% data variables.product.prodname_dotcom %}, you can remove the payment method so it''s no longer stored in your account.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/removing-a-payment-method
- - /articles/removing-a-credit-card-associated-with-your-user-account/
- - /articles/removing-a-payment-method-associated-with-your-user-account/
- - /articles/removing-a-credit-card-associated-with-your-organization/
- - /articles/removing-a-payment-method-associated-with-your-organization/
+ - /articles/removing-a-credit-card-associated-with-your-user-account
+ - /articles/removing-a-payment-method-associated-with-your-user-account
+ - /articles/removing-a-credit-card-associated-with-your-organization
+ - /articles/removing-a-payment-method-associated-with-your-organization
- /articles/removing-a-payment-method
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/removing-a-payment-method
versions:
@@ -17,18 +17,17 @@ topics:
- Organizations
- User account
---
-
-{% data variables.product.product_name %} のクーポン付きプランの支払いをしていて、{% data variables.product.product_name %} の[他の有料機能や製品](/articles/about-billing-on-github)の支払い方法を使用していない場合、クレジットカードや PayPal の情報を削除できます。
+If you're paying for your {% data variables.product.product_name %} subscription with a coupon, and you aren't using your payment method for any [other paid features or products](/articles/about-billing-on-github) on {% data variables.product.product_name %}, you can remove your credit card or PayPal information.
{% data reusables.dotcom_billing.coupon-expires %}
{% tip %}
-**ヒント:** 他の有料機能や製品のプランがなくて[アカウントを無料製品にダウングレード](/articles/downgrading-your-github-subscription)した場合、支払い情報は自動的に削除されます。
+**Tip:** If you [downgrade your account to a free product](/articles/downgrading-your-github-subscription) and you don't have subscriptions for any other paid features or products, we'll automatically remove your payment information.
{% endtip %}
-## 個人アカウントの支払い方法を削除する
+## Removing your personal account's payment method
{% data reusables.user_settings.access_settings %}
{% data reusables.user_settings.billing_plans %}
@@ -36,7 +35,7 @@ topics:
{% data reusables.dotcom_billing.remove-payment-method %}
{% data reusables.dotcom_billing.remove_payment_info %}
-## Organization の支払い方法を削除する
+## Removing your organization's payment method
{% data reusables.dotcom_billing.org-billing-perms %}
diff --git a/translations/ja-JP/content/billing/managing-your-github-billing-settings/setting-your-billing-email.md b/translations/ja-JP/content/billing/managing-your-github-billing-settings/setting-your-billing-email.md
index d2de23c5b5..66805ec15f 100644
--- a/translations/ja-JP/content/billing/managing-your-github-billing-settings/setting-your-billing-email.md
+++ b/translations/ja-JP/content/billing/managing-your-github-billing-settings/setting-your-billing-email.md
@@ -1,12 +1,12 @@
---
-title: 支払い請求先メールアドレスを設定する
-intro: 'お客様の支払い請求先メールアドレスに、{% data variables.product.product_name %} が領収書およびその他の請求関連の連絡を送ります。'
+title: Setting your billing email
+intro: 'Your account''s billing email is where {% data variables.product.product_name %} sends receipts and other billing-related communication.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/setting-your-billing-email
- - /articles/setting-your-personal-account-s-billing-email/
- - /articles/can-i-change-what-email-address-received-my-github-receipt/
- - '/articles/how-do-i-change-the-billing-email,setting-your-billing-email/'
- - /articles/setting-your-organization-s-billing-email/
+ - /articles/setting-your-personal-account-s-billing-email
+ - /articles/can-i-change-what-email-address-received-my-github-receipt
+ - '/articles/how-do-i-change-the-billing-email,setting-your-billing-email'
+ - /articles/setting-your-organization-s-billing-email
- /articles/setting-your-billing-email
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/setting-your-billing-email
versions:
@@ -16,51 +16,58 @@ type: how_to
topics:
- Organizations
- User account
-shortTitle: 支払いメール
+shortTitle: Billing email
---
+## Setting your personal account's billing email
-## 個人アカウントの支払い請求先メールアドレスを設定する
+Your personal account's primary email is where {% data variables.product.product_name %} sends receipts and other billing-related communication.
-お客様の個人アカウントのプライマリメールアドレスに、{% data variables.product.product_name %} が領収書およびその他の請求関連の連絡を送ります。
+Your primary email address is the first email listed in your account email settings.
+We also use your primary email address as our billing email address.
-プライマリメールアドレスは、アカウントのメール設定に入力した最初のメールアドレスです。 また、プライマリメールアドレスを支払い請求先メールアドレスとして使えます。
+If you'd like to change your billing email, see "[Changing your primary email address](/articles/changing-your-primary-email-address)."
-支払い請求先メールアドレスを変更したい場合は「[プライマリメールアドレスを変更する](/articles/changing-your-primary-email-address)」を参照してください。
+## Setting your organization's billing email
-## Organization の支払い請求先メールアドレスを設定する
-
-お客様の Organization の請求先メールアドレスに、{% data variables.product.product_name %} が領収書およびその他の請求関連の連絡を送ります。 このメールアドレスは、Organization アカウント専用である必要はありません。
+Your organization's billing email is where {% data variables.product.product_name %} sends receipts and other billing-related communication. The email address does not need to be unique to the organization account.
{% data reusables.dotcom_billing.org-billing-perms %}
{% data reusables.organizations.billing-settings %}
-1. [Billing management] で、支払メールアドレスの右の[**Edit**]をクリックします。 
-2. 有効なメールアドレスを入力し、[**Update**]をクリックします。 
+1. Under "Billing management", to the right of the billing email address, click **Edit**.
+ 
+2. Type a valid email address, then click **Update**.
+ 
-## Organization の支払い請求先メールアドレスに受信者を追加して管理する
+## Managing additional recipients for your organization's billing email
-支払い請求レポートを受信する必要のあるユーザが複数いる場合は、支払い請求先メールの受信者としてそのユーザのメールアドレスを追加できます。 この機能を利用できるのは、企業が管理していない Organization だけです。
+If you have users that want to receive billing reports, you can add their email addresses as billing email recipients. This feature is only available to organizations that are not managed by an enterprise.
{% data reusables.dotcom_billing.org-billing-perms %}
-### 支払い通知の受信者を追加する
+### Adding a recipient for billing notifications
{% data reusables.organizations.billing-settings %}
-1. [Billing management] で、[Email recipients] の右の [**Add**] をクリックします。 
-1. 受信者のメールアドレスを入力し、[**Add**] をクリックします。 
+1. Under "Billing management", to the right of "Email recipients", click **Add**.
+ 
+1. Type the email address of the recipient, then click **Add**.
+ 
-### 支払い通知の第 1 受信者を変更する
+### Changing the primary recipient for billing notifications
-第1受信者として必ずアドレスを 1 つは指定する必要があります。 第 1 受信者に指定したアドレスは、別の第 1 受信者を選定するまで、削除できません。
+One address must always be designated as the primary recipient. The address with this designation can't be removed until a new primary recipient is selected.
{% data reusables.organizations.billing-settings %}
-1. [Billing management] で、第 1 受信者に設定したいメールアドレスを探します。
-1. 見つかったメールアドレスの右にある [Edit] ドロップダウンメニューで、[**Mark as primary**] をクリックします。 
+1. Under "Billing management", find the email address you want to set as the primary recipient.
+1. To the right of the email address, use the "Edit" drop-down menu, and click **Mark as primary**.
+ 
-### 支払い通知の受信者を削除する
+### Removing a recipient from billing notifications
{% data reusables.organizations.billing-settings %}
-1. [Email recipients] で、削除したいメールアドレスを探します。
-1. そのユーザのエントリで [**Edit**] をクリックします。 
-1. メールアドレスの右の[Edit]ドロップダウンメニューを使い、[**Remove**]をクリックします。 
-1. 確認ダイアログを確かめてから、[**Remove**] をクリックします。
+1. Under "Email recipients", find the email address you want to remove.
+1. For the user's entry in the list, click **Edit**.
+ 
+1. To the right of the email address, use the "Edit" drop-down menu, and click **Remove**.
+ 
+1. Review the confirmation prompt, then click **Remove**.
diff --git a/translations/ja-JP/content/billing/managing-your-github-billing-settings/troubleshooting-a-declined-credit-card-charge.md b/translations/ja-JP/content/billing/managing-your-github-billing-settings/troubleshooting-a-declined-credit-card-charge.md
index eb26c80d78..efa7701ca9 100644
--- a/translations/ja-JP/content/billing/managing-your-github-billing-settings/troubleshooting-a-declined-credit-card-charge.md
+++ b/translations/ja-JP/content/billing/managing-your-github-billing-settings/troubleshooting-a-declined-credit-card-charge.md
@@ -1,9 +1,9 @@
---
-title: クレジットカードへの請求が拒否された場合のトラブルシューティング
-intro: '{% data variables.product.product_name %} への支払いに使っているクレジットカードが拒否された場合、支払いが行われるように、そして、自分のアカウントから締め出されなくするための、いくつかのステップがあります。'
+title: Troubleshooting a declined credit card charge
+intro: 'If the credit card you use to pay for {% data variables.product.product_name %} is declined, you can take several steps to ensure that your payments go through and that you are not locked out of your account.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/troubleshooting-a-declined-credit-card-charge
- - /articles/what-do-i-do-if-my-card-is-declined/
+ - /articles/what-do-i-do-if-my-card-is-declined
- /articles/troubleshooting-a-declined-credit-card-charge
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/troubleshooting-a-declined-credit-card-charge
versions:
@@ -12,27 +12,26 @@ versions:
type: how_to
topics:
- Troubleshooting
-shortTitle: 拒否されたクレジットカードの請求
+shortTitle: Declined credit card charge
---
+If your card is declined, we'll send you an email about why the payment was declined. You'll have a few days to resolve the problem before we try charging you again.
-カードが拒否された場合、その支払いが拒否された理由についてメールが送られます。 再び請求される前、その問題を解決するための数日間の猶予があります。
+## Check your card's expiration date
-## カードの期限の日付の確認
+If your card has expired, you'll need to update your account's payment information. For more information, see "[Adding or editing a payment method](/articles/adding-or-editing-a-payment-method)."
-カードが期限切れの場合、アカウントの支払い情報をアップデートする必要があります。 詳細は「[支払い方法を追加または編集する](/articles/adding-or-editing-a-payment-method)」を参照してください。
+## Verify your bank's policy on card restrictions
-## カードの制限についての銀行のポリシーの確認
+Some international banks place restrictions on international, e-commerce, and automatically recurring transactions. If you're having trouble making a payment with your international credit card, call your bank to see if there are any restrictions on your card.
-一定の国際的な銀行は、国際、E コマースおよび自動的な定期取引について制限をしています。 国際的なクレジットカードでの支払いの実行のトラブルの場合、あなたのカードに対する制限があるか銀行に確認してください。
+We also support payments through PayPal. For more information, see "[Adding or editing a payment method](/articles/adding-or-editing-a-payment-method)."
-PayPal での支払いもサポートしています。 詳細は「[支払い方法を追加または編集する](/articles/adding-or-editing-a-payment-method)」を参照してください。
+## Contact your bank for details about the transaction
-## 取引の詳細についての銀行への連絡
+Your bank can provide additional information about declined payments if you specifically ask about the attempted transaction. If there are restrictions on your card and you need to call your bank, provide this information to your bank:
-実行しようとした取引について具体的に問い合わせると、拒否された支払いについて銀行からさらに情報を得られます。 カードに制限があり、銀行に問い合わせる必要がある場合、この情報を銀行に提供してください:
-
-- **請求されている金額。**あなたのプランに対する金額は、アカウントの領収書に表示されています。 詳細は「[支払い履歴と領収書を表示する](/articles/viewing-your-payment-history-and-receipts)」を参照してください。
-- **{% data variables.product.product_name %} の請求日付。**アカウントへの請求日は領収書に表示されています。
-- **取引 ID 番号。**あなたのアカウントの取引 ID は、領収書に表示されています。
-- **取引会社名。**取引会社名は、{% data variables.product.prodname_dotcom %} です。
-- **拒否された請求について銀行が送ったエラーメッセージ。**請求が拒否された時に私たちがあなたに送ったメールに、銀行のエラーメッセージがあります。
+- **The amount you're being charged.** The amount for your subscription appears on your account's receipts. For more information, see "[Viewing your payment history and receipts](/articles/viewing-your-payment-history-and-receipts)."
+- **The date when {% data variables.product.product_name %} bills you.** Your account's billing date appears on your receipts.
+- **The transaction ID number.** Your account's transaction ID appears on your receipts.
+- **The merchant name.** The merchant name is {% data variables.product.prodname_dotcom %}.
+- **The error message your bank sent with the declined charge.** You can find your bank's error message on the email we send you when a charge is declined.
diff --git a/translations/ja-JP/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md b/translations/ja-JP/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md
index c6534fe217..b59da1c080 100644
--- a/translations/ja-JP/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md
+++ b/translations/ja-JP/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md
@@ -1,14 +1,14 @@
---
-title: ロックされたアカウントのロックを解除する
-intro: 支払いの問題が原因で支払い期限が過ぎた場合、Organization の有料機能はロックされます。
+title: Unlocking a locked account
+intro: Your organization's paid features are locked if your payment is past due because of billing problems.
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/unlocking-a-locked-account
- - /articles/what-happens-if-my-account-is-locked/
- - /articles/if-my-account-is-locked-and-i-upgrade-it-do-i-owe-anything-for-previous-time/
- - /articles/if-my-account-is-locked-and-i-upgrade-it-do-i-pay-backcharges/
- - /articles/what-happens-if-my-repository-is-locked/
- - /articles/unlocking-a-locked-personal-account/
- - /articles/unlocking-a-locked-organization-account/
+ - /articles/what-happens-if-my-account-is-locked
+ - /articles/if-my-account-is-locked-and-i-upgrade-it-do-i-owe-anything-for-previous-time
+ - /articles/if-my-account-is-locked-and-i-upgrade-it-do-i-pay-backcharges
+ - /articles/what-happens-if-my-repository-is-locked
+ - /articles/unlocking-a-locked-personal-account
+ - /articles/unlocking-a-locked-organization-account
- /articles/unlocking-a-locked-account
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/unlocking-a-locked-account
versions:
@@ -20,15 +20,14 @@ topics:
- Downgrades
- Organizations
- User account
-shortTitle: ロックされたアカウント
+shortTitle: Locked account
---
+You can unlock and access your account by updating your organization's payment method and resuming paid status. We do not ask you to pay for the time elapsed in locked mode.
-Organization の支払い方法をアップデートして支払いステータスを回復することで、アカウントのロックを解除しアクセスできるようになります。 ロックされたモードで経過した時間の分については、お支払いを請求いたしません。
+You can downgrade your organization to {% data variables.product.prodname_free_team %} to continue with the same advanced features in public repositories. For more information, see "[Downgrading your {% data variables.product.product_name %} subscription](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)."
-パブリックリポジトリで同じ高度な機能を使い続けるために、Organization を{% data variables.product.prodname_free_team %} にダウングレードすることができます。 詳細は「[{% data variables.product.product_name %} プランのダウングレード](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)」を参照してください。
+## Unlocking an organization's features due to a declined payment
-## 支払いの拒否による Organization 機能のロック解除
+If your organization's advanced features are locked due to a declined payment, you'll need to update your billing information to trigger a newly authorized charge. For more information, see "[Adding or editing a payment method](/articles/adding-or-editing-a-payment-method)."
-支払いの拒否により Organization の高度な機能ロックされた場合、支払い情報をアップデートして、新しく認められた支払いを開始する必要があります。 詳細は「[支払い方法を追加または編集する](/articles/adding-or-editing-a-payment-method)」を参照してください。
-
-新しい請求情報が承認された場合、お客様が選択した有料製品について直ちに請求します。 支払いが無事行われると、自動的に Organization のロックが解除されます。
+If the new billing information is approved, we will immediately charge you for the paid product you chose. The organization will automatically unlock when a successful payment has been made.
diff --git a/translations/ja-JP/content/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts.md b/translations/ja-JP/content/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts.md
index 940d910458..c643ca0c2c 100644
--- a/translations/ja-JP/content/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts.md
+++ b/translations/ja-JP/content/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts.md
@@ -1,11 +1,11 @@
---
-title: 支払い履歴と領収書を表示する
-intro: アカウントの支払い履歴はいつでも表示できます。また、過去の領収書は、いつでもダウンロード可能です。
+title: Viewing your payment history and receipts
+intro: You can view your account's payment history and download past receipts at any time.
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-payment-history-and-receipts
- - /articles/downloading-receipts/
- - /articles/downloading-receipts-for-personal-accounts/
- - /articles/downloading-receipts-for-organizations/
+ - /articles/downloading-receipts
+ - /articles/downloading-receipts-for-personal-accounts
+ - /articles/downloading-receipts-for-organizations
- /articles/viewing-your-payment-history-and-receipts
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts
versions:
@@ -17,17 +17,16 @@ topics:
- Organizations
- Receipts
- User account
-shortTitle: 履歴と領収書の表示
+shortTitle: View history & receipts
---
-
-## 個人アカウントの領収書を表示する
+## Viewing receipts for your personal account
{% data reusables.user_settings.access_settings %}
{% data reusables.user_settings.billing_plans %}
{% data reusables.dotcom_billing.view-payment-history %}
{% data reusables.dotcom_billing.download_receipt %}
-## Organization の領収書を表示する
+## Viewing receipts for your organization
{% data reusables.dotcom_billing.org-billing-perms %}
diff --git a/translations/ja-JP/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md b/translations/ja-JP/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md
index 1bb8c9b1fd..b62ebd0208 100644
--- a/translations/ja-JP/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md
+++ b/translations/ja-JP/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md
@@ -1,13 +1,13 @@
---
-title: プランと請求日を表示する
-intro: アカウントのプラン、有料機能と製品、および次の請求日は、アカウントの支払い設定で確認できます。
+title: Viewing your subscriptions and billing date
+intro: 'You can view your account''s subscription, your other paid features and products, and your next billing date in your account''s billing settings.'
redirect_from:
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date
- /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-subscriptions-and-billing-date
- - /articles/finding-your-next-billing-date/
- - /articles/finding-your-personal-account-s-next-billing-date/
- - /articles/finding-your-organization-s-next-billing-date/
- - /articles/viewing-your-plans-and-billing-date/
+ - /articles/finding-your-next-billing-date
+ - /articles/finding-your-personal-account-s-next-billing-date
+ - /articles/finding-your-organization-s-next-billing-date
+ - /articles/viewing-your-plans-and-billing-date
- /articles/viewing-your-subscriptions-and-billing-date
versions:
fpt: '*'
@@ -17,22 +17,21 @@ topics:
- Accounts
- Organizations
- User account
-shortTitle: サブスクリプションと請求日
+shortTitle: Subscriptions & billing date
---
-
-## 個人アカウントの次の請求日を確認する
+## Finding your personal account's next billing date
{% data reusables.user_settings.access_settings %}
{% data reusables.user_settings.billing_plans %}
{% data reusables.dotcom_billing.next_billing_date %}
-## Organization の次の請求日を確認する
+## Finding your organization's next billing date
{% data reusables.dotcom_billing.org-billing-perms %}
{% data reusables.organizations.billing-settings %}
{% data reusables.dotcom_billing.next_billing_date %}
-## 参考リンク
+## Further reading
-- 「[{% data variables.product.prodname_dotcom %} アカウントの支払いについて](/articles/about-billing-for-github-accounts)」
+- "[About billing for {% data variables.product.prodname_dotcom %} accounts](/articles/about-billing-for-github-accounts)"
diff --git a/translations/ja-JP/content/billing/managing-your-license-for-github-enterprise/index.md b/translations/ja-JP/content/billing/managing-your-license-for-github-enterprise/index.md
index 617e5c273f..9f270733c2 100644
--- a/translations/ja-JP/content/billing/managing-your-license-for-github-enterprise/index.md
+++ b/translations/ja-JP/content/billing/managing-your-license-for-github-enterprise/index.md
@@ -5,13 +5,13 @@ intro: '{% data variables.product.prodname_enterprise %} includes both cloud and
redirect_from:
- /free-pro-team@latest/billing/managing-your-license-for-github-enterprise
- /enterprise/admin/installation/managing-your-github-enterprise-license
- - /enterprise/admin/categories/licenses/
- - /enterprise/admin/articles/license-files/
- - /enterprise/admin/installation/about-license-files/
- - /enterprise/admin/articles/downloading-your-license/
- - /enterprise/admin/installation/downloading-your-license/
- - /enterprise/admin/articles/upgrading-your-license/
- - /enterprise/admin/installation/updating-your-license/
+ - /enterprise/admin/categories/licenses
+ - /enterprise/admin/articles/license-files
+ - /enterprise/admin/installation/about-license-files
+ - /enterprise/admin/articles/downloading-your-license
+ - /enterprise/admin/installation/downloading-your-license
+ - /enterprise/admin/articles/upgrading-your-license
+ - /enterprise/admin/installation/updating-your-license
- /enterprise/admin/installation/managing-your-github-enterprise-server-license
- /enterprise/admin/overview/managing-your-github-enterprise-license
versions:
diff --git a/translations/ja-JP/content/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry.md b/translations/ja-JP/content/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry.md
index 96a96aa03f..7130649af7 100644
--- a/translations/ja-JP/content/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry.md
+++ b/translations/ja-JP/content/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry.md
@@ -1,13 +1,13 @@
---
-title: codespace がプライベートイメージレジストリにアクセスできるようにする
-intro: 'シークレットを使用して、{% data variables.product.prodname_codespaces %} がプライベートイメージレジストリにアクセスできるようにすることができます'
+title: Allowing your codespace to access a private image registry
+intro: 'You can use secrets to allow {% data variables.product.prodname_codespaces %} to access a private image registry'
versions:
fpt: '*'
ghec: '*'
topics:
- Codespaces
product: '{% data reusables.gated-features.codespaces %}'
-shortTitle: プライベートイメージレジストリ
+shortTitle: Private image registry
---
## About private image registries and {% data variables.product.prodname_codespaces %}
@@ -32,7 +32,7 @@ By default, when you publish a container image to {% data variables.product.prod
This behavior is controlled by the **Inherit access from repo** option. **Inherit access from repo** is selected by default when publishing via {% data variables.product.prodname_actions %}, but not when publishing directly to {% data variables.product.prodname_dotcom %} Container Registry using a Personal Access Token (PAT).
-If the **Inherit access from repo** option was not selected when the image was published, you can manually add the repository to the published container image's access controls. 詳しい情報については「[パッケージのアクセス制御と可視性](/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility#inheriting-access-for-a-container-image-from-a-repository)」を参照してください。
+If the **Inherit access from repo** option was not selected when the image was published, you can manually add the repository to the published container image's access controls. For more information, see "[Configuring a package's access control and visibility](/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility#inheriting-access-for-a-container-image-from-a-repository)."
### Accessing an image published to the organization a codespace will be launched in
@@ -52,15 +52,15 @@ We recommend publishing images via {% data variables.product.prodname_actions %}
## Accessing images stored in other container registries
-If you are accessing a container image from a registry that isn't {% data variables.product.prodname_dotcom %} Container Registry, {% data variables.product.prodname_codespaces %} checks for the presence of three secrets, which define the server name, username, and personal access token (PAT) for a container registry. これらのシークレットが見つかった場合、{% data variables.product.prodname_codespaces %} はレジストリを codespace 内で使用できるようにします。
+If you are accessing a container image from a registry that isn't {% data variables.product.prodname_dotcom %} Container Registry, {% data variables.product.prodname_codespaces %} checks for the presence of three secrets, which define the server name, username, and personal access token (PAT) for a container registry. If these secrets are found, {% data variables.product.prodname_codespaces %} will make the registry available inside your codespace.
- `<*>_CONTAINER_REGISTRY_SERVER`
- `<*>_CONTAINER_REGISTRY_USER`
- `<*>_CONTAINER_REGISTRY_PASSWORD`
-シークレットは、ユーザ、リポジトリ、または Organization レベルで保存できるため、異なる Codespaces 間で安全に共有できます。 When you create a set of secrets for a private image registry, you need to replace the "<*>" in the name with a consistent identifier. 詳しい情報については、「[Codespaces の暗号化されたシークレットを管理する](/codespaces/managing-your-codespaces/managing-encrypted-secrets-for-your-codespaces)」および「[Codespaces のリポジトリと Organization の暗号化されたシークレットを管理する](/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces)」を参照してください。
+You can store secrets at the user, repository, or organization-level, allowing you to share them securely between different codespaces. When you create a set of secrets for a private image registry, you need to replace the "<*>" in the name with a consistent identifier. For more information, see "[Managing encrypted secrets for your codespaces](/codespaces/managing-your-codespaces/managing-encrypted-secrets-for-your-codespaces)" and "[Managing encrypted secrets for your repository and organization for Codespaces](/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces)."
-If you are setting the secrets at the user or organization level, make sure to assign those secrets to the repository you'll be creating the codespace in by choosing an access policy from the dropdown list.
+If you are setting the secrets at the user or organization level, make sure to assign those secrets to the repository you'll be creating the codespace in by choosing an access policy from the dropdown list.
@@ -74,12 +74,38 @@ ACR_CONTAINER_REGISTRY_USER = acr-user-here
ACR_CONTAINER_REGISTRY_PASSWORD =
```
-For information on common image registries, see "[Common image registry servers](#common-image-registry-servers)."
+For information on common image registries, see "[Common image registry servers](#common-image-registry-servers)." Note that accessing AWS Elastic Container Registry (ECR) is different.
Once you've added the secrets, you may need to stop and then start the codespace you are in for the new environment variables to be passed into the container. For more information, see "[Suspending or stopping a codespace](/codespaces/codespaces-reference/using-the-command-palette-in-codespaces#suspending-or-stopping-a-codespace)."
+#### Accessing AWS Elastic Container Registry
+
+To access AWS Elastic Container Registry (ECR), you can provide an AWS access key ID and secret key, and {% data variables.product.prodname_dotcom %} can retrieve an access token for you and log in on your behalf.
+
+```
+*_CONTAINER_REGISTRY_SERVER =
+*_CONTAINER_REGISTRY_USER =
+*_container_REGISTRY_PASSWORD =
+```
+
+You must also ensure you have the appropriate AWS IAM permissions to perform the credential swap (e.g. `sts:GetServiceBearerToken`) as well as the ECR read operation (either `AmazonEC2ContainerRegistryFullAccess` or `ReadOnlyAccess`).
+
+Alternatively, if you don't want GitHub to perform the credential swap on your behalf, you can provide an authorization token fetched via AWS's APIs or CLI.
+
+```
+*_CONTAINER_REGISTRY_SERVER =
+*_CONTAINER_REGISTRY_USER = AWS
+*_container_REGISTRY_PASSWORD =
+```
+
+Since these tokens are short lived and need to be refreshed periodically, we recommend providing an access key ID and secret.
+
+While these secrets can have any name, so long as the `*_CONTAINER_REGISTRY_SERVER` is an ECR URL, we recommend using `ECR_CONTAINER_REGISTRY_*` unless you are dealing with multiple ECR registries.
+
+For more information, see AWS ECR's "[Private registry authentication documentation](https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html)."
+
### Common image registry servers
Some of the common image registry servers are listed below:
@@ -90,6 +116,6 @@ Some of the common image registry servers are listed below:
- [AWS Elastic Container Registry](https://docs.aws.amazon.com/AmazonECR/latest/userguide/Registries.html) - `.dkr.ecr..amazonaws.com`
- [Google Cloud Container Registry](https://cloud.google.com/container-registry/docs/overview#registries) - `gcr.io` (US), `eu.gcr.io` (EU), `asia.gcr.io` (Asia)
-#### Accessing AWS Elastic Container Registry
+## Debugging private image registry access
-If you want to access AWS Elastic Container Registry (ECR), you must provide an AWS authorization token in the `ECR_CONTAINER_REGISTRY_PASSWORD`. This authorization token is not the same as your secret key. You can obtain an AWS authorization token by using AWS's APIs or CLI. These tokens are short lived and will need to be refreshed periodically. For more information, see AWS ECR's "[Private registry authentication documentation](https://docs.aws.amazon.com/AmazonECR/latest/userguide/registry_auth.html)."
+If you are having trouble pulling an image from a private image registry, make sure you are able to run `docker login -u -p `, using the values of the secrets defined above. If login fails, ensure that the login credentials are valid and that you have the apprioriate permissions on the server to fetch a container image. If login succeeds, make sure that these values are copied appropriately into the right {% data variables.product.prodname_codespaces %} secrets, either at the user, repository, or organization level and try again.
\ No newline at end of file
diff --git a/translations/ja-JP/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md b/translations/ja-JP/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md
index f534a02538..7e68cd8fd1 100644
--- a/translations/ja-JP/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md
+++ b/translations/ja-JP/content/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization.md
@@ -37,10 +37,19 @@ By default, a codespace can only access the repository from which it was created
{% data reusables.organizations.click-codespaces %}
1. Under "User permissions", select one of the following options:
- * **Allow for all users** to allow all your organization members to use {% data variables.product.prodname_codespaces %}.
* **Selected users** to select specific organization members to use {% data variables.product.prodname_codespaces %}.
+ * **Allow for all members** to allow all your organization members to use {% data variables.product.prodname_codespaces %}.
+ * **Allow for all members and outside collaborators** to allow all your organization members as well as outside collaborators to use {% data variables.product.prodname_codespaces %}.
- 
+ 
+
+ {% note %}
+
+ **Note:** When you select **Allow for all members and outside collaborators**, all outside collaborators who have been added to specific repositories can create and use {% data variables.product.prodname_codespaces %}. Your organization will be billed for all usage incurred by outside collaborators. For more information on managing outside collaborators, see "[About outside collaborators](/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization#about-outside-collaborators)."
+
+ {% endnote %}
+
+1. Click **Save**.
## Disabling {% data variables.product.prodname_codespaces %} for your organization
diff --git a/translations/ja-JP/content/developers/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps.md b/translations/ja-JP/content/developers/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps.md
index cc15507cf3..1ea8edbf72 100644
--- a/translations/ja-JP/content/developers/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps.md
+++ b/translations/ja-JP/content/developers/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps.md
@@ -239,16 +239,16 @@ While most of your API interaction should occur using your server-to-server inst
#### Deployment Statuses
-* [List deployment statuses](/rest/reference/repos#list-deployment-statuses)
-* [Create a deployment status](/rest/reference/repos#create-a-deployment-status)
-* [Get a deployment status](/rest/reference/repos#get-a-deployment-status)
+* [List deployment statuses](/rest/reference/deployments#list-deployment-statuses)
+* [Create a deployment status](/rest/reference/deployments#create-a-deployment-status)
+* [Get a deployment status](/rest/reference/deployments#get-a-deployment-status)
#### Deployments
-* [List deployments](/rest/reference/repos#list-deployments)
-* [Create a deployment](/rest/reference/repos#create-a-deployment)
-* [Get a deployment](/rest/reference/repos#get-a-deployment){% ifversion fpt or ghes or ghae or ghec %}
-* [Delete a deployment](/rest/reference/repos#delete-a-deployment){% endif %}
+* [List deployments](/rest/reference/deployments#list-deployments)
+* [Create a deployment](/rest/reference/deployments#create-a-deployment)
+* [Get a deployment](/rest/reference/deployments#get-a-deployment){% ifversion fpt or ghes or ghae or ghec %}
+* [Delete a deployment](/rest/reference/deployments#delete-a-deployment){% endif %}
#### Events
@@ -609,7 +609,7 @@ While most of your API interaction should occur using your server-to-server inst
* [Get a repository](/rest/reference/repos#get-a-repository)
* [Update a repository](/rest/reference/repos#update-a-repository)
* [Delete a repository](/rest/reference/repos#delete-a-repository)
-* [Compare two commits](/rest/reference/repos#compare-two-commits)
+* [Compare two commits](/rest/reference/commits#compare-two-commits)
* [List repository contributors](/rest/reference/repos#list-repository-contributors)
* [List forks](/rest/reference/repos#list-forks)
* [Create a fork](/rest/reference/repos#create-a-fork)
@@ -641,68 +641,68 @@ While most of your API interaction should occur using your server-to-server inst
#### Repository Branches
-* [List branches](/rest/reference/repos#list-branches)
-* [Get a branch](/rest/reference/repos#get-a-branch)
-* [Get branch protection](/rest/reference/repos#get-branch-protection)
-* [Update branch protection](/rest/reference/repos#update-branch-protection)
-* [Delete branch protection](/rest/reference/repos#delete-branch-protection)
-* [Get admin branch protection](/rest/reference/repos#get-admin-branch-protection)
-* [Set admin branch protection](/rest/reference/repos#set-admin-branch-protection)
-* [Delete admin branch protection](/rest/reference/repos#delete-admin-branch-protection)
-* [Get pull request review protection](/rest/reference/repos#get-pull-request-review-protection)
-* [Update pull request review protection](/rest/reference/repos#update-pull-request-review-protection)
-* [Delete pull request review protection](/rest/reference/repos#delete-pull-request-review-protection)
-* [Get commit signature protection](/rest/reference/repos#get-commit-signature-protection)
-* [Create commit signature protection](/rest/reference/repos#create-commit-signature-protection)
-* [Delete commit signature protection](/rest/reference/repos#delete-commit-signature-protection)
-* [Get status checks protection](/rest/reference/repos#get-status-checks-protection)
-* [Update status check protection](/rest/reference/repos#update-status-check-protection)
-* [Remove status check protection](/rest/reference/repos#remove-status-check-protection)
-* [Get all status check contexts](/rest/reference/repos#get-all-status-check-contexts)
-* [Add status check contexts](/rest/reference/repos#add-status-check-contexts)
-* [Set status check contexts](/rest/reference/repos#set-status-check-contexts)
-* [Remove status check contexts](/rest/reference/repos#remove-status-check-contexts)
-* [Get access restrictions](/rest/reference/repos#get-access-restrictions)
-* [Delete access restrictions](/rest/reference/repos#delete-access-restrictions)
+* [List branches](/rest/reference/branches#list-branches)
+* [Get a branch](/rest/reference/branches#get-a-branch)
+* [Get branch protection](/rest/reference/branches#get-branch-protection)
+* [Update branch protection](/rest/reference/branches#update-branch-protection)
+* [Delete branch protection](/rest/reference/branches#delete-branch-protection)
+* [Get admin branch protection](/rest/reference/branches#get-admin-branch-protection)
+* [Set admin branch protection](/rest/reference/branches#set-admin-branch-protection)
+* [Delete admin branch protection](/rest/reference/branches#delete-admin-branch-protection)
+* [Get pull request review protection](/rest/reference/branches#get-pull-request-review-protection)
+* [Update pull request review protection](/rest/reference/branches#update-pull-request-review-protection)
+* [Delete pull request review protection](/rest/reference/branches#delete-pull-request-review-protection)
+* [Get commit signature protection](/rest/reference/branches#get-commit-signature-protection)
+* [Create commit signature protection](/rest/reference/branches#create-commit-signature-protection)
+* [Delete commit signature protection](/rest/reference/branches#delete-commit-signature-protection)
+* [Get status checks protection](/rest/reference/branches#get-status-checks-protection)
+* [Update status check protection](/rest/reference/branches#update-status-check-protection)
+* [Remove status check protection](/rest/reference/branches#remove-status-check-protection)
+* [Get all status check contexts](/rest/reference/branches#get-all-status-check-contexts)
+* [Add status check contexts](/rest/reference/branches#add-status-check-contexts)
+* [Set status check contexts](/rest/reference/branches#set-status-check-contexts)
+* [Remove status check contexts](/rest/reference/branches#remove-status-check-contexts)
+* [Get access restrictions](/rest/reference/branches#get-access-restrictions)
+* [Delete access restrictions](/rest/reference/branches#delete-access-restrictions)
* [List teams with access to the protected branch](/rest/reference/repos#list-teams-with-access-to-the-protected-branch)
-* [Add team access restrictions](/rest/reference/repos#add-team-access-restrictions)
-* [Set team access restrictions](/rest/reference/repos#set-team-access-restrictions)
-* [Remove team access restriction](/rest/reference/repos#remove-team-access-restrictions)
+* [Add team access restrictions](/rest/reference/branches#add-team-access-restrictions)
+* [Set team access restrictions](/rest/reference/branches#set-team-access-restrictions)
+* [Remove team access restriction](/rest/reference/branches#remove-team-access-restrictions)
* [List user restrictions of protected branch](/rest/reference/repos#list-users-with-access-to-the-protected-branch)
-* [Add user access restrictions](/rest/reference/repos#add-user-access-restrictions)
-* [Set user access restrictions](/rest/reference/repos#set-user-access-restrictions)
-* [Remove user access restrictions](/rest/reference/repos#remove-user-access-restrictions)
-* [Merge a branch](/rest/reference/repos#merge-a-branch)
+* [Add user access restrictions](/rest/reference/branches#add-user-access-restrictions)
+* [Set user access restrictions](/rest/reference/branches#set-user-access-restrictions)
+* [Remove user access restrictions](/rest/reference/branches#remove-user-access-restrictions)
+* [Merge a branch](/rest/reference/branches#merge-a-branch)
#### Repository Collaborators
-* [List repository collaborators](/rest/reference/repos#list-repository-collaborators)
-* [Check if a user is a repository collaborator](/rest/reference/repos#check-if-a-user-is-a-repository-collaborator)
-* [Add a repository collaborator](/rest/reference/repos#add-a-repository-collaborator)
-* [Remove a repository collaborator](/rest/reference/repos#remove-a-repository-collaborator)
-* [Get repository permissions for a user](/rest/reference/repos#get-repository-permissions-for-a-user)
+* [List repository collaborators](/rest/reference/collaborators#list-repository-collaborators)
+* [Check if a user is a repository collaborator](/rest/reference/collaborators#check-if-a-user-is-a-repository-collaborator)
+* [Add a repository collaborator](/rest/reference/collaborators#add-a-repository-collaborator)
+* [Remove a repository collaborator](/rest/reference/collaborators#remove-a-repository-collaborator)
+* [Get repository permissions for a user](/rest/reference/collaborators#get-repository-permissions-for-a-user)
#### Repository Commit Comments
-* [List commit comments for a repository](/rest/reference/repos#list-commit-comments-for-a-repository)
-* [Get a commit comment](/rest/reference/repos#get-a-commit-comment)
-* [Update a commit comment](/rest/reference/repos#update-a-commit-comment)
-* [Delete a commit comment](/rest/reference/repos#delete-a-commit-comment)
-* [List commit comments](/rest/reference/repos#list-commit-comments)
-* [Create a commit comment](/rest/reference/repos#create-a-commit-comment)
+* [List commit comments for a repository](/rest/reference/commits#list-commit-comments-for-a-repository)
+* [Get a commit comment](/rest/reference/commits#get-a-commit-comment)
+* [Update a commit comment](/rest/reference/commits#update-a-commit-comment)
+* [Delete a commit comment](/rest/reference/commits#delete-a-commit-comment)
+* [List commit comments](/rest/reference/commits#list-commit-comments)
+* [Create a commit comment](/rest/reference/commits#create-a-commit-comment)
#### Repository Commits
-* [List commits](/rest/reference/repos#list-commits)
-* [Get a commit](/rest/reference/repos#get-a-commit)
-* [List branches for head commit](/rest/reference/repos#list-branches-for-head-commit)
+* [List commits](/rest/reference/commits#list-commits)
+* [Get a commit](/rest/reference/commits#get-a-commit)
+* [List branches for head commit](/rest/reference/commits#list-branches-for-head-commit)
* [List pull requests associated with commit](/rest/reference/repos#list-pull-requests-associated-with-commit)
#### Repository Community
* [Get the code of conduct for a repository](/rest/reference/codes-of-conduct#get-the-code-of-conduct-for-a-repository)
{% ifversion fpt or ghec %}
-* [Get community profile metrics](/rest/reference/repos#get-community-profile-metrics)
+* [Get community profile metrics](/rest/reference/repository-metrics#get-community-profile-metrics)
{% endif %}
#### Repository Contents
@@ -722,40 +722,40 @@ While most of your API interaction should occur using your server-to-server inst
#### Repository Hooks
-* [List repository webhooks](/rest/reference/repos#list-repository-webhooks)
-* [Create a repository webhook](/rest/reference/repos#create-a-repository-webhook)
-* [Get a repository webhook](/rest/reference/repos#get-a-repository-webhook)
-* [Update a repository webhook](/rest/reference/repos#update-a-repository-webhook)
-* [Delete a repository webhook](/rest/reference/repos#delete-a-repository-webhook)
-* [Ping a repository webhook](/rest/reference/repos#ping-a-repository-webhook)
+* [List repository webhooks](/rest/reference/webhooks#list-repository-webhooks)
+* [Create a repository webhook](/rest/reference/webhooks#create-a-repository-webhook)
+* [Get a repository webhook](/rest/reference/webhooks#get-a-repository-webhook)
+* [Update a repository webhook](/rest/reference/webhooks#update-a-repository-webhook)
+* [Delete a repository webhook](/rest/reference/webhooks#delete-a-repository-webhook)
+* [Ping a repository webhook](/rest/reference/webhooks#ping-a-repository-webhook)
* [Test the push repository webhook](/rest/reference/repos#test-the-push-repository-webhook)
#### Repository Invitations
-* [List repository invitations](/rest/reference/repos#list-repository-invitations)
-* [Update a repository invitation](/rest/reference/repos#update-a-repository-invitation)
-* [Delete a repository invitation](/rest/reference/repos#delete-a-repository-invitation)
-* [List repository invitations for the authenticated user](/rest/reference/repos#list-repository-invitations-for-the-authenticated-user)
-* [Accept a repository invitation](/rest/reference/repos#accept-a-repository-invitation)
-* [Decline a repository invitation](/rest/reference/repos#decline-a-repository-invitation)
+* [List repository invitations](/rest/reference/collaborators#list-repository-invitations)
+* [Update a repository invitation](/rest/reference/collaborators#update-a-repository-invitation)
+* [Delete a repository invitation](/rest/reference/collaborators#delete-a-repository-invitation)
+* [List repository invitations for the authenticated user](/rest/reference/collaborators#list-repository-invitations-for-the-authenticated-user)
+* [Accept a repository invitation](/rest/reference/collaborators#accept-a-repository-invitation)
+* [Decline a repository invitation](/rest/reference/collaborators#decline-a-repository-invitation)
#### Repository Keys
-* [List deploy keys](/rest/reference/repos#list-deploy-keys)
-* [Create a deploy key](/rest/reference/repos#create-a-deploy-key)
-* [Get a deploy key](/rest/reference/repos#get-a-deploy-key)
-* [Delete a deploy key](/rest/reference/repos#delete-a-deploy-key)
+* [List deploy keys](/rest/reference/deployments#list-deploy-keys)
+* [Create a deploy key](/rest/reference/deployments#create-a-deploy-key)
+* [Get a deploy key](/rest/reference/deployments#get-a-deploy-key)
+* [Delete a deploy key](/rest/reference/deployments#delete-a-deploy-key)
#### Repository Pages
-* [Get a GitHub Pages site](/rest/reference/repos#get-a-github-pages-site)
-* [Create a GitHub Pages site](/rest/reference/repos#create-a-github-pages-site)
-* [Update information about a GitHub Pages site](/rest/reference/repos#update-information-about-a-github-pages-site)
-* [Delete a GitHub Pages site](/rest/reference/repos#delete-a-github-pages-site)
-* [List GitHub Pages builds](/rest/reference/repos#list-github-pages-builds)
-* [Request a GitHub Pages build](/rest/reference/repos#request-a-github-pages-build)
-* [Get GitHub Pages build](/rest/reference/repos#get-github-pages-build)
-* [Get latest pages build](/rest/reference/repos#get-latest-pages-build)
+* [Get a GitHub Pages site](/rest/reference/pages#get-a-github-pages-site)
+* [Create a GitHub Pages site](/rest/reference/pages#create-a-github-pages-site)
+* [Update information about a GitHub Pages site](/rest/reference/pages#update-information-about-a-github-pages-site)
+* [Delete a GitHub Pages site](/rest/reference/pages#delete-a-github-pages-site)
+* [List GitHub Pages builds](/rest/reference/pages#list-github-pages-builds)
+* [Request a GitHub Pages build](/rest/reference/pages#request-a-github-pages-build)
+* [Get GitHub Pages build](/rest/reference/pages#get-github-pages-build)
+* [Get latest pages build](/rest/reference/pages#get-latest-pages-build)
{% ifversion ghes %}
#### Repository Pre Receive Hooks
@@ -782,11 +782,11 @@ While most of your API interaction should occur using your server-to-server inst
#### Repository Stats
-* [Get the weekly commit activity](/rest/reference/repos#get-the-weekly-commit-activity)
-* [Get the last year of commit activity](/rest/reference/repos#get-the-last-year-of-commit-activity)
-* [Get all contributor commit activity](/rest/reference/repos#get-all-contributor-commit-activity)
-* [Get the weekly commit count](/rest/reference/repos#get-the-weekly-commit-count)
-* [Get the hourly commit count for each day](/rest/reference/repos#get-the-hourly-commit-count-for-each-day)
+* [Get the weekly commit activity](/rest/reference/repository-metrics#get-the-weekly-commit-activity)
+* [Get the last year of commit activity](/rest/reference/repository-metrics#get-the-last-year-of-commit-activity)
+* [Get all contributor commit activity](/rest/reference/repository-metrics#get-all-contributor-commit-activity)
+* [Get the weekly commit count](/rest/reference/repository-metrics#get-the-weekly-commit-count)
+* [Get the hourly commit count for each day](/rest/reference/repository-metrics#get-the-hourly-commit-count-for-each-day)
{% ifversion fpt or ghec %}
#### Repository Vulnerability Alerts
@@ -812,9 +812,9 @@ While most of your API interaction should occur using your server-to-server inst
#### Statuses
-* [Get the combined status for a specific reference](/rest/reference/repos#get-the-combined-status-for-a-specific-reference)
-* [List commit statuses for a reference](/rest/reference/repos#list-commit-statuses-for-a-reference)
-* [Create a commit status](/rest/reference/repos#create-a-commit-status)
+* [Get the combined status for a specific reference](/rest/reference/commits#get-the-combined-status-for-a-specific-reference)
+* [List commit statuses for a reference](/rest/reference/commits#list-commit-statuses-for-a-reference)
+* [Create a commit status](/rest/reference/commits#create-a-commit-status)
#### Team Discussions
@@ -837,10 +837,10 @@ While most of your API interaction should occur using your server-to-server inst
{% ifversion fpt or ghec %}
#### Traffic
-* [Get repository clones](/rest/reference/repos#get-repository-clones)
-* [Get top referral paths](/rest/reference/repos#get-top-referral-paths)
-* [Get top referral sources](/rest/reference/repos#get-top-referral-sources)
-* [Get page views](/rest/reference/repos#get-page-views)
+* [Get repository clones](/rest/reference/repository-metrics#get-repository-clones)
+* [Get top referral paths](/rest/reference/repository-metrics#get-top-referral-paths)
+* [Get top referral sources](/rest/reference/repository-metrics#get-top-referral-sources)
+* [Get page views](/rest/reference/repository-metrics#get-page-views)
{% endif %}
{% ifversion fpt or ghec %}
diff --git a/translations/ja-JP/content/developers/apps/getting-started-with-apps/differences-between-github-apps-and-oauth-apps.md b/translations/ja-JP/content/developers/apps/getting-started-with-apps/differences-between-github-apps-and-oauth-apps.md
index 37d6d53b63..3b4da45422 100644
--- a/translations/ja-JP/content/developers/apps/getting-started-with-apps/differences-between-github-apps-and-oauth-apps.md
+++ b/translations/ja-JP/content/developers/apps/getting-started-with-apps/differences-between-github-apps-and-oauth-apps.md
@@ -97,7 +97,7 @@ Unlike OAuth apps, GitHub Apps have targeted permissions that allow them to requ
| GitHub Apps | OAuth Apps |
| ----- | ----------- |
-| GitHub Apps ask for repository contents permission and use your installation token to authenticate via [HTTP-based Git](/apps/building-github-apps/authenticating-with-github-apps/#http-based-git-access-by-an-installation). | OAuth Apps ask for `write:public_key` scope and [Create a deploy key](/rest/reference/repos#create-a-deploy-key) via the API. You can then use that key to perform Git commands. |
+| GitHub Apps ask for repository contents permission and use your installation token to authenticate via [HTTP-based Git](/apps/building-github-apps/authenticating-with-github-apps/#http-based-git-access-by-an-installation). | OAuth Apps ask for `write:public_key` scope and [Create a deploy key](/rest/reference/deployments#create-a-deploy-key) via the API. You can then use that key to perform Git commands. |
| The token is used as the HTTP password. | The token is used as the HTTP username. |
## Machine vs. bot accounts
diff --git a/translations/ja-JP/content/developers/apps/getting-started-with-apps/migrating-oauth-apps-to-github-apps.md b/translations/ja-JP/content/developers/apps/getting-started-with-apps/migrating-oauth-apps-to-github-apps.md
index 81c514324b..c50c580dbb 100644
--- a/translations/ja-JP/content/developers/apps/getting-started-with-apps/migrating-oauth-apps-to-github-apps.md
+++ b/translations/ja-JP/content/developers/apps/getting-started-with-apps/migrating-oauth-apps-to-github-apps.md
@@ -98,7 +98,7 @@ You'll need to replace `YOUR_APP_NAME` with the name of your GitHub App, `ID_OF_
### Remove any unnecessary repository hooks
-Once your GitHub App has been installed on a repository, you should remove any unnecessary webhooks that were created by your legacy OAuth App. If both apps are installed on a repository, they may duplicate functionality for the user. To remove webhooks, you can listen for the [`installation_repositories` webhook](/webhooks/event-payloads/#installation_repositories) with the `repositories_added` action and [Delete a repository webhook](/rest/reference/repos#delete-a-repository-webhook) on those repositories that were created by your OAuth App.
+Once your GitHub App has been installed on a repository, you should remove any unnecessary webhooks that were created by your legacy OAuth App. If both apps are installed on a repository, they may duplicate functionality for the user. To remove webhooks, you can listen for the [`installation_repositories` webhook](/webhooks/event-payloads/#installation_repositories) with the `repositories_added` action and [Delete a repository webhook](/rest/reference/webhooks#delete-a-repository-webhook) on those repositories that were created by your OAuth App.
### Encourage users to revoke access to your OAuth app
diff --git a/translations/ja-JP/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md b/translations/ja-JP/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md
index d02f24f4a3..83686ec401 100644
--- a/translations/ja-JP/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md
+++ b/translations/ja-JP/content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md
@@ -327,7 +327,7 @@ Webhook events are triggered based on the specificity of the domain you register
Key | Type | Description
----|------|-------------{% ifversion fpt or ghes or ghae or ghec %}
`action` |`string` | The action performed. Can be `created`.{% endif %}
-`deployment` |`object` | The [deployment](/rest/reference/repos#list-deployments).
+`deployment` |`object` | The [deployment](/rest/reference/deployments#list-deployments).
{% data reusables.webhooks.repo_desc %}
{% data reusables.webhooks.org_desc %}
{% data reusables.webhooks.app_desc %}
@@ -352,11 +352,11 @@ Key | Type | Description
Key | Type | Description
----|------|-------------{% ifversion fpt or ghes or ghae or ghec %}
`action` |`string` | The action performed. Can be `created`.{% endif %}
-`deployment_status` |`object` | The [deployment status](/rest/reference/repos#list-deployment-statuses).
+`deployment_status` |`object` | The [deployment status](/rest/reference/deployments#list-deployment-statuses).
`deployment_status["state"]` |`string` | The new state. Can be `pending`, `success`, `failure`, or `error`.
`deployment_status["target_url"]` |`string` | The optional link added to the status.
`deployment_status["description"]`|`string` | The optional human-readable description added to the status.
-`deployment` |`object` | The [deployment](/rest/reference/repos#list-deployments) that this status is associated with.
+`deployment` |`object` | The [deployment](/rest/reference/deployments#list-deployments) that this status is associated with.
{% data reusables.webhooks.repo_desc %}
{% data reusables.webhooks.org_desc %}
{% data reusables.webhooks.app_desc %}
@@ -820,7 +820,7 @@ Activity related to {% data variables.product.prodname_registry %}. {% data reus
Key | Type | Description
----|------|------------
`id` | `integer` | The unique identifier of the page build.
-`build` | `object` | The [List GitHub Pages builds](/rest/reference/repos#list-github-pages-builds) itself.
+`build` | `object` | The [List GitHub Pages builds](/rest/reference/pages#list-github-pages-builds) itself.
{% data reusables.webhooks.repo_desc %}
{% data reusables.webhooks.org_desc %}
{% data reusables.webhooks.app_desc %}
@@ -846,7 +846,7 @@ Key | Type | Description
----|------|------------
`zen` | `string` | Random string of GitHub zen.
`hook_id` | `integer` | The ID of the webhook that triggered the ping.
-`hook` | `object` | The [webhook configuration](/rest/reference/repos#get-a-repository-webhook).
+`hook` | `object` | The [webhook configuration](/rest/reference/webhooks#get-a-repository-webhook).
`hook[app_id]` | `integer` | When you register a new {% data variables.product.prodname_github_app %}, {% data variables.product.product_name %} sends a ping event to the **webhook URL** you specified during registration. The event contains the `app_id`, which is required for [authenticating](/apps/building-integrations/setting-up-and-registering-github-apps/about-authentication-options-for-github-apps/) an app.
{% data reusables.webhooks.repo_desc %}
{% data reusables.webhooks.org_desc %}
diff --git a/translations/ja-JP/content/get-started/learning-about-github/access-permissions-on-github.md b/translations/ja-JP/content/get-started/learning-about-github/access-permissions-on-github.md
index 9d725ebcf0..07127770d3 100644
--- a/translations/ja-JP/content/get-started/learning-about-github/access-permissions-on-github.md
+++ b/translations/ja-JP/content/get-started/learning-about-github/access-permissions-on-github.md
@@ -7,7 +7,7 @@ redirect_from:
- /articles/access-permissions-on-github
- /github/getting-started-with-github/access-permissions-on-github
- /github/getting-started-with-github/learning-about-github/access-permissions-on-github
-intro: 'While you can grant read/write access to collaborators on a personal repository, members of an organization can have more granular access permissions for the organization''s repositories.'
+intro: 'With roles, you can control who has access to your accounts and resources on {% data variables.product.product_name %} and the level of access each person has.'
versions:
fpt: '*'
ghes: '*'
@@ -18,6 +18,13 @@ topics:
- Accounts
shortTitle: Access permissions
---
+
+## About access permissions on {% data variables.product.prodname_dotcom %}
+
+{% data reusables.organizations.about-roles %}
+
+Roles work differently for different types of accounts. For more information about accounts, see "[Types of {% data variables.product.prodname_dotcom %} accounts](/get-started/learning-about-github/types-of-github-accounts)."
+
## Personal user accounts
A repository owned by a user account has two permission levels: the *repository owner* and *collaborators*. For more information, see "[Permission levels for a user account repository](/articles/permission-levels-for-a-user-account-repository)."
diff --git a/translations/ja-JP/content/get-started/learning-about-github/githubs-products.md b/translations/ja-JP/content/get-started/learning-about-github/githubs-products.md
index fe1f93aaac..c5927d487d 100644
--- a/translations/ja-JP/content/get-started/learning-about-github/githubs-products.md
+++ b/translations/ja-JP/content/get-started/learning-about-github/githubs-products.md
@@ -1,6 +1,6 @@
---
-title: GitHub の製品
-intro: '{% data variables.product.prodname_dotcom %} の商品と価格プランの概要。'
+title: GitHub's products
+intro: 'An overview of {% data variables.product.prodname_dotcom %}''s products and pricing plans.'
redirect_from:
- /articles/github-s-products
- /articles/githubs-products
@@ -18,66 +18,67 @@ topics:
- Desktop
- Security
---
-
## About {% data variables.product.prodname_dotcom %}'s products
-{% data variables.product.prodname_dotcom %}では無償版と有償版の製品をご用意しています。 各製品の料金と機能の全リストは <{% data variables.product.pricing_url %}> に掲載されています。 {% data reusables.products.product-roadmap %}
+{% data variables.product.prodname_dotcom %} offers free and paid products for storing and collaborating on code. Some products apply only to user accounts, while other plans apply only to organization and enterprise accounts. For more information about accounts, see "[Types of {% data variables.product.prodname_dotcom %} accounts](/get-started/learning-about-github/types-of-github-accounts)."
-## ユーザアカウント用の{% data variables.product.prodname_free_user %}
+You can see pricing and a full list of features for each product at <{% data variables.product.pricing_url %}>. {% data reusables.products.product-roadmap %}
-ユーザアカウント用の{% data variables.product.prodname_free_team %}では、完全な機能セットを持つ無制限のパブリックリポジトリ上で無制限のコラボレータと、そして限定された機能セットを持つ無制限のプライベートリポジトリ上で作業ができます。
+## {% data variables.product.prodname_free_user %} for user accounts
-{% data variables.product.prodname_free_user %}では、ユーザアカウントには以下が含まれます。
+With {% data variables.product.prodname_free_team %} for user accounts, you can work with unlimited collaborators on unlimited public repositories with a full feature set, and on unlimited private repositories with a limited feature set.
+
+With {% data variables.product.prodname_free_user %}, your user account includes:
- {% data variables.product.prodname_gcf %}
- {% data variables.product.prodname_dependabot_alerts %}
-- 2 要素認証の強制
-- 2,000 {% data variables.product.prodname_actions %} 分
-- 500MBの{% data variables.product.prodname_registry %}ストレージ
+- Two-factor authentication enforcement
+- 2,000 {% data variables.product.prodname_actions %} minutes
+- 500MB {% data variables.product.prodname_registry %} storage
## {% data variables.product.prodname_pro %}
-ユーザアカウント用の{% data variables.product.prodname_free_user %}で利用できる機能に加え、{% data variables.product.prodname_pro %}には以下が含まれます。
-- メールでの{% data variables.contact.github_support %}
-- 3,000 {% data variables.product.prodname_actions %} 分
-- 2GBの{% data variables.product.prodname_registry %}ストレージ
-- プライベートリポジトリでの高度なツールとインサイト：
- - 必須のプルリクエストレビュー担当者
- - 複数のプルリクエストレビュー担当者
- - 自動リンクのリファレンス
+In addition to the features available with {% data variables.product.prodname_free_user %} for user accounts, {% data variables.product.prodname_pro %} includes:
+- {% data variables.contact.github_support %} via email
+- 3,000 {% data variables.product.prodname_actions %} minutes
+- 2GB {% data variables.product.prodname_registry %} storage
+- Advanced tools and insights in private repositories:
+ - Required pull request reviewers
+ - Multiple pull request reviewers
+ - Auto-linked references
- {% data variables.product.prodname_pages %}
- - Wiki
- - 保護されたブランチ
- - コードオーナー
- - リポジトリインサイトグラフ: パルス、コントリビューター、トラフィック、コミット、コード頻度、ネットワーク、およびフォーク
+ - Wikis
+ - Protected branches
+ - Code owners
+ - Repository insights graphs: Pulse, contributors, traffic, commits, code frequency, network, and forks
-## Organization の {% data variables.product.prodname_free_team %}
+## {% data variables.product.prodname_free_team %} for organizations
-Organizationの{% data variables.product.prodname_free_team %}では、完全な機能セットを持つ無制限のパブリックリポジトリ上で無制限のコラボレータ、あるいは限定された機能セットを持つ無制限のプライベートリポジトリで作業ができます。
+With {% data variables.product.prodname_free_team %} for organizations, you can work with unlimited collaborators on unlimited public repositories with a full feature set, or unlimited private repositories with a limited feature set.
-ユーザアカウント用の{% data variables.product.prodname_free_user %}で利用できる機能に加えて、Organizationの{% data variables.product.prodname_free_team %}には以下が含まれます。
+In addition to the features available with {% data variables.product.prodname_free_user %} for user accounts, {% data variables.product.prodname_free_team %} for organizations includes:
- {% data variables.product.prodname_gcf %}
-- Team ディスカッション
-- グループを管理するための Team アクセスコントロール
-- 2,000 {% data variables.product.prodname_actions %} 分
-- 500MBの{% data variables.product.prodname_registry %}ストレージ
+- Team discussions
+- Team access controls for managing groups
+- 2,000 {% data variables.product.prodname_actions %} minutes
+- 500MB {% data variables.product.prodname_registry %} storage
## {% data variables.product.prodname_team %}
-Organizationの{% data variables.product.prodname_free_team %}で利用できる機能に加えて、{% data variables.product.prodname_team %}には以下が含まれます。
-- メールでの{% data variables.contact.github_support %}
-- 3,000 {% data variables.product.prodname_actions %} 分
-- 2GBの{% data variables.product.prodname_registry %}ストレージ
-- プライベートリポジトリでの高度なツールとインサイト：
- - 必須のプルリクエストレビュー担当者
- - 複数のプルリクエストレビュー担当者
+In addition to the features available with {% data variables.product.prodname_free_team %} for organizations, {% data variables.product.prodname_team %} includes:
+- {% data variables.contact.github_support %} via email
+- 3,000 {% data variables.product.prodname_actions %} minutes
+- 2GB {% data variables.product.prodname_registry %} storage
+- Advanced tools and insights in private repositories:
+ - Required pull request reviewers
+ - Multiple pull request reviewers
- {% data variables.product.prodname_pages %}
- - Wiki
- - 保護されたブランチ
- - コードオーナー
- - リポジトリインサイトグラフ: パルス、コントリビューター、トラフィック、コミット、コード頻度、ネットワーク、およびフォーク
- - ドラフトプルリクエスト
- - Teamのプルリクエストレビュー担当者
- - スケジュールされたリマインダー
+ - Wikis
+ - Protected branches
+ - Code owners
+ - Repository insights graphs: Pulse, contributors, traffic, commits, code frequency, network, and forks
+ - Draft pull requests
+ - Team pull request reviewers
+ - Scheduled reminders
{% ifversion fpt or ghec %}
- The option to enable {% data variables.product.prodname_github_codespaces %}
- Organization owners can enable {% data variables.product.prodname_github_codespaces %} for the organization by setting a spending limit and granting user permissions for members of their organization. For more information, see "[Enabling Codespaces for your organization](/codespaces/managing-codespaces-for-your-organization/enabling-codespaces-for-your-organization)."
@@ -87,25 +88,25 @@ Organizationの{% data variables.product.prodname_free_team %}で利用できる
## {% data variables.product.prodname_enterprise %}
-{% data variables.product.prodname_enterprise %} には、クラウドホストとセルフホストの 2 種類のデプロイメントオプションがあります。
+{% data variables.product.prodname_enterprise %} includes two deployment options: cloud-hosted and self-hosted.
-{% data variables.product.prodname_team %} で利用可能な機能に加えて、{% data variables.product.prodname_enterprise %} には以下が含まれます。
+In addition to the features available with {% data variables.product.prodname_team %}, {% data variables.product.prodname_enterprise %} includes:
- {% data variables.contact.enterprise_support %}
-- 追加のセキュリティ、コンプライアンス、およびデプロイメントコントロール
-- SAML シングルサインオンでの認証
-- SAML または SCIM でのアクセスのプロビジョニング
+- Additional security, compliance, and deployment controls
+- Authentication with SAML single sign-on
+- Access provisioning with SAML or SCIM
- {% data variables.product.prodname_github_connect %}
-- The option to purchase {% data variables.product.prodname_GH_advanced_security %}. 詳しい情報については、「[{% data variables.product.prodname_GH_advanced_security %} について](/github/getting-started-with-github/about-github-advanced-security)」を参照してください。
+- The option to purchase {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[About {% data variables.product.prodname_GH_advanced_security %}](/github/getting-started-with-github/about-github-advanced-security)."
-{% data variables.product.prodname_ghe_cloud %} には次も含まれます:
-- {% data variables.contact.enterprise_support %}。 詳細は「{% data variables.product.prodname_ghe_cloud %} サポート」および「{% data variables.product.prodname_ghe_cloud %} 補遺」を参照してください。
-- 50,000 {% data variables.product.prodname_actions %} 分
-- 50GBの{% data variables.product.prodname_registry %}ストレージ
-- {% data variables.product.prodname_pages %} サイトのアクセス制御。 詳しい情報については、「{% data variables.product.prodname_pages %} サイトの可視性を変更する」を参照してください。
-- 99.9% の月次稼働時間を保証するサービスレベルアグリーメント
+{% data variables.product.prodname_ghe_cloud %} also includes:
+- {% data variables.contact.enterprise_support %}. For more information, see "{% data variables.product.prodname_ghe_cloud %} support" and "{% data variables.product.prodname_ghe_cloud %} Addendum."
+- 50,000 {% data variables.product.prodname_actions %} minutes
+- 50GB {% data variables.product.prodname_registry %} storage
+- Access control for {% data variables.product.prodname_pages %} sites. For more information, see Changing the visibility of your {% data variables.product.prodname_pages %} site"
+- A service level agreement for 99.9% monthly uptime
- The option to configure your enterprise for {% data variables.product.prodname_emus %}, so you can provision and manage members with your identity provider and restrict your member's contributions to just your enterprise. For more information, see "[About {% data variables.product.prodname_emus %}](/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users)."
-- エンタープライズアカウントで複数の {% data variables.product.prodname_dotcom_the_website %} Organization に対してポリシーと請求を一元管理するためのオプション。 詳細は「[Enterprise アカウントについて](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)」を参照してください。
+- The option to centrally manage policy and billing for multiple {% data variables.product.prodname_dotcom_the_website %} organizations with an enterprise account. For more information, see "[About enterprise accounts](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)."
-{% data variables.product.prodname_ghe_cloud %} を評価するためのトライアルを設定できます。 詳しい情報については、「{% data variables.product.prodname_ghe_cloud %} のトライアルを設定する」を参照してください。
+You can set up a trial to evaluate {% data variables.product.prodname_ghe_cloud %}. For more information, see "Setting up a trial of {% data variables.product.prodname_ghe_cloud %}."
-[{% data variables.product.prodname_ghe_server %}](https://enterprise.github.com)の独自インスタンスのホストに関する詳しい情報については、{% data variables.contact.contact_enterprise_sales %}に連絡してください。 {% data reusables.enterprise_installation.request-a-trial %}
+For more information about hosting your own instance of [{% data variables.product.prodname_ghe_server %}](https://enterprise.github.com), contact {% data variables.contact.contact_enterprise_sales %}. {% data reusables.enterprise_installation.request-a-trial %}
diff --git a/translations/ja-JP/content/get-started/learning-about-github/types-of-github-accounts.md b/translations/ja-JP/content/get-started/learning-about-github/types-of-github-accounts.md
index 4981f1858c..568b1834d8 100644
--- a/translations/ja-JP/content/get-started/learning-about-github/types-of-github-accounts.md
+++ b/translations/ja-JP/content/get-started/learning-about-github/types-of-github-accounts.md
@@ -1,6 +1,6 @@
---
title: Types of GitHub accounts
-intro: 'Your user account is your identity on {% data variables.product.product_location %}. Your user account can be a member of any number of organizations.{% ifversion fpt or ghec %} Organizations can belong to enterprise accounts.{% endif %}'
+intro: 'Accounts on {% data variables.product.product_name %} allow you to organize and control access to code.'
redirect_from:
- /manage-multiple-clients
- /managing-clients
@@ -21,73 +21,67 @@ topics:
- Desktop
- Security
---
-{% ifversion fpt or ghec %}
-For a full list of features for each {% data variables.product.product_name %} product, see "[{% data variables.product.prodname_dotcom %}'s products](/github/getting-started-with-github/githubs-products)."
-{% endif %}
-## Personal user accounts
+## About accounts on {% data variables.product.product_name %}
-Every person who uses {% data variables.product.product_location %} has their own user account, which includes:
+With {% data variables.product.product_name %}, you can store and collaborate on code. Accounts allow you to organize and control access to that code. There are three types of accounts on {% data variables.product.product_name %}.
+- Personal accounts
+- Organization accounts
+- Enterprise accounts
-{% ifversion fpt or ghec %}
+Every person who uses {% data variables.product.product_name %} signs into a personal account. An organization account enhances collaboration between multiple personal accounts, and {% ifversion fpt or ghec %}an enterprise account{% else %}the enterprise account for {% data variables.product.product_location %}{% endif %} allows central management of multiple organizations.
-- Unlimited public and private repositories with {% data variables.product.prodname_free_user %}
-- Unlimited collaborators with {% data variables.product.prodname_free_user %}
-- Additional features for private repositories with {% data variables.product.prodname_pro %}
-- Ability to [invite repository collaborators](/articles/inviting-collaborators-to-a-personal-repository)
+## Personal accounts
-{% else %}
+Every person who uses {% data variables.product.product_location %} signs into a personal account. Your personal account is your identity on {% data variables.product.product_location %} and has a username and profile. For example, see [@octocat's profile](https://github.com/octocat).
-- Unlimited repositories and [collaborators](/articles/permission-levels-for-a-user-account-repository)
-- Ability to [add unlimited repository collaborators](/articles/inviting-collaborators-to-a-personal-repository)
+Your personal account can own resources such as repositories, packages, and projects. Any time you take any action on {% data variables.product.product_location %}, such as creating an issue or reviewing a pull request, the action is attributed to your personal account.
-{% endif %}
-
-{% ifversion fpt or ghec %}
+{% ifversion fpt or ghec %}Each personal account uses either {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %}. All personal accounts can own an unlimited number of public and private repositories, with an unlimited number of collaborators on those repositories. If you use {% data variables.product.prodname_free_user %}, private repositories owned by your personal account have a limited feature set. You can upgrade to {% data variables.product.prodname_pro %} to get a full feature set for private repositories. For more information, see "[{% data variables.product.prodname_dotcom %}'s products](/articles/githubs-products)." {% else %}You can create an unlimited number of repositories owned by your personal account, with an unlimited number of collaborators on those repositories.{% endif %}
{% tip %}
-**Tips**:
-
-- You can use one account for multiple purposes, such as for personal use and business use. We do not recommend creating more than one account. For more information, see "[Merging multiple user accounts](/articles/merging-multiple-user-accounts)."
-- User accounts are intended for humans, but you can give one to a robot, such as a continuous integration bot, if necessary.
+**Tip**: Personal accounts are intended for humans, but you can create accounts to automate activity on {% data variables.product.product_name %}. This type of account is called a machine user. For example, you can create a machine user account to automate continuous integration (CI) workflows.
{% endtip %}
-{% else %}
-
-{% tip %}
-
-**Tip**: User accounts are intended for humans, but you can give one to a robot, such as a continuous integration bot, if necessary.
-
-{% endtip %}
-
-{% endif %}
-
{% ifversion fpt or ghec %}
-### {% data variables.product.prodname_emus %}
-
-With {% data variables.product.prodname_emus %}, instead of using your personal account, members of an {% data variables.product.prodname_emu_enterprise %} are provisioned accounts using the enterprise's identity provider (IdP). {% data variables.product.prodname_managed_users_caps %} authenticate using their IdP instead of a {% data variables.product.prodname_dotcom_the_website %} username and password.
-
-{% data variables.product.prodname_managed_users_caps %} can only interact with users, repositories, and organizations that are part of their enterprise. {% data variables.product.prodname_managed_users_caps %} have read-only access to the rest of {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[About {% data variables.product.prodname_emus %}](/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
+Most people will use one personal account for all their work on {% data variables.product.prodname_dotcom_the_website %}, including both open source projects and paid employment. If you're currently using more than one personal account that you created for yourself, we suggest combining the accounts. For more information, see "[Merging multiple user accounts](/articles/merging-multiple-user-accounts)."
{% endif %}
## Organization accounts
-Organizations are shared accounts where groups of people can collaborate across many projects at once. Owners and administrators can manage member access to the organization's data and projects with sophisticated security and administrative features.
+Organizations are shared accounts where an unlimited number of people can collaborate across many projects at once.
-{% data reusables.organizations.organizations_include %}
+Like personal accounts, organizations can own resources such as repositories, packages, and projects. However, you cannot sign into an organization. Instead, each person signs into their own personal account, and any actions the person takes on organization resources are attributed to their personal account. Each personal account can be a member of multiple organizations.
-{% ifversion fpt or ghec %}
+The personal accounts within an organization can be given different roles in the organization, which grant different levels of access to the organization and its data. All members can collaborate with each other in repositories and projects, but only organization owners and security managers can manage the settings for the organization and control access to the organization's data with sophisticated security and administrative features. For more information, see "[Roles in an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)" and "[Keeping your organization secure](/organizations/keeping-your-organization-secure)."
+
+
+
+{% ifversion fpt or ghec %}
+Even if you're a member of an organization that uses SAML single sign-on, you will still sign into your own personal account on {% data variables.product.prodname_dotcom_the_website %}, and that personal account will be linked to your identity in your organization's identity provider (IdP). For more information, see "[About authentication with SAML single sign-on](/enterprise-cloud@latest/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation{% else %}."{% endif %}
+
+However, if you're a member of an enterprise that uses {% data variables.product.prodname_emus %}, instead of using a personal account that you created, a new account will be provisioned for you by the enterprise's IdP. To access any organizations owned by that enterprise, you must authenticate using their IdP instead of a {% data variables.product.prodname_dotcom_the_website %} username and password. For more information, see "[About {% data variables.product.prodname_emus %}](/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
+{% endif %}
+
+You can also create nested sub-groups of organization members called teams, to reflect your group's structure and simplify access management. For more information, see "[About teams](/organizations/organizing-members-into-teams/about-teams)."
+
+{% data reusables.organizations.organization-plans %}
+
+For more information about all the features of organizations, see "[About organizations](/organizations/collaborating-with-groups-in-organizations/about-organizations)."
## Enterprise accounts
-With enterprise accounts, you can centrally manage policy and billing for multiple {% data variables.product.prodname_dotcom_the_website %} organizations. {% data reusables.gated-features.enterprise-accounts %}
-
+{% ifversion fpt %}
+{% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %} include enterprise accounts, which allow administrators to centrally manage policy and billing for multiple organizations and enable innersourcing between the organizations. For more information, see "[About enterprise accounts](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)" in the {% data variables.product.prodname_ghe_cloud %} documentation.
+{% elsif ghec %}
+Enterprise accounts allow central policy management and billing for multiple organizations. You can use your enterprise account to centrally manage policy and billing. Unlike organizations, enterprise accounts cannot directly own resources like repositories, packages, or projects. These resources are owned by organizations within the enterprise account instead. For more information, see "[About enterprise accounts](/admin/overview/about-enterprise-accounts)."
+{% elsif ghes or ghae %}
+Your enterprise account is a collection of all the organizations {% ifversion ghae %}owned by{% elsif ghes %}on{% endif %} {% data variables.product.product_location %}. You can use your enterprise account to centrally manage policy and billing. Unlike organizations, enterprise accounts cannot directly own resources like repositories, packages, or projects. These resources are owned by organizations within the enterprise account instead. For more information, see "[About enterprise accounts](/admin/overview/about-enterprise-accounts)."
{% endif %}
## Further reading
-{% ifversion fpt or ghec %}- "[Signing up for a new {% data variables.product.prodname_dotcom %} account](/articles/signing-up-for-a-new-github-account)"
-- "[{% data variables.product.prodname_dotcom %}'s products](/articles/githubs-products)"{% endif %}
+{% ifversion fpt or ghec %}- "[Signing up for a new {% data variables.product.prodname_dotcom %} account](/articles/signing-up-for-a-new-github-account)"{% endif %}
- "[Creating a new organization account](/articles/creating-a-new-organization-account)"
diff --git a/translations/ja-JP/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md b/translations/ja-JP/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md
index cfe1727e12..0a60c0a9d2 100644
--- a/translations/ja-JP/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md
+++ b/translations/ja-JP/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md
@@ -19,12 +19,18 @@ shortTitle: Enterprise Cloud trial
## About {% data variables.product.prodname_ghe_cloud %}
-{% data reusables.organizations.about-organizations %}
+{% data variables.product.prodname_ghe_cloud %} is a plan for large businesses or teams who collaborate on {% data variables.product.prodname_dotcom_the_website %}.
+
+{% data reusables.organizations.about-organizations %} For more information about accounts, see "[Types of {% data variables.product.prodname_dotcom %} accounts](/get-started/learning-about-github/types-of-github-accounts)."
You can use organizations for free with {% data variables.product.prodname_free_team %}, which includes limited features. For additional features, such as SAML single sign-on (SSO), access control for {% data variables.product.prodname_pages %}, and included {% data variables.product.prodname_actions %} minutes, you can upgrade to {% data variables.product.prodname_ghe_cloud %}. For a detailed list of the features available with {% data variables.product.prodname_ghe_cloud %}, see our [Pricing](https://github.com/pricing) page.
{% data reusables.saml.saml-accounts %} For more information, see "[About identity and access management with SAML single sign-on](/enterprise-cloud@latest/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on){% ifversion not ghec %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
+{% data reusables.enterprise-accounts.emu-short-summary %}
+
+{% data variables.product.prodname_emus %} is not part of the free trial of {% data variables.product.prodname_ghe_cloud %}. If you're interested in {% data variables.product.prodname_emus %}, please contact [{% data variables.product.prodname_dotcom %}'s Sales team](https://enterprise.github.com/contact).
+
{% data reusables.products.which-product-to-use %}
## About trials of {% data variables.product.prodname_ghe_cloud %}
diff --git a/translations/ja-JP/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md b/translations/ja-JP/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md
index 3388b07d27..d20a58f745 100644
--- a/translations/ja-JP/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md
+++ b/translations/ja-JP/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md
@@ -1,7 +1,7 @@
---
-title: 新しい GitHub アカウントへのサインアップ
-shortTitle: 新しい GitHub アカウントへのサインアップ
-intro: '{% data variables.product.company_short %} は、人々が協力して作業するチームのために個人および Organization のユーザアカウントを提供します。'
+title: Signing up for a new GitHub account
+shortTitle: Sign up for a new GitHub account
+intro: '{% data variables.product.company_short %} offers user accounts for individuals and organizations for teams of people working together.'
redirect_from:
- /articles/signing-up-for-a-new-github-account
- /github/getting-started-with-github/signing-up-for-a-new-github-account
@@ -13,15 +13,19 @@ topics:
- Accounts
---
-アカウントの種類と製品の詳しい情報については、「[{% data variables.product.prodname_dotcom %}アカウントの種類](/articles/types-of-github-accounts)」および「[{% data variables.product.company_short %} の製品](/articles/github-s-products)」を参照してください。
+## About new accounts on {% data variables.product.prodname_dotcom_the_website %}
+
+You can create a personal account, which serves as your identity on {% data variables.product.prodname_dotcom_the_website %}, or an organization, which allows multiple personal accounts to collaborate across multiple projects. For more information about account types, see "[Types of {% data variables.product.prodname_dotcom %} accounts](/get-started/learning-about-github/types-of-github-accounts)."
+
+When you create a personal account or organization, you must select a billing plan for the account. For more information, see "[{% data variables.product.company_short %}'s products](/get-started/learning-about-github/githubs-products)."
+
+## Signing up for a new account
{% data reusables.accounts.create-account %}
-1. プロンプトに従って、個人アカウントまたは Organization を作成してください。
+1. Follow the prompts to create your personal account or organization.
-## 次のステップ
+## Next steps
-- 「[メールアドレスを検証する](/articles/verifying-your-email-address)」
-- 「[2 要素認証を設定する](/articles/configuring-two-factor-authentication)」
-- 「[プロフィールに略歴を追加する](/articles/adding-a-bio-to-your-profile)」
-- 「[Organization を作成する](/articles/creating-a-new-organization-from-scratch)」
-- `github/roadmap` リポジトリの [ {% data variables.product.prodname_roadmap %} ]({% data variables.product.prodname_roadmap_link %})
+- "[Verify your email address](/articles/verifying-your-email-address)"
+- "[Creating an enterprise account](/enterprise-cloud@latest/admin/overview/creating-an-enterprise-account)"{% ifversion fpt %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}
+- [ {% data variables.product.prodname_roadmap %} ]( {% data variables.product.prodname_roadmap_link %} ) in the `github/roadmap` repository
diff --git a/translations/ja-JP/content/graphql/reference/mutations.md b/translations/ja-JP/content/graphql/reference/mutations.md
index 98b7fe091f..73f190ae96 100644
--- a/translations/ja-JP/content/graphql/reference/mutations.md
+++ b/translations/ja-JP/content/graphql/reference/mutations.md
@@ -1,5 +1,5 @@
---
-title: ミューテーション
+title: Mutations
redirect_from:
- /v4/mutation
- /v4/reference/mutation
@@ -12,12 +12,11 @@ topics:
- API
---
-## ミューテーションについて
+## About mutations
-すべてのGraphQLスキーマは、クエリとミューテーションの両方についてルート型を持っています。 [ミューテーション型](https://graphql.github.io/graphql-spec/June2018/#sec-Type-System)は、サーバー上のデータを変更するGraphQLの操作を定義します。 これは、`POST`、`PATCH`、`DELETE`といったHTTPのメソッドを実行するのに似ています。
+Every GraphQL schema has a root type for both queries and mutations. The [mutation type](https://graphql.github.io/graphql-spec/June2018/#sec-Type-System) defines GraphQL operations that change data on the server. It is analogous to performing HTTP verbs such as `POST`, `PATCH`, and `DELETE`.
-詳しい情報については「[ミューテーションについて](/graphql/guides/forming-calls-with-graphql#about-mutations)」を参照してください。
+For more information, see "[About mutations](/graphql/guides/forming-calls-with-graphql#about-mutations)."
-{% for item in graphql.schemaForCurrentVersion.mutations %}
- {% include graphql-mutation %}
-{% endfor %}
+
+
diff --git a/translations/ja-JP/content/organizations/collaborating-with-groups-in-organizations/about-organizations.md b/translations/ja-JP/content/organizations/collaborating-with-groups-in-organizations/about-organizations.md
index 23f1ee5dcd..d5073f08ca 100644
--- a/translations/ja-JP/content/organizations/collaborating-with-groups-in-organizations/about-organizations.md
+++ b/translations/ja-JP/content/organizations/collaborating-with-groups-in-organizations/about-organizations.md
@@ -1,6 +1,6 @@
---
-title: Organizationについて
-intro: Organizationは、企業やオープンソースプロジェクトが多くのプロジェクトにわたって一度にコラボレーションできる共有アカウントです。 オーナーと管理者は、Organizationのデータとプロジェクトへのメンバーのアクセスを、洗練されたセキュリティ及び管理機能で管理できます。
+title: About organizations
+intro: Organizations are shared accounts where businesses and open-source projects can collaborate across many projects at once. Owners and administrators can manage member access to the organization's data and projects with sophisticated security and administrative features.
redirect_from:
- /articles/about-organizations
- /github/setting-up-and-managing-organizations-and-teams/about-organizations
@@ -14,25 +14,25 @@ topics:
- Teams
---
-{% data reusables.organizations.about-organizations %}
+{% data reusables.organizations.about-organizations %} For more information about account types, see "[Types of {% data variables.product.prodname_dotcom %} accounts](/get-started/learning-about-github/types-of-github-accounts)."
-{% data reusables.organizations.organizations_include %}
+{% data reusables.organizations.organizations_include %}
-{% data reusables.organizations.org-ownership-recommendation %}詳細は、「[Organization の所有権の継続性を管理する](/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization)」を参照してください。
+{% data reusables.organizations.org-ownership-recommendation %} For more information, see "[Maintaining ownership continuity for your organization](/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization)."
{% ifversion fpt or ghec %}
-## Organization と Enterprise アカウント
+## Organizations and enterprise accounts
Enterprise accounts are a feature of {% data variables.product.prodname_ghe_cloud %} that allow owners to centrally manage policy and billing for multiple organizations.
-enterprise アカウントに属する Organization では、支払いは enterprise アカウントのレベルで管理され、Organization のレベルでは支払い設定は利用できません。 Enterprise のオーナーは、Enterprise アカウントですべての Organization に対するポリシーを設定することも、Organization のオーナーに Organization のレベルでポリシーを設定することを許可することもできます。 Organization のオーナーは、Enterprise アカウントのレベルで Organization に強制された設定を変更することはできません。 Organization のポリシーや設定について質問がある場合は Enterprise アカウントのオーナーに問い合わせてください。
+For organizations that belong to an enterprise account, billing is managed at the enterprise account level, and billing settings are not available at the organization level. Enterprise owners can set policy for all organizations in the enterprise account or allow organization owners to set the policy at the organization level. Organization owners cannot change settings enforced for your organization at the enterprise account level. If you have questions about a policy or setting for your organization, contact the owner of your enterprise account.
{% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[Creating an enterprise account]({% ifversion fpt %}/enterprise-cloud@latest{% endif %}/admin/overview/creating-an-enterprise-account){% ifversion ghec %}."{% else %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %}
{% data reusables.enterprise-accounts.invite-organization %}
-## Organization の利用規約とデータ保護
+## Terms of service and data protection for organizations
-会社、非営利団体、グループなどは、Organization として標準の利用規約あるいは企業向け利用規約に合意できます。 詳細は「[企業向け利用規約にアップグレードする](/articles/upgrading-to-the-corporate-terms-of-service)」を参照してください。
+An entity, such as a company, non-profit, or group, can agree to the Standard Terms of Service or the Corporate Terms of Service for their organization. For more information, see "[Upgrading to the Corporate Terms of Service](/articles/upgrading-to-the-corporate-terms-of-service)."
{% endif %}
diff --git a/translations/ja-JP/content/repositories/creating-and-managing-repositories/about-repositories.md b/translations/ja-JP/content/repositories/creating-and-managing-repositories/about-repositories.md
index 46012a30d4..57a56440e4 100644
--- a/translations/ja-JP/content/repositories/creating-and-managing-repositories/about-repositories.md
+++ b/translations/ja-JP/content/repositories/creating-and-managing-repositories/about-repositories.md
@@ -61,7 +61,7 @@ When you create a repository owned by your user account, the repository is alway
- Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members.
{%- elsif ghes %}
- If {% data variables.product.product_location %} is not in private mode or behind a firewall, public repositories are accessible to everyone on the internet. Otherwise, public repositories are available to everyone using {% data variables.product.product_location %}, including outside collaborators.
-- Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members. Internal repositories are accessible to all enterprise members.
+- Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members.
{%- elsif ghae %}
- Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members.
{%- endif %}
diff --git a/translations/ja-JP/content/rest/guides/traversing-with-pagination.md b/translations/ja-JP/content/rest/guides/traversing-with-pagination.md
index 91595eb798..36400d1399 100644
--- a/translations/ja-JP/content/rest/guides/traversing-with-pagination.md
+++ b/translations/ja-JP/content/rest/guides/traversing-with-pagination.md
@@ -263,4 +263,4 @@ puts "The next page link is #{next_page_href}"
[octokit.rb]: https://github.com/octokit/octokit.rb
[personal token]: /articles/creating-an-access-token-for-command-line-use
[hypermedia-relations]: https://github.com/octokit/octokit.rb#pagination
-[listing commits]: /rest/reference/repos#list-commits
+[listing commits]: /rest/reference/commits#list-commits
diff --git a/translations/ja-JP/content/rest/guides/working-with-comments.md b/translations/ja-JP/content/rest/guides/working-with-comments.md
index 3ac0c6f348..371054556f 100644
--- a/translations/ja-JP/content/rest/guides/working-with-comments.md
+++ b/translations/ja-JP/content/rest/guides/working-with-comments.md
@@ -1,6 +1,6 @@
---
-title: コメントを扱う
-intro: REST API を使用すると、プルリクエスト、Issue、およびコミットにある、コメントにアクセスして管理できます。
+title: Working with comments
+intro: 'Using the REST API, you can access and manage comments in your pull requests, issues, or commits.'
redirect_from:
- /guides/working-with-comments/
- /v3/guides/working-with-comments
@@ -15,17 +15,27 @@ topics:
-各プルリクエストに対して、{% data variables.product.product_name %} は 3 種類のコメント表示を提供しています。プルリクエスト全体に対する[プルリクエストのコメント][PR comment]、プルリクエスト内の[特定行のコメント][PR line comment]、そしてプルリクエスト内の[特定のコメントへのコメント][commit comment]です。
+For any Pull Request, {% data variables.product.product_name %} provides three kinds of comment views:
+[comments on the Pull Request][PR comment] as a whole, [comments on a specific line][PR line comment] within the Pull Request,
+and [comments on a specific commit][commit comment] within the Pull Request.
-Each of these types of comments goes through a different portion of the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API. このガイドでは、それぞれにアクセスして操作する方法を説明します。 各例では、"octocat" リポジトリで作成した、[このサンプルのプルリクエスト][sample PR]を使用します。 いつもと同様、サンプルは [platform-samples リポジトリ][platform-samples]にあります。
+Each of these types of comments goes through a different portion of the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API.
+In this guide, we'll explore how you can access and manipulate each one. For every
+example, we'll be using [this sample Pull Request made][sample PR] on the "octocat"
+repository. As always, samples can be found in [our platform-samples repository][platform-samples].
-## プルリクエストのコメント
+## Pull Request Comments
-プルリクエストのコメントにアクセスするには、[Issues API][issues] を経由します。 最初はこれを意外に思うかもしれません。 しかし、プルリクエストがコード付きの Issue に過ぎないことさえ理解すれば、プルリクエストにコメントを作成するため Issues API を使うこともうなずけるでしょう。
+To access comments on a Pull Request, you'll go through [the Issues API][issues].
+This may seem counterintuitive at first. But once you understand that a Pull
+Request is just an Issue with code, it makes sense to use the Issues API to
+create comments on a Pull Request.
-ここでは [Octokit.rb][octokit.rb] を使って Ruby スクリプトを作成し、プルリクエストのコメントをフェッチする方法を示します。 また、[個人アクセストークン][personal token]の作成もおすすめします。
+We'll demonstrate fetching Pull Request comments by creating a Ruby script using
+[Octokit.rb][octokit.rb]. You'll also want to create a [personal access token][personal token].
-Octokit.rb を使ってプルリクエストからコメントにアクセスを始めるには、以下のコードが役立つでしょう。
+The following code should help you get started accessing comments from a Pull Request
+using Octokit.rb:
``` ruby
require 'octokit'
@@ -43,13 +53,18 @@ client.issue_comments("octocat/Spoon-Knife", 1176).each do |comment|
end
```
-ここでは、コメントを取得するため Issues API を 呼び出し (`issue_comments`)、取得したいコメントのリポジトリ名 (`octocat/Spoon-Knife`) とプルリクエスト ID (`1176`) の両方を指定しています。 その後は、コメントを反復処理して、各コメントの情報を取得しているだけです。
+Here, we're specifically calling out to the Issues API to get the comments (`issue_comments`),
+providing both the repository's name (`octocat/Spoon-Knife`), and the Pull Request ID
+we're interested in (`1176`). After that, it's simply a matter of iterating through
+the comments to fetch information about each one.
-## 行につけるプルリクエストのコメント
+## Pull Request Comments on a Line
-diff ビュー内では、プルリクエスト内の一つの変更について、特定の側面からディスカッションを開始できます。 これらのコメントは、変更されたファイル内の個々の行について書き込まれます。 このディスカッションのエンドポイントURLは、[Pull Request Review API][PR Review API] から取得されます。
+Within the diff view, you can start a discussion on a particular aspect of a singular
+change made within the Pull Request. These comments occur on the individual lines
+within a changed file. The endpoint URL for this discussion comes from [the Pull Request Review API][PR Review API].
-以下のコードは、指定したプルリクエスト番号のファイルにあるプルリクエストのコメントすべてをフェッチします。
+The following code fetches all the Pull Request comments made on files, given a single Pull Request number:
``` ruby
require 'octokit'
@@ -69,13 +84,19 @@ client.pull_request_comments("octocat/Spoon-Knife", 1176).each do |comment|
end
```
-上の例と非常に似ていることにお気づきでしょう。 このビューとプルリクエストのコメントとの違いは、会話の焦点にあります。 プルリクエストに対するコメントは、コードの全体的な方向性についてのディスカッションやアイデアを扱うべきです。 プルリクエストのレビューの一環として行うコメントは、ファイルで特定の変更が実装された方法について特に扱うべきです。
+You'll notice that it's incredibly similar to the example above. The difference
+between this view and the Pull Request comment is the focus of the conversation.
+A comment made on a Pull Request should be reserved for discussion or ideas on
+the overall direction of the code. A comment made as part of a Pull Request review should
+deal specifically with the way a particular change was implemented within a file.
-## コミットのコメント
+## Commit Comments
-最後のタイプのコメントは、特に個々のコミットで発生します。 このため、[コミットのコメント API][commit comment API] を使用します。
+The last type of comments occur specifically on individual commits. For this reason,
+they make use of [the commit comment API][commit comment API].
-コミットのコメントを取得するには、コミットの SHA1 を使用します。 言い換えれば、プルリクエストに関する識別子は全く使用しません。 次に例を示します。
+To retrieve the comments on a commit, you'll want to use the SHA1 of the commit.
+In other words, you won't use any identifier related to the Pull Request. Here's an example:
``` ruby
require 'octokit'
@@ -93,7 +114,8 @@ client.commit_comments("octocat/Spoon-Knife", "cbc28e7c8caee26febc8c013b0adfb97a
end
```
-この API 呼び出しは、単一の行コメントと、コミット全体に対するコメントを取得することに注目してください。
+Note that this API call will retrieve single line comments, as well as comments made
+on the entire commit.
[PR comment]: https://github.com/octocat/Spoon-Knife/pull/1176#issuecomment-24114792
[PR line comment]: https://github.com/octocat/Spoon-Knife/pull/1176#discussion_r6252889
@@ -104,4 +126,4 @@ end
[personal token]: /articles/creating-an-access-token-for-command-line-use
[octokit.rb]: https://github.com/octokit/octokit.rb
[PR Review API]: /rest/reference/pulls#comments
-[commit comment API]: /rest/reference/repos#get-a-commit-comment
+[commit comment API]: /rest/reference/commits#get-a-commit-comment
diff --git a/translations/ja-JP/content/rest/overview/api-previews.md b/translations/ja-JP/content/rest/overview/api-previews.md
index 36d03bec29..7cd8e65bb0 100644
--- a/translations/ja-JP/content/rest/overview/api-previews.md
+++ b/translations/ja-JP/content/rest/overview/api-previews.md
@@ -165,7 +165,7 @@ GitHub App Manifests allow people to create preconfigured GitHub Apps. See "[Cre
## Deployment statuses
-You can now update the `environment` of a [deployment status](/rest/reference/repos#create-a-deployment-status) and use the `in_progress` and `queued` states. When you create deployment statuses, you can now use the `auto_inactive` parameter to mark old `production` deployments as `inactive`.
+You can now update the `environment` of a [deployment status](/rest/reference/deployments#create-a-deployment-status) and use the `in_progress` and `queued` states. When you create deployment statuses, you can now use the `auto_inactive` parameter to mark old `production` deployments as `inactive`.
**Custom media type:** `flash-preview`
**Announced:** [2018-10-16](https://developer.github.com/changes/2018-10-16-deployments-environments-states-and-auto-inactive-updates/)
diff --git a/translations/ja-JP/content/rest/reference/branches.md b/translations/ja-JP/content/rest/reference/branches.md
new file mode 100644
index 0000000000..60a187a93b
--- /dev/null
+++ b/translations/ja-JP/content/rest/reference/branches.md
@@ -0,0 +1,30 @@
+---
+title: Branches
+intro: 'The branches API allows you to modify branches and their protection settings.'
+allowTitleToDifferFromFilename: true
+versions:
+ fpt: '*'
+ ghes: '*'
+ ghae: '*'
+ ghec: '*'
+topics:
+ - API
+miniTocMaxHeadingLevel: 3
+---
+
+## Branches
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'branches' %}{% include rest_operation %}{% endif %}
+{% endfor %}
+
+## Merging
+
+The Repo Merging API supports merging branches in a repository. This accomplishes
+essentially the same thing as merging one branch into another in a local repository
+and then pushing to {% data variables.product.product_name %}. The benefit is that the merge is done on the server side and a local repository is not needed. This makes it more appropriate for automation and other tools where maintaining local repositories would be cumbersome and inefficient.
+
+The authenticated user will be the author of any merges done through this endpoint.
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'merging' %}{% include rest_operation %}{% endif %}
+{% endfor %}
\ No newline at end of file
diff --git a/translations/ja-JP/content/rest/reference/collaborators.md b/translations/ja-JP/content/rest/reference/collaborators.md
new file mode 100644
index 0000000000..c4842b7049
--- /dev/null
+++ b/translations/ja-JP/content/rest/reference/collaborators.md
@@ -0,0 +1,35 @@
+---
+title: Collaborators
+intro: 'The collaborators API allows you to add, invite, and remove collaborators from a repository.'
+allowTitleToDifferFromFilename: true
+versions:
+ fpt: '*'
+ ghes: '*'
+ ghae: '*'
+ ghec: '*'
+topics:
+ - API
+miniTocMaxHeadingLevel: 3
+---
+
+## Collaborators
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'collaborators' %}{% include rest_operation %}{% endif %}
+{% endfor %}
+
+## Invitations
+
+The Repository Invitations API allows users or external services to invite other users to collaborate on a repo. The invited users (or external services on behalf of invited users) can choose to accept or decline the invitations.
+
+Note that the `repo:invite` [OAuth scope](/developers/apps/scopes-for-oauth-apps) grants targeted
+access to invitations **without** also granting access to repository code, while the
+`repo` scope grants permission to code as well as invitations.
+
+### Invite a user to a repository
+
+Use the API endpoint for adding a collaborator. For more information, see "[Add a repository collaborator](/rest/reference/collaborators#add-a-repository-collaborator)."
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'invitations' %}{% include rest_operation %}{% endif %}
+{% endfor %}
\ No newline at end of file
diff --git a/translations/ja-JP/content/rest/reference/commits.md b/translations/ja-JP/content/rest/reference/commits.md
new file mode 100644
index 0000000000..79591a09a6
--- /dev/null
+++ b/translations/ja-JP/content/rest/reference/commits.md
@@ -0,0 +1,68 @@
+---
+title: Commits
+intro: 'The commits API allows you to retrieve information and commits, create commit comments, and create commit statuses.'
+allowTitleToDifferFromFilename: true
+versions:
+ fpt: '*'
+ ghes: '*'
+ ghae: '*'
+ ghec: '*'
+topics:
+ - API
+miniTocMaxHeadingLevel: 3
+---
+
+## Commits
+
+The Repo Commits API supports listing, viewing, and comparing commits in a repository.
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'commits' %}{% include rest_operation %}{% endif %}
+{% endfor %}
+
+## Commit comments
+
+### Custom media types for commit comments
+
+These are the supported media types for commit comments. You can read more
+about the use of media types in the API [here](/rest/overview/media-types).
+
+ application/vnd.github-commitcomment.raw+json
+ application/vnd.github-commitcomment.text+json
+ application/vnd.github-commitcomment.html+json
+ application/vnd.github-commitcomment.full+json
+
+For more information, see "[Custom media types](/rest/overview/media-types)."
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'comments' %}{% include rest_operation %}{% endif %}
+{% endfor %}
+
+## Commit statuses
+
+The status API allows external services to mark commits with an `error`,
+`failure`, `pending`, or `success` state, which is then reflected in pull requests
+involving those commits.
+
+Statuses can also include an optional `description` and `target_url`, and
+we highly recommend providing them as they make statuses much more
+useful in the GitHub UI.
+
+As an example, one common use is for continuous integration
+services to mark commits as passing or failing builds using status. The
+`target_url` would be the full URL to the build output, and the
+`description` would be the high level summary of what happened with the
+build.
+
+Statuses can include a `context` to indicate what service is providing that status.
+For example, you may have your continuous integration service push statuses with a context of `ci`, and a security audit tool push statuses with a context of `security`. You can
+then use the [Get the combined status for a specific reference](/rest/reference/commits#get-the-combined-status-for-a-specific-reference) to retrieve the whole status for a commit.
+
+Note that the `repo:status` [OAuth scope](/developers/apps/scopes-for-oauth-apps) grants targeted access to statuses **without** also granting access to repository code, while the
+`repo` scope grants permission to code as well as statuses.
+
+If you are developing a GitHub App and want to provide more detailed information about an external service, you may want to use the [Checks API](/rest/reference/checks).
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'statuses' %}{% include rest_operation %}{% endif %}
+{% endfor %}
\ No newline at end of file
diff --git a/translations/ja-JP/content/rest/reference/deployments.md b/translations/ja-JP/content/rest/reference/deployments.md
new file mode 100644
index 0000000000..1170b20485
--- /dev/null
+++ b/translations/ja-JP/content/rest/reference/deployments.md
@@ -0,0 +1,90 @@
+---
+title: Deployments
+intro: 'The deployments API allows you to create and delete deploy keys, deployments, and deployment environments.'
+allowTitleToDifferFromFilename: true
+versions:
+ fpt: '*'
+ ghes: '*'
+ ghae: '*'
+ ghec: '*'
+topics:
+ - API
+miniTocMaxHeadingLevel: 3
+---
+
+## Deploy keys
+
+{% data reusables.repositories.deploy-keys %}
+
+Deploy keys can either be setup using the following API endpoints, or by using GitHub. To learn how to set deploy keys up in GitHub, see "[Managing deploy keys](/developers/overview/managing-deploy-keys)."
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'keys' %}{% include rest_operation %}{% endif %}
+{% endfor %}
+
+## Deployments
+
+Deployments are requests to deploy a specific ref (branch, SHA, tag). GitHub dispatches a [`deployment` event](/developers/webhooks-and-events/webhook-events-and-payloads#deployment) that external services can listen for and act on when new deployments are created. Deployments enable developers and organizations to build loosely coupled tooling around deployments, without having to worry about the implementation details of delivering different types of applications (e.g., web, native).
+
+Deployment statuses allow external services to mark deployments with an `error`, `failure`, `pending`, `in_progress`, `queued`, or `success` state that systems listening to [`deployment_status` events](/developers/webhooks-and-events/webhook-events-and-payloads#deployment_status) can consume.
+
+Deployment statuses can also include an optional `description` and `log_url`, which are highly recommended because they make deployment statuses more useful. The `log_url` is the full URL to the deployment output, and
+the `description` is a high-level summary of what happened with the deployment.
+
+GitHub dispatches `deployment` and `deployment_status` events when new deployments and deployment statuses are created. These events allows third-party integrations to receive respond to deployment requests and update the status of a deployment as progress is made.
+
+Below is a simple sequence diagram for how these interactions would work.
+
+```
++---------+ +--------+ +-----------+ +-------------+
+| Tooling | | GitHub | | 3rd Party | | Your Server |
++---------+ +--------+ +-----------+ +-------------+
+ | | | |
+ | Create Deployment | | |
+ |--------------------->| | |
+ | | | |
+ | Deployment Created | | |
+ |<---------------------| | |
+ | | | |
+ | | Deployment Event | |
+ | |---------------------->| |
+ | | | SSH+Deploys |
+ | | |-------------------->|
+ | | | |
+ | | Deployment Status | |
+ | |<----------------------| |
+ | | | |
+ | | | Deploy Completed |
+ | | |<--------------------|
+ | | | |
+ | | Deployment Status | |
+ | |<----------------------| |
+ | | | |
+```
+
+Keep in mind that GitHub is never actually accessing your servers. It's up to your third-party integration to interact with deployment events. Multiple systems can listen for deployment events, and it's up to each of those systems to decide whether they're responsible for pushing the code out to your servers, building native code, etc.
+
+Note that the `repo_deployment` [OAuth scope](/developers/apps/scopes-for-oauth-apps) grants targeted access to deployments and deployment statuses **without** granting access to repository code, while the {% ifversion not ghae %}`public_repo` and{% endif %}`repo` scopes grant permission to code as well.
+
+
+### Inactive deployments
+
+When you set the state of a deployment to `success`, then all prior non-transient, non-production environment deployments in the same repository with the same environment name will become `inactive`. To avoid this, you can set `auto_inactive` to `false` when creating the deployment status.
+
+You can communicate that a transient environment no longer exists by setting its `state` to `inactive`. Setting the `state` to `inactive` shows the deployment as `destroyed` in {% data variables.product.prodname_dotcom %} and removes access to it.
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'deployments' %}{% include rest_operation %}{% endif %}
+{% endfor %}
+
+{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
+## Environments
+
+The Environments API allows you to create, configure, and delete environments. For more information about environments, see "[Using environments for deployment](/actions/deployment/using-environments-for-deployment)." To manage environment secrets, see "[Secrets](/rest/reference/actions#secrets)."
+
+{% data reusables.gated-features.environments %}
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'environments' %}{% include rest_operation %}{% endif %}
+{% endfor %}
+{% endif %}
\ No newline at end of file
diff --git a/translations/ja-JP/content/rest/reference/index.md b/translations/ja-JP/content/rest/reference/index.md
index 322124750b..eb8dc90939 100644
--- a/translations/ja-JP/content/rest/reference/index.md
+++ b/translations/ja-JP/content/rest/reference/index.md
@@ -1,7 +1,7 @@
---
-title: リファレンス
-shortTitle: リファレンス
-intro: GitHub RESTのAPIで使用できるリソースについては、リファレンスドキュメントを参照してください。
+title: Reference
+shortTitle: Reference
+intro: View reference documentation to learn about the resources available in the GitHub REST API.
versions:
fpt: '*'
ghes: '*'
@@ -14,14 +14,19 @@ children:
- /activity
- /apps
- /billing
+ - /branches
- /checks
- /codes-of-conduct
- /code-scanning
- /codespaces
+ - /commits
+ - /collaborators
+ - /deployments
- /emojis
- /enterprise-admin
- /gists
- /git
+ - /pages
- /gitignore
- /interactions
- /issues
@@ -36,12 +41,15 @@ children:
- /pulls
- /rate-limit
- /reactions
+ - /releases
- /repos
+ - /repository-metrics
- /scim
- /search
- /secret-scanning
- /teams
- /users
+ - /webhooks
- /permissions-required-for-github-apps
---
diff --git a/translations/ja-JP/content/rest/reference/pages.md b/translations/ja-JP/content/rest/reference/pages.md
new file mode 100644
index 0000000000..713ca428fc
--- /dev/null
+++ b/translations/ja-JP/content/rest/reference/pages.md
@@ -0,0 +1,32 @@
+---
+title: Pages
+intro: 'The GitHub Pages API allows you to interact with GitHub Pages sites and build information.'
+allowTitleToDifferFromFilename: true
+versions:
+ fpt: '*'
+ ghes: '*'
+ ghae: '*'
+ ghec: '*'
+topics:
+ - API
+miniTocMaxHeadingLevel: 3
+---
+
+The {% data variables.product.prodname_pages %} API retrieves information about your {% data variables.product.prodname_pages %} configuration, and the statuses of your builds. Information about the site and the builds can only be accessed by authenticated owners{% ifversion not ghae %}, even if the websites are public{% endif %}. For more information, see "[About {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages)."
+
+In {% data variables.product.prodname_pages %} API endpoints with a `status` key in their response, the value can be one of:
+* `null`: The site has yet to be built.
+* `queued`: The build has been requested but not yet begun.
+* `building`:The build is in progress.
+* `built`: The site has been built.
+* `errored`: Indicates an error occurred during the build.
+
+In {% data variables.product.prodname_pages %} API endpoints that return GitHub Pages site information, the JSON responses include these fields:
+* `html_url`: The absolute URL (including scheme) of the rendered Pages site. For example, `https://username.github.io`.
+* `source`: An object that contains the source branch and directory for the rendered Pages site. This includes:
+ - `branch`: The repository branch used to publish your [site's source files](/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site). For example, _main_ or _gh-pages_.
+ - `path`: The repository directory from which the site publishes. Will be either `/` or `/docs`.
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'pages' %}{% include rest_operation %}{% endif %}
+{% endfor %}
\ No newline at end of file
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 388c85781c..a067fef447 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
@@ -41,18 +41,18 @@ GitHub Apps have the `Read-only` metadata permission by default. The metadata pe
- [`GET /rate_limit`](/rest/reference/rate-limit#get-rate-limit-status-for-the-authenticated-user)
- [`GET /repos/:owner/:repo`](/rest/reference/repos#get-a-repository)
{% ifversion fpt -%}
-- [`GET /repos/:owner/:repo/community/profile`](/rest/reference/repos#get-community-profile-metrics)
+- [`GET /repos/:owner/:repo/community/profile`](/rest/reference/repository-metrics#get-community-profile-metrics)
{% endif -%}
- [`GET /repos/:owner/:repo/contributors`](/rest/reference/repos#list-repository-contributors)
- [`GET /repos/:owner/:repo/forks`](/rest/reference/repos#list-forks)
- [`GET /repos/:owner/:repo/languages`](/rest/reference/repos#list-repository-languages)
- [`GET /repos/:owner/:repo/license`](/rest/reference/licenses#get-the-license-for-a-repository)
- [`GET /repos/:owner/:repo/stargazers`](/rest/reference/activity#list-stargazers)
-- [`GET /repos/:owner/:repo/stats/code_frequency`](/rest/reference/repos#get-the-weekly-commit-activity)
-- [`GET /repos/:owner/:repo/stats/commit_activity`](/rest/reference/repos#get-the-last-year-of-commit-activity)
-- [`GET /repos/:owner/:repo/stats/contributors`](/rest/reference/repos#get-all-contributor-commit-activity)
-- [`GET /repos/:owner/:repo/stats/participation`](/rest/reference/repos#get-the-weekly-commit-count)
-- [`GET /repos/:owner/:repo/stats/punch_card`](/rest/reference/repos#get-the-hourly-commit-count-for-each-day)
+- [`GET /repos/:owner/:repo/stats/code_frequency`](/rest/reference/repository-metrics#get-the-weekly-commit-activity)
+- [`GET /repos/:owner/:repo/stats/commit_activity`](/rest/reference/repository-metrics#get-the-last-year-of-commit-activity)
+- [`GET /repos/:owner/:repo/stats/contributors`](/rest/reference/repository-metrics#get-all-contributor-commit-activity)
+- [`GET /repos/:owner/:repo/stats/participation`](/rest/reference/repository-metrics#get-the-weekly-commit-count)
+- [`GET /repos/:owner/:repo/stats/punch_card`](/rest/reference/repository-metrics#get-the-hourly-commit-count-for-each-day)
- [`GET /repos/:owner/:repo/subscribers`](/rest/reference/activity#list-watchers)
- [`GET /repos/:owner/:repo/tags`](/rest/reference/repos#list-repository-tags)
- [`GET /repos/:owner/:repo/topics`](/rest/reference/repos#get-all-repository-topics)
@@ -73,14 +73,14 @@ GitHub Apps have the `Read-only` metadata permission by default. The metadata pe
- [`GET /users/:username/subscriptions`](/rest/reference/activity#list-repositories-watched-by-a-user)
_Collaborators_
-- [`GET /repos/:owner/:repo/collaborators`](/rest/reference/repos#list-repository-collaborators)
-- [`GET /repos/:owner/:repo/collaborators/:username`](/rest/reference/repos#check-if-a-user-is-a-repository-collaborator)
+- [`GET /repos/:owner/:repo/collaborators`](/rest/reference/collaborators#list-repository-collaborators)
+- [`GET /repos/:owner/:repo/collaborators/:username`](/rest/reference/collaborators#check-if-a-user-is-a-repository-collaborator)
_Commit comments_
-- [`GET /repos/:owner/:repo/comments`](/rest/reference/repos#list-commit-comments-for-a-repository)
-- [`GET /repos/:owner/:repo/comments/:comment_id`](/rest/reference/repos#get-a-commit-comment)
+- [`GET /repos/:owner/:repo/comments`](/rest/reference/commits#list-commit-comments-for-a-repository)
+- [`GET /repos/:owner/:repo/comments/:comment_id`](/rest/reference/commits#get-a-commit-comment)
- [`GET /repos/:owner/:repo/comments/:comment_id/reactions`](/rest/reference/reactions#list-reactions-for-a-commit-comment)
-- [`GET /repos/:owner/:repo/commits/:sha/comments`](/rest/reference/repos#list-commit-comments)
+- [`GET /repos/:owner/:repo/commits/:sha/comments`](/rest/reference/commits#list-commit-comments)
_Events_
- [`GET /events`](/rest/reference/activity#list-public-events)
@@ -173,7 +173,7 @@ _Search_
- [`DELETE /repos/:owner/:repo/interaction-limits`](/rest/reference/interactions#remove-interaction-restrictions-for-a-repository) (:write)
{% endif -%}
{% ifversion fpt -%}
-- [`GET /repos/:owner/:repo/pages/health`](/rest/reference/repos#get-a-dns-health-check-for-github-pages) (:write)
+- [`GET /repos/:owner/:repo/pages/health`](/rest/reference/pages#get-a-dns-health-check-for-github-pages) (:write)
{% endif -%}
- [`PUT /repos/:owner/:repo/topics`](/rest/reference/repos#replace-all-repository-topics) (:write)
- [`POST /repos/:owner/:repo/transfer`](/rest/reference/repos#transfer-a-repository) (:write)
@@ -186,57 +186,57 @@ _Search_
{% ifversion fpt -%}
- [`DELETE /repos/:owner/:repo/vulnerability-alerts`](/rest/reference/repos#disable-vulnerability-alerts) (:write)
{% endif -%}
-- [`PATCH /user/repository_invitations/:invitation_id`](/rest/reference/repos#accept-a-repository-invitation) (:write)
-- [`DELETE /user/repository_invitations/:invitation_id`](/rest/reference/repos#decline-a-repository-invitation) (:write)
+- [`PATCH /user/repository_invitations/:invitation_id`](/rest/reference/collaborators#accept-a-repository-invitation) (:write)
+- [`DELETE /user/repository_invitations/:invitation_id`](/rest/reference/collaborators#decline-a-repository-invitation) (:write)
_Branches_
-- [`GET /repos/:owner/:repo/branches/:branch/protection`](/rest/reference/repos#get-branch-protection) (:read)
-- [`PUT /repos/:owner/:repo/branches/:branch/protection`](/rest/reference/repos#update-branch-protection) (:write)
-- [`DELETE /repos/:owner/:repo/branches/:branch/protection`](/rest/reference/repos#delete-branch-protection) (:write)
-- [`GET /repos/:owner/:repo/branches/:branch/protection/enforce_admins`](/rest/reference/repos#get-admin-branch-protection) (:read)
-- [`POST /repos/:owner/:repo/branches/:branch/protection/enforce_admins`](/rest/reference/repos#set-admin-branch-protection) (:write)
-- [`DELETE /repos/:owner/:repo/branches/:branch/protection/enforce_admins`](/rest/reference/repos#delete-admin-branch-protection) (:write)
-- [`GET /repos/:owner/:repo/branches/:branch/protection/required_pull_request_reviews`](/rest/reference/repos#get-pull-request-review-protection) (:read)
-- [`PATCH /repos/:owner/:repo/branches/:branch/protection/required_pull_request_reviews`](/rest/reference/repos#update-pull-request-review-protection) (:write)
-- [`DELETE /repos/:owner/:repo/branches/:branch/protection/required_pull_request_reviews`](/rest/reference/repos#delete-pull-request-review-protection) (:write)
-- [`GET /repos/:owner/:repo/branches/:branch/protection/required_signatures`](/rest/reference/repos#get-commit-signature-protection) (:read)
-- [`POST /repos/:owner/:repo/branches/:branch/protection/required_signatures`](/rest/reference/repos#create-commit-signature-protection) (:write)
-- [`DELETE /repos/:owner/:repo/branches/:branch/protection/required_signatures`](/rest/reference/repos#delete-commit-signature-protection) (:write)
-- [`GET /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/rest/reference/repos#get-status-checks-protection) (:read)
-- [`PATCH /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/rest/reference/repos#update-status-check-protection) (:write)
-- [`DELETE /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/rest/reference/repos#remove-status-check-protection) (:write)
-- [`GET /repos/:owner/:repo/branches/:branch/protection/required_status_checks/contexts`](/rest/reference/repos#get-all-status-check-contexts) (:read)
-- [`POST /repos/:owner/:repo/branches/:branch/protection/required_status_checks/contexts`](/rest/reference/repos#add-status-check-contexts) (:write)
-- [`PUT /repos/:owner/:repo/branches/:branch/protection/required_status_checks/contexts`](/rest/reference/repos#set-status-check-contexts) (:write)
-- [`DELETE /repos/:owner/:repo/branches/:branch/protection/required_status_checks/contexts`](/rest/reference/repos#remove-status-check-contexts) (:write)
-- [`GET /repos/:owner/:repo/branches/:branch/protection/restrictions`](/rest/reference/repos#get-access-restrictions) (:read)
-- [`DELETE /repos/:owner/:repo/branches/:branch/protection/restrictions`](/rest/reference/repos#delete-access-restrictions) (:write)
+- [`GET /repos/:owner/:repo/branches/:branch/protection`](/rest/reference/branches#get-branch-protection) (:read)
+- [`PUT /repos/:owner/:repo/branches/:branch/protection`](/rest/reference/branches#update-branch-protection) (:write)
+- [`DELETE /repos/:owner/:repo/branches/:branch/protection`](/rest/reference/branches#delete-branch-protection) (:write)
+- [`GET /repos/:owner/:repo/branches/:branch/protection/enforce_admins`](/rest/reference/branches#get-admin-branch-protection) (:read)
+- [`POST /repos/:owner/:repo/branches/:branch/protection/enforce_admins`](/rest/reference/branches#set-admin-branch-protection) (:write)
+- [`DELETE /repos/:owner/:repo/branches/:branch/protection/enforce_admins`](/rest/reference/branches#delete-admin-branch-protection) (:write)
+- [`GET /repos/:owner/:repo/branches/:branch/protection/required_pull_request_reviews`](/rest/reference/branches#get-pull-request-review-protection) (:read)
+- [`PATCH /repos/:owner/:repo/branches/:branch/protection/required_pull_request_reviews`](/rest/reference/branches#update-pull-request-review-protection) (:write)
+- [`DELETE /repos/:owner/:repo/branches/:branch/protection/required_pull_request_reviews`](/rest/reference/branches#delete-pull-request-review-protection) (:write)
+- [`GET /repos/:owner/:repo/branches/:branch/protection/required_signatures`](/rest/reference/branches#get-commit-signature-protection) (:read)
+- [`POST /repos/:owner/:repo/branches/:branch/protection/required_signatures`](/rest/reference/branches#create-commit-signature-protection) (:write)
+- [`DELETE /repos/:owner/:repo/branches/:branch/protection/required_signatures`](/rest/reference/branches#delete-commit-signature-protection) (:write)
+- [`GET /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/rest/reference/branches#get-status-checks-protection) (:read)
+- [`PATCH /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/rest/reference/branches#update-status-check-protection) (:write)
+- [`DELETE /repos/:owner/:repo/branches/:branch/protection/required_status_checks`](/rest/reference/branches#remove-status-check-protection) (:write)
+- [`GET /repos/:owner/:repo/branches/:branch/protection/required_status_checks/contexts`](/rest/reference/branches#get-all-status-check-contexts) (:read)
+- [`POST /repos/:owner/:repo/branches/:branch/protection/required_status_checks/contexts`](/rest/reference/branches#add-status-check-contexts) (:write)
+- [`PUT /repos/:owner/:repo/branches/:branch/protection/required_status_checks/contexts`](/rest/reference/branches#set-status-check-contexts) (:write)
+- [`DELETE /repos/:owner/:repo/branches/:branch/protection/required_status_checks/contexts`](/rest/reference/branches#remove-status-check-contexts) (:write)
+- [`GET /repos/:owner/:repo/branches/:branch/protection/restrictions`](/rest/reference/branches#get-access-restrictions) (:read)
+- [`DELETE /repos/:owner/:repo/branches/:branch/protection/restrictions`](/rest/reference/branches#delete-access-restrictions) (:write)
- [`GET /repos/:owner/:repo/branches/:branch/protection/restrictions/teams`](/rest/reference/repos#list-teams-with-access-to-the-protected-branch) (:read)
-- [`POST /repos/:owner/:repo/branches/:branch/protection/restrictions/teams`](/rest/reference/repos#add-team-access-restrictions) (:write)
-- [`PUT /repos/:owner/:repo/branches/:branch/protection/restrictions/teams`](/rest/reference/repos#set-team-access-restrictions) (:write)
-- [`DELETE /repos/:owner/:repo/branches/:branch/protection/restrictions/teams`](/rest/reference/repos#remove-team-access-restrictions) (:write)
+- [`POST /repos/:owner/:repo/branches/:branch/protection/restrictions/teams`](/rest/reference/branches#add-team-access-restrictions) (:write)
+- [`PUT /repos/:owner/:repo/branches/:branch/protection/restrictions/teams`](/rest/reference/branches#set-team-access-restrictions) (:write)
+- [`DELETE /repos/:owner/:repo/branches/:branch/protection/restrictions/teams`](/rest/reference/branches#remove-team-access-restrictions) (:write)
- [`GET /repos/:owner/:repo/branches/:branch/protection/restrictions/users`](/rest/reference/repos#list-users-with-access-to-the-protected-branch) (:read)
-- [`POST /repos/:owner/:repo/branches/:branch/protection/restrictions/users`](/rest/reference/repos#add-user-access-restrictions) (:write)
-- [`PUT /repos/:owner/:repo/branches/:branch/protection/restrictions/users`](/rest/reference/repos#set-user-access-restrictions) (:write)
-- [`DELETE /repos/:owner/:repo/branches/:branch/protection/restrictions/users`](/rest/reference/repos#remove-user-access-restrictions) (:write)
+- [`POST /repos/:owner/:repo/branches/:branch/protection/restrictions/users`](/rest/reference/branches#add-user-access-restrictions) (:write)
+- [`PUT /repos/:owner/:repo/branches/:branch/protection/restrictions/users`](/rest/reference/branches#set-user-access-restrictions) (:write)
+- [`DELETE /repos/:owner/:repo/branches/:branch/protection/restrictions/users`](/rest/reference/branches#remove-user-access-restrictions) (:write)
{% ifversion fpt or ghes > 3.0 or ghae -%}
-- [`POST /repos/:owner/:repo/branches/:branch/rename`](/rest/reference/repos#rename-a-branch) (:write)
+- [`POST /repos/:owner/:repo/branches/:branch/rename`](/rest/reference/branches#rename-a-branch) (:write)
{% endif %}
_Collaborators_
-- [`PUT /repos/:owner/:repo/collaborators/:username`](/rest/reference/repos#add-a-repository-collaborator) (:write)
-- [`DELETE /repos/:owner/:repo/collaborators/:username`](/rest/reference/repos#remove-a-repository-collaborator) (:write)
+- [`PUT /repos/:owner/:repo/collaborators/:username`](/rest/reference/collaborators#add-a-repository-collaborator) (:write)
+- [`DELETE /repos/:owner/:repo/collaborators/:username`](/rest/reference/collaborators#remove-a-repository-collaborator) (:write)
_Invitations_
-- [`GET /repos/:owner/:repo/invitations`](/rest/reference/repos#list-repository-invitations) (:read)
-- [`PATCH /repos/:owner/:repo/invitations/:invitation_id`](/rest/reference/repos#update-a-repository-invitation) (:write)
-- [`DELETE /repos/:owner/:repo/invitations/:invitation_id`](/rest/reference/repos#delete-a-repository-invitation) (:write)
+- [`GET /repos/:owner/:repo/invitations`](/rest/reference/collaborators#list-repository-invitations) (:read)
+- [`PATCH /repos/:owner/:repo/invitations/:invitation_id`](/rest/reference/collaborators#update-a-repository-invitation) (:write)
+- [`DELETE /repos/:owner/:repo/invitations/:invitation_id`](/rest/reference/collaborators#delete-a-repository-invitation) (:write)
_Keys_
-- [`GET /repos/:owner/:repo/keys`](/rest/reference/repos#list-deploy-keys) (:read)
-- [`POST /repos/:owner/:repo/keys`](/rest/reference/repos#create-a-deploy-key) (:write)
-- [`GET /repos/:owner/:repo/keys/:key_id`](/rest/reference/repos#get-a-deploy-key) (:read)
-- [`DELETE /repos/:owner/:repo/keys/:key_id`](/rest/reference/repos#delete-a-deploy-key) (:write)
+- [`GET /repos/:owner/:repo/keys`](/rest/reference/deployments#list-deploy-keys) (:read)
+- [`POST /repos/:owner/:repo/keys`](/rest/reference/deployments#create-a-deploy-key) (:write)
+- [`GET /repos/:owner/:repo/keys/:key_id`](/rest/reference/deployments#get-a-deploy-key) (:read)
+- [`DELETE /repos/:owner/:repo/keys/:key_id`](/rest/reference/deployments#delete-a-deploy-key) (:write)
_Teams_
- [`GET /repos/:owner/:repo/teams`](/rest/reference/repos#list-repository-teams) (:read)
@@ -245,10 +245,10 @@ _Teams_
{% ifversion fpt or ghec %}
_Traffic_
-- [`GET /repos/:owner/:repo/traffic/clones`](/rest/reference/repos#get-repository-clones) (:read)
-- [`GET /repos/:owner/:repo/traffic/popular/paths`](/rest/reference/repos#get-top-referral-paths) (:read)
-- [`GET /repos/:owner/:repo/traffic/popular/referrers`](/rest/reference/repos#get-top-referral-sources) (:read)
-- [`GET /repos/:owner/:repo/traffic/views`](/rest/reference/repos#get-page-views) (:read)
+- [`GET /repos/:owner/:repo/traffic/clones`](/rest/reference/repository-metrics#get-repository-clones) (:read)
+- [`GET /repos/:owner/:repo/traffic/popular/paths`](/rest/reference/repository-metrics#get-top-referral-paths) (:read)
+- [`GET /repos/:owner/:repo/traffic/popular/referrers`](/rest/reference/repository-metrics#get-top-referral-sources) (:read)
+- [`GET /repos/:owner/:repo/traffic/views`](/rest/reference/repository-metrics#get-page-views) (:read)
{% endif %}
{% ifversion fpt or ghec %}
@@ -345,37 +345,37 @@ _Traffic_
- [`GET /repos/:owner/:repo/check-suites/:check_suite_id`](/rest/reference/checks#get-a-check-suite) (:read)
- [`GET /repos/:owner/:repo/check-suites/:check_suite_id/check-runs`](/rest/reference/checks#list-check-runs-in-a-check-suite) (:read)
- [`POST /repos/:owner/:repo/check-suites/:check_suite_id/rerequest`](/rest/reference/checks#rerequest-a-check-suite) (:write)
-- [`GET /repos/:owner/:repo/commits`](/rest/reference/repos#list-commits) (:read)
-- [`GET /repos/:owner/:repo/commits/:sha`](/rest/reference/repos#get-a-commit) (:read)
+- [`GET /repos/:owner/:repo/commits`](/rest/reference/commits#list-commits) (:read)
+- [`GET /repos/:owner/:repo/commits/:sha`](/rest/reference/commits#get-a-commit) (:read)
- [`GET /repos/:owner/:repo/commits/:sha/check-runs`](/rest/reference/checks#list-check-runs-for-a-git-reference) (:read)
- [`GET /repos/:owner/:repo/commits/:sha/check-suites`](/rest/reference/checks#list-check-suites-for-a-git-reference) (:read)
- [`GET /repos/:owner/:repo/community/code_of_conduct`](/rest/reference/codes-of-conduct#get-the-code-of-conduct-for-a-repository) (:read)
-- [`GET /repos/:owner/:repo/compare/:base...:head`](/rest/reference/repos#compare-two-commits) (:read)
+- [`GET /repos/:owner/:repo/compare/:base...:head`](/rest/reference/commits#compare-two-commits) (:read)
- [`GET /repos/:owner/:repo/contents/:path`](/rest/reference/repos#get-repository-content) (:read)
{% ifversion fpt or ghes or ghae -%}
- [`POST /repos/:owner/:repo/dispatches`](/rest/reference/repos#create-a-repository-dispatch-event) (:write)
{% endif -%}
- [`POST /repos/:owner/:repo/forks`](/rest/reference/repos#create-a-fork) (:read)
-- [`POST /repos/:owner/:repo/merges`](/rest/reference/repos#merge-a-branch) (:write)
+- [`POST /repos/:owner/:repo/merges`](/rest/reference/branches#merge-a-branch) (:write)
- [`PUT /repos/:owner/:repo/pulls/:pull_number/merge`](/rest/reference/pulls#merge-a-pull-request) (:write)
- [`GET /repos/:owner/:repo/readme(?:/(.*))?`](/rest/reference/repos#get-a-repository-readme) (:read)
_Branches_
-- [`GET /repos/:owner/:repo/branches`](/rest/reference/repos#list-branches) (:read)
-- [`GET /repos/:owner/:repo/branches/:branch`](/rest/reference/repos#get-a-branch) (:read)
+- [`GET /repos/:owner/:repo/branches`](/rest/reference/branches#list-branches) (:read)
+- [`GET /repos/:owner/:repo/branches/:branch`](/rest/reference/branches#get-a-branch) (:read)
- [`GET /repos/:owner/:repo/branches/:branch/protection/restrictions/apps`](/rest/reference/repos#list-apps-with-access-to-the-protected-branch) (:write)
-- [`POST /repos/:owner/:repo/branches/:branch/protection/restrictions/apps`](/rest/reference/repos#add-app-access-restrictions) (:write)
-- [`PUT /repos/:owner/:repo/branches/:branch/protection/restrictions/apps`](/rest/reference/repos#set-app-access-restrictions) (:write)
-- [`DELETE /repos/:owner/:repo/branches/:branch/protection/restrictions/apps`](/rest/reference/repos#remove-user-access-restrictions) (:write)
+- [`POST /repos/:owner/:repo/branches/:branch/protection/restrictions/apps`](/rest/reference/branches#add-app-access-restrictions) (:write)
+- [`PUT /repos/:owner/:repo/branches/:branch/protection/restrictions/apps`](/rest/reference/branches#set-app-access-restrictions) (:write)
+- [`DELETE /repos/:owner/:repo/branches/:branch/protection/restrictions/apps`](/rest/reference/branches#remove-user-access-restrictions) (:write)
{% ifversion fpt or ghes > 3.0 or ghae -%}
-- [`POST /repos/:owner/:repo/branches/:branch/rename`](/rest/reference/repos#rename-a-branch) (:write)
+- [`POST /repos/:owner/:repo/branches/:branch/rename`](/rest/reference/branches#rename-a-branch) (:write)
{% endif %}
_Commit comments_
-- [`PATCH /repos/:owner/:repo/comments/:comment_id`](/rest/reference/repos#update-a-commit-comment) (:write)
-- [`DELETE /repos/:owner/:repo/comments/:comment_id`](/rest/reference/repos#delete-a-commit-comment) (:write)
+- [`PATCH /repos/:owner/:repo/comments/:comment_id`](/rest/reference/commits#update-a-commit-comment) (:write)
+- [`DELETE /repos/:owner/:repo/comments/:comment_id`](/rest/reference/commits#delete-a-commit-comment) (:write)
- [`POST /repos/:owner/:repo/comments/:comment_id/reactions`](/rest/reference/reactions#create-reaction-for-a-commit-comment) (:read)
-- [`POST /repos/:owner/:repo/commits/:sha/comments`](/rest/reference/repos#create-a-commit-comment) (:read)
+- [`POST /repos/:owner/:repo/commits/:sha/comments`](/rest/reference/commits#create-a-commit-comment) (:read)
_Git_
- [`POST /repos/:owner/:repo/git/blobs`](/rest/reference/git#create-a-blob) (:write)
@@ -435,15 +435,15 @@ _Releases_
### Permission on "deployments"
-- [`GET /repos/:owner/:repo/deployments`](/rest/reference/repos#list-deployments) (:read)
-- [`POST /repos/:owner/:repo/deployments`](/rest/reference/repos#create-a-deployment) (:write)
-- [`GET /repos/:owner/:repo/deployments/:deployment_id`](/rest/reference/repos#get-a-deployment) (:read)
+- [`GET /repos/:owner/:repo/deployments`](/rest/reference/deployments#list-deployments) (:read)
+- [`POST /repos/:owner/:repo/deployments`](/rest/reference/deployments#create-a-deployment) (:write)
+- [`GET /repos/:owner/:repo/deployments/:deployment_id`](/rest/reference/deployments#get-a-deployment) (:read)
{% ifversion fpt or ghes or ghae -%}
-- [`DELETE /repos/:owner/:repo/deployments/:deployment_id`](/rest/reference/repos#delete-a-deployment) (:write)
+- [`DELETE /repos/:owner/:repo/deployments/:deployment_id`](/rest/reference/deployments#delete-a-deployment) (:write)
{% endif -%}
-- [`GET /repos/:owner/:repo/deployments/:deployment_id/statuses`](/rest/reference/repos#list-deployment-statuses) (:read)
-- [`POST /repos/:owner/:repo/deployments/:deployment_id/statuses`](/rest/reference/repos#create-a-deployment-status) (:write)
-- [`GET /repos/:owner/:repo/deployments/:deployment_id/statuses/:status_id`](/rest/reference/repos#get-a-deployment-status) (:read)
+- [`GET /repos/:owner/:repo/deployments/:deployment_id/statuses`](/rest/reference/deployments#list-deployment-statuses) (:read)
+- [`POST /repos/:owner/:repo/deployments/:deployment_id/statuses`](/rest/reference/deployments#create-a-deployment-status) (:write)
+- [`GET /repos/:owner/:repo/deployments/:deployment_id/statuses/:status_id`](/rest/reference/deployments#get-a-deployment-status) (:read)
{% ifversion fpt or ghes or ghec %}
### Permission on "emails"
@@ -703,16 +703,16 @@ _Teams_
### Permission on "pages"
-- [`GET /repos/:owner/:repo/pages`](/rest/reference/repos#get-a-github-pages-site) (:read)
-- [`POST /repos/:owner/:repo/pages`](/rest/reference/repos#create-a-github-pages-site) (:write)
-- [`PUT /repos/:owner/:repo/pages`](/rest/reference/repos#update-information-about-a-github-pages-site) (:write)
-- [`DELETE /repos/:owner/:repo/pages`](/rest/reference/repos#delete-a-github-pages-site) (:write)
-- [`GET /repos/:owner/:repo/pages/builds`](/rest/reference/repos#list-github-pages-builds) (:read)
-- [`POST /repos/:owner/:repo/pages/builds`](/rest/reference/repos#request-a-github-pages-build) (:write)
-- [`GET /repos/:owner/:repo/pages/builds/:build_id`](/rest/reference/repos#get-github-pages-build) (:read)
-- [`GET /repos/:owner/:repo/pages/builds/latest`](/rest/reference/repos#get-latest-pages-build) (:read)
+- [`GET /repos/:owner/:repo/pages`](/rest/reference/pages#get-a-github-pages-site) (:read)
+- [`POST /repos/:owner/:repo/pages`](/rest/reference/pages#create-a-github-pages-site) (:write)
+- [`PUT /repos/:owner/:repo/pages`](/rest/reference/pages#update-information-about-a-github-pages-site) (:write)
+- [`DELETE /repos/:owner/:repo/pages`](/rest/reference/pages#delete-a-github-pages-site) (:write)
+- [`GET /repos/:owner/:repo/pages/builds`](/rest/reference/pages#list-github-pages-builds) (:read)
+- [`POST /repos/:owner/:repo/pages/builds`](/rest/reference/pages#request-a-github-pages-build) (:write)
+- [`GET /repos/:owner/:repo/pages/builds/:build_id`](/rest/reference/pages#get-github-pages-build) (:read)
+- [`GET /repos/:owner/:repo/pages/builds/latest`](/rest/reference/pages#get-latest-pages-build) (:read)
{% ifversion fpt -%}
-- [`GET /repos/:owner/:repo/pages/health`](/rest/reference/repos#get-a-dns-health-check-for-github-pages) (:write)
+- [`GET /repos/:owner/:repo/pages/health`](/rest/reference/pages#get-a-dns-health-check-for-github-pages) (:write)
{% endif %}
### Permission on "pull requests"
@@ -812,12 +812,12 @@ _Reviews_
### Permission on "repository hooks"
-- [`GET /repos/:owner/:repo/hooks`](/rest/reference/repos#list-repository-webhooks) (:read)
-- [`POST /repos/:owner/:repo/hooks`](/rest/reference/repos#create-a-repository-webhook) (:write)
-- [`GET /repos/:owner/:repo/hooks/:hook_id`](/rest/reference/repos#get-a-repository-webhook) (:read)
-- [`PATCH /repos/:owner/:repo/hooks/:hook_id`](/rest/reference/repos#update-a-repository-webhook) (:write)
-- [`DELETE /repos/:owner/:repo/hooks/:hook_id`](/rest/reference/repos#delete-a-repository-webhook) (:write)
-- [`POST /repos/:owner/:repo/hooks/:hook_id/pings`](/rest/reference/repos#ping-a-repository-webhook) (:read)
+- [`GET /repos/:owner/:repo/hooks`](/rest/reference/webhooks#list-repository-webhooks) (:read)
+- [`POST /repos/:owner/:repo/hooks`](/rest/reference/webhooks#create-a-repository-webhook) (:write)
+- [`GET /repos/:owner/:repo/hooks/:hook_id`](/rest/reference/webhooks#get-a-repository-webhook) (:read)
+- [`PATCH /repos/:owner/:repo/hooks/:hook_id`](/rest/reference/webhooks#update-a-repository-webhook) (:write)
+- [`DELETE /repos/:owner/:repo/hooks/:hook_id`](/rest/reference/webhooks#delete-a-repository-webhook) (:write)
+- [`POST /repos/:owner/:repo/hooks/:hook_id/pings`](/rest/reference/webhooks#ping-a-repository-webhook) (:read)
- [`POST /repos/:owner/:repo/hooks/:hook_id/tests`](/rest/reference/repos#test-the-push-repository-webhook) (:read)
{% ifversion ghes %}
@@ -930,9 +930,9 @@ _Teams_
### Permission on "statuses"
-- [`GET /repos/:owner/:repo/commits/:ref/status`](/rest/reference/repos#get-the-combined-status-for-a-specific-reference) (:read)
-- [`GET /repos/:owner/:repo/commits/:ref/statuses`](/rest/reference/repos#list-commit-statuses-for-a-reference) (:read)
-- [`POST /repos/:owner/:repo/statuses/:sha`](/rest/reference/repos#create-a-commit-status) (:write)
+- [`GET /repos/:owner/:repo/commits/:ref/status`](/rest/reference/commits#get-the-combined-status-for-a-specific-reference) (:read)
+- [`GET /repos/:owner/:repo/commits/:ref/statuses`](/rest/reference/commits#list-commit-statuses-for-a-reference) (:read)
+- [`POST /repos/:owner/:repo/statuses/:sha`](/rest/reference/commits#create-a-commit-status) (:write)
### Permission on "team discussions"
diff --git a/translations/ja-JP/content/rest/reference/pulls.md b/translations/ja-JP/content/rest/reference/pulls.md
index bea01f4cac..d8b22a8117 100644
--- a/translations/ja-JP/content/rest/reference/pulls.md
+++ b/translations/ja-JP/content/rest/reference/pulls.md
@@ -1,6 +1,6 @@
---
title: Pulls
-intro: Pulls APIを使うと、Pull Requestのリスト、表示、編集、作成、さらにはマージまでも行えます。
+intro: 'The Pulls API allows you to list, view, edit, create, and even merge pull requests.'
redirect_from:
- /v3/pulls
versions:
@@ -13,13 +13,13 @@ topics:
miniTocMaxHeadingLevel: 3
---
-Pull Request API を使用すると、Pull Requestを一覧表示、編集、作成、マージできます。 Pull Requestのコメントは、[Issue Comments API](/rest/reference/issues#comments) で管理できます。
+The Pull Request API allows you to list, view, edit, create, and even merge pull requests. Comments on pull requests can be managed via the [Issue Comments API](/rest/reference/issues#comments).
-すべてのPull Requestは Issue ですが、すべての Issue がPull Requestというわけではありません。 このため、アサインされた人、ラベル、マイルストーンなどの操作といった、両方の機能で共通するアクションは、[Issues API](/rest/reference/issues) で提供されます。
+Every pull request is an issue, but not every issue is a pull request. For this reason, "shared" actions for both features, like manipulating assignees, labels and milestones, are provided within [the Issues API](/rest/reference/issues).
-### Pull Requestのカスタムメディアタイプ
+### Custom media types for pull requests
-以下がPull Requestでサポートされているメディアタイプです。
+These are the supported media types for pull requests.
application/vnd.github.VERSION.raw+json
application/vnd.github.VERSION.text+json
@@ -28,59 +28,60 @@ Pull Request API を使用すると、Pull Requestを一覧表示、編集、作
application/vnd.github.VERSION.diff
application/vnd.github.VERSION.patch
-詳しい情報については、「[カスタムメディアタイプ](/rest/overview/media-types)」を参照してください。
+For more information, see "[Custom media types](/rest/overview/media-types)."
-diff が破損している場合は、{% data variables.contact.contact_support %} にお問い合わせください。 メッセージにはリポジトリ名とPull Request ID を記載してください。
+If a diff is corrupt, contact {% data variables.contact.contact_support %}. Include the repository name and pull request ID in your message.
-### リンク関係
+### Link Relations
-Pull Requestには以下のリンク関係が含まれる可能性があります。
+Pull Requests have these possible link relations:
-| 名前 | 説明 |
-| ----------------- | ----------------------------------------------------------------------------------------------------------------- |
-| `self` | Pull Requestの API ロケーション。 |
-| `html` | Pull Requestの HTML ロケーション。 |
-| `Issue` | Pull Requestの [Issue](/rest/reference/issues) の API ロケーション。 |
-| `コメント` | Pull Requestの [Issue コメント](/rest/reference/issues#comments) の API ロケーション。 |
-| `review_comments` | Pull Requestの [レビューコメント](/rest/reference/pulls#comments) の API ロケーション。 |
-| `review_comment` | Pull Requestのリポジトリで、[レビューコメント](/rest/reference/pulls#comments)の API ロケーションを構築するための[URL テンプレート](/rest#hypermedia)。 |
-| `commits` | Pull Requestの [コミット](#list-commits-on-a-pull-request) の API ロケーション。 |
-| `statuses` | Pull Requestの[コミットステータス](/rest/reference/repos#statuses)、すなわち`head` ブランチのステータスの API ロケーション。 |
+Name | Description
+-----|-----------|
+`self`| The API location of this Pull Request.
+`html`| The HTML location of this Pull Request.
+`issue`| The API location of this Pull Request's [Issue](/rest/reference/issues).
+`comments`| The API location of this Pull Request's [Issue comments](/rest/reference/issues#comments).
+`review_comments`| The API location of this Pull Request's [Review comments](/rest/reference/pulls#comments).
+`review_comment`| The [URL template](/rest#hypermedia) to construct the API location for a [Review comment](/rest/reference/pulls#comments) in this Pull Request's repository.
+`commits`|The API location of this Pull Request's [commits](#list-commits-on-a-pull-request).
+`statuses`| The API location of this Pull Request's [commit statuses](/rest/reference/repos#statuses), which are the statuses of its `head` branch.
{% for operation in currentRestOperations %}
{% unless operation.subcategory %}{% include rest_operation %}{% endunless %}
{% endfor %}
-## レビュー
+## Reviews
-Pull Requestレビューは、Pull Request上のPull Requestレビューコメントのグループで、状態とオプションの本文コメントでグループ化されています。
+Pull Request Reviews are groups of Pull Request Review Comments on the Pull
+Request, grouped together with a state and optional body comment.
{% for operation in currentRestOperations %}
{% if operation.subcategory == 'reviews' %}{% include rest_operation %}{% endif %}
{% endfor %}
-## レビューコメント
+## Review comments
-Pull Requestレビューコメントは、Pull Requestのレビュー中に unified 形式の diff の一部に付けられたコメントです。 コミットコメントおよび Issue コメントは、Pull Requestレビューコメントとは異なります。 コミットコメントはコミットに直接付けるもので、Issue コメントは、unified 形式の diff の一部を参照することなく付けるものです。 詳しい情報については、「[コミットコメントの作成](/rest/reference/repos#create-a-commit-comment)」および「[Issue コメントの作成](/rest/reference/issues#create-an-issue-comment)」を参照してください。
+Pull request review comments are comments on a portion of the unified diff made during a pull request review. Commit comments and issue comments are different from pull request review comments. You apply commit comments directly to a commit and you apply issue comments without referencing a portion of the unified diff. For more information, see "[Create a commit comment](/rest/reference/commits#create-a-commit-comment)" and "[Create an issue comment](/rest/reference/issues#create-an-issue-comment)."
-### Pull Requestレビューコメントのカスタムメディアタイプ
+### Custom media types for pull request review comments
-以下がPull Requestレビューコメントでサポートされているメディアタイプです。
+These are the supported media types for pull request review comments.
application/vnd.github.VERSION.raw+json
application/vnd.github.VERSION.text+json
application/vnd.github.VERSION.html+json
application/vnd.github.VERSION.full+json
-詳しい情報については、「[カスタムメディアタイプ](/rest/overview/media-types)」を参照してください。
+For more information, see "[Custom media types](/rest/overview/media-types)."
{% for operation in currentRestOperations %}
{% if operation.subcategory == 'comments' %}{% include rest_operation %}{% endif %}
{% endfor %}
-## レビューリクエスト
+## Review requests
-Pull Requestの作者、リポジトリのオーナー、およびコラボレータは、リポジトリの書き込みアクセスを持つ人にPull Requestレビューをリクエストできます。 リクエストされたレビュー担当者は、Pull Requestレビューをするようあなたが依頼したという通知を受け取ります。
+Pull request authors and repository owners and collaborators can request a pull request review from anyone with write access to the repository. Each requested reviewer will receive a notification asking them to review the pull request.
{% for operation in currentRestOperations %}
{% if operation.subcategory == 'review-requests' %}{% include rest_operation %}{% endif %}
diff --git a/translations/ja-JP/content/rest/reference/releases.md b/translations/ja-JP/content/rest/reference/releases.md
new file mode 100644
index 0000000000..a434451bea
--- /dev/null
+++ b/translations/ja-JP/content/rest/reference/releases.md
@@ -0,0 +1,23 @@
+---
+title: Releases
+intro: 'The releases API allows you to create, modify, and delete releases and release assets.'
+allowTitleToDifferFromFilename: true
+versions:
+ fpt: '*'
+ ghes: '*'
+ ghae: '*'
+ ghec: '*'
+topics:
+ - API
+miniTocMaxHeadingLevel: 3
+---
+
+{% note %}
+
+**Note:** The Releases API replaces the Downloads API. You can retrieve the download count and browser download URL from the endpoints in this API that return releases and release assets.
+
+{% endnote %}
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'releases' %}{% include rest_operation %}{% endif %}
+{% endfor %}
\ No newline at end of file
diff --git a/translations/ja-JP/content/rest/reference/repos.md b/translations/ja-JP/content/rest/reference/repos.md
index b740a1207d..89a55881b8 100644
--- a/translations/ja-JP/content/rest/reference/repos.md
+++ b/translations/ja-JP/content/rest/reference/repos.md
@@ -30,52 +30,6 @@ To help streamline your workflow, you can use the API to add autolinks to extern
{% endfor %}
{% endif %}
-## Branches
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'branches' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
-## Collaborators
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'collaborators' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
-## Comments
-
-### Custom media types for commit comments
-
-These are the supported media types for commit comments. You can read more
-about the use of media types in the API [here](/rest/overview/media-types).
-
- application/vnd.github-commitcomment.raw+json
- application/vnd.github-commitcomment.text+json
- application/vnd.github-commitcomment.html+json
- application/vnd.github-commitcomment.full+json
-
-For more information, see "[Custom media types](/rest/overview/media-types)."
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'comments' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
-## Commits
-
-The Repo Commits API supports listing, viewing, and comparing commits in a repository.
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'commits' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
-{% ifversion fpt or ghec %}
-## Community
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'community' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
-{% endif %}
## Contents
@@ -105,105 +59,12 @@ You can read more about the use of media types in the API [here](/rest/overview/
{% if operation.subcategory == 'contents' %}{% include rest_operation %}{% endif %}
{% endfor %}
-## Deploy keys
-
-{% data reusables.repositories.deploy-keys %}
-
-Deploy keys can either be setup using the following API endpoints, or by using GitHub. To learn how to set deploy keys up in GitHub, see "[Managing deploy keys](/developers/overview/managing-deploy-keys)."
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'keys' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
-## Deployments
-
-Deployments are requests to deploy a specific ref (branch, SHA, tag). GitHub dispatches a [`deployment` event](/developers/webhooks-and-events/webhook-events-and-payloads#deployment) that external services can listen for and act on when new deployments are created. Deployments enable developers and organizations to build loosely coupled tooling around deployments, without having to worry about the implementation details of delivering different types of applications (e.g., web, native).
-
-Deployment statuses allow external services to mark deployments with an `error`, `failure`, `pending`, `in_progress`, `queued`, or `success` state that systems listening to [`deployment_status` events](/developers/webhooks-and-events/webhook-events-and-payloads#deployment_status) can consume.
-
-Deployment statuses can also include an optional `description` and `log_url`, which are highly recommended because they make deployment statuses more useful. The `log_url` is the full URL to the deployment output, and
-the `description` is a high-level summary of what happened with the deployment.
-
-GitHub dispatches `deployment` and `deployment_status` events when new deployments and deployment statuses are created. These events allows third-party integrations to receive respond to deployment requests and update the status of a deployment as progress is made.
-
-Below is a simple sequence diagram for how these interactions would work.
-
-```
-+---------+ +--------+ +-----------+ +-------------+
-| Tooling | | GitHub | | 3rd Party | | Your Server |
-+---------+ +--------+ +-----------+ +-------------+
- | | | |
- | Create Deployment | | |
- |--------------------->| | |
- | | | |
- | Deployment Created | | |
- |<---------------------| | |
- | | | |
- | | Deployment Event | |
- | |---------------------->| |
- | | | SSH+Deploys |
- | | |-------------------->|
- | | | |
- | | Deployment Status | |
- | |<----------------------| |
- | | | |
- | | | Deploy Completed |
- | | |<--------------------|
- | | | |
- | | Deployment Status | |
- | |<----------------------| |
- | | | |
-```
-
-Keep in mind that GitHub is never actually accessing your servers. It's up to your third-party integration to interact with deployment events. Multiple systems can listen for deployment events, and it's up to each of those systems to decide whether they're responsible for pushing the code out to your servers, building native code, etc.
-
-Note that the `repo_deployment` [OAuth scope](/developers/apps/scopes-for-oauth-apps) grants targeted access to deployments and deployment statuses **without** granting access to repository code, while the {% ifversion not ghae %}`public_repo` and{% endif %}`repo` scopes grant permission to code as well.
-
-
-### Inactive deployments
-
-When you set the state of a deployment to `success`, then all prior non-transient, non-production environment deployments in the same repository with the same environment name will become `inactive`. To avoid this, you can set `auto_inactive` to `false` when creating the deployment status.
-
-You can communicate that a transient environment no longer exists by setting its `state` to `inactive`. Setting the `state` to `inactive` shows the deployment as `destroyed` in {% data variables.product.prodname_dotcom %} and removes access to it.
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'deployments' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
-{% ifversion fpt or ghes > 3.1 or ghae or ghec %}
-## Environments
-
-The Environments API allows you to create, configure, and delete environments. For more information about environments, see "[Using environments for deployment](/actions/deployment/using-environments-for-deployment)." To manage environment secrets, see "[Secrets](/rest/reference/actions#secrets)."
-
-{% data reusables.gated-features.environments %}
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'environments' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-{% endif %}
-
## Forks
{% for operation in currentRestOperations %}
{% if operation.subcategory == 'forks' %}{% include rest_operation %}{% endif %}
{% endfor %}
-## Invitations
-
-The Repository Invitations API allows users or external services to invite other users to collaborate on a repo. The invited users (or external services on behalf of invited users) can choose to accept or decline the invitations.
-
-Note that the `repo:invite` [OAuth scope](/developers/apps/scopes-for-oauth-apps) grants targeted
-access to invitations **without** also granting access to repository code, while the
-`repo` scope grants permission to code as well as invitations.
-
-### Invite a user to a repository
-
-Use the API endpoint for adding a collaborator. For more information, see "[Add a repository collaborator](/rest/reference/repos#add-a-repository-collaborator)."
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'invitations' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
{% ifversion fpt or ghae or ghes > 3.2 or ghec %}
## Git LFS
@@ -214,181 +75,3 @@ Use the API endpoint for adding a collaborator. For more information, see "[Add
{% endif %}
-## Merging
-
-The Repo Merging API supports merging branches in a repository. This accomplishes
-essentially the same thing as merging one branch into another in a local repository
-and then pushing to {% data variables.product.product_name %}. The benefit is that the merge is done on the server side and a local repository is not needed. This makes it more appropriate for automation and other tools where maintaining local repositories would be cumbersome and inefficient.
-
-The authenticated user will be the author of any merges done through this endpoint.
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'merging' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
-## Pages
-
-The {% data variables.product.prodname_pages %} API retrieves information about your {% data variables.product.prodname_pages %} configuration, and the statuses of your builds. Information about the site and the builds can only be accessed by authenticated owners{% ifversion not ghae %}, even if the websites are public{% endif %}. For more information, see "[About {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages)."
-
-In {% data variables.product.prodname_pages %} API endpoints with a `status` key in their response, the value can be one of:
-* `null`: The site has yet to be built.
-* `queued`: The build has been requested but not yet begun.
-* `building`:The build is in progress.
-* `built`: The site has been built.
-* `errored`: Indicates an error occurred during the build.
-
-In {% data variables.product.prodname_pages %} API endpoints that return GitHub Pages site information, the JSON responses include these fields:
-* `html_url`: The absolute URL (including scheme) of the rendered Pages site. For example, `https://username.github.io`.
-* `source`: An object that contains the source branch and directory for the rendered Pages site. This includes:
- - `branch`: The repository branch used to publish your [site's source files](/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site). For example, _main_ or _gh-pages_.
- - `path`: The repository directory from which the site publishes. Will be either `/` or `/docs`.
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'pages' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
-## Releases
-
-{% note %}
-
-**Note:** The Releases API replaces the Downloads API. You can retrieve the download count and browser download URL from the endpoints in this API that return releases and release assets.
-
-{% endnote %}
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'releases' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
-## Statistics
-
-The Repository Statistics API allows you to fetch the data that {% data variables.product.product_name %} uses for visualizing different
-types of repository activity.
-
-### A word about caching
-
-Computing repository statistics is an expensive operation, so we try to return cached
-data whenever possible. If the data hasn't been cached when you query a repository's
-statistics, you'll receive a `202` response; a background job is also fired to
-start compiling these statistics. Give the job a few moments to complete, and
-then submit the request again. If the job has completed, that request will receive a
-`200` response with the statistics in the response body.
-
-Repository statistics are cached by the SHA of the repository's default branch; pushing to the default branch resets the statistics cache.
-
-### Statistics exclude some types of commits
-
-The statistics exposed by the API match the statistics shown by [different repository graphs](/github/visualizing-repository-data-with-graphs/about-repository-graphs).
-
-To summarize:
-- All statistics exclude merge commits.
-- Contributor statistics also exclude empty commits.
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'statistics' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
-## Statuses
-
-The status API allows external services to mark commits with an `error`,
-`failure`, `pending`, or `success` state, which is then reflected in pull requests
-involving those commits.
-
-Statuses can also include an optional `description` and `target_url`, and
-we highly recommend providing them as they make statuses much more
-useful in the GitHub UI.
-
-As an example, one common use is for continuous integration
-services to mark commits as passing or failing builds using status. The
-`target_url` would be the full URL to the build output, and the
-`description` would be the high level summary of what happened with the
-build.
-
-Statuses can include a `context` to indicate what service is providing that status.
-For example, you may have your continuous integration service push statuses with a context of `ci`, and a security audit tool push statuses with a context of `security`. You can
-then use the [Get the combined status for a specific reference](/rest/reference/repos#get-the-combined-status-for-a-specific-reference) to retrieve the whole status for a commit.
-
-Note that the `repo:status` [OAuth scope](/developers/apps/scopes-for-oauth-apps) grants targeted access to statuses **without** also granting access to repository code, while the
-`repo` scope grants permission to code as well as statuses.
-
-If you are developing a GitHub App and want to provide more detailed information about an external service, you may want to use the [Checks API](/rest/reference/checks).
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'statuses' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
-{% ifversion fpt or ghec %}
-## Traffic
-
-For repositories that you have push access to, the traffic API provides access
-to the information provided in your repository graph. For more information, see "Viewing traffic to a repository."
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'traffic' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-{% endif %}
-
-## Webhooks
-
-Repository webhooks allow you to receive HTTP `POST` payloads whenever certain events happen in a repository. {% data reusables.webhooks.webhooks-rest-api-links %}
-
-If you would like to set up a single webhook to receive events from all of your organization's repositories, see our API documentation for [Organization Webhooks](/rest/reference/orgs#webhooks).
-
-In addition to the REST API, {% data variables.product.prodname_dotcom %} can also serve as a [PubSubHubbub](#pubsubhubbub) hub for repositories.
-
-{% for operation in currentRestOperations %}
- {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %}
-{% endfor %}
-
-### Receiving Webhooks
-
-In order for {% data variables.product.product_name %} to send webhook payloads, your server needs to be accessible from the Internet. We also highly suggest using SSL so that we can send encrypted payloads over HTTPS.
-
-#### Webhook headers
-
-{% data variables.product.product_name %} will send along several HTTP headers to differentiate between event types and payload identifiers. See [webhook headers](/developers/webhooks-and-events/webhook-events-and-payloads#delivery-headers) for details.
-
-### PubSubHubbub
-
-GitHub can also serve as a [PubSubHubbub](https://github.com/pubsubhubbub/PubSubHubbub) hub for all repositories. PSHB is a simple publish/subscribe protocol that lets servers register to receive updates when a topic is updated. The updates are sent with an HTTP POST request to a callback URL.
-Topic URLs for a GitHub repository's pushes are in this format:
-
-`https://github.com/{owner}/{repo}/events/{event}`
-
-The event can be any available webhook event. For more information, see "[Webhook events and payloads](/developers/webhooks-and-events/webhook-events-and-payloads)."
-
-#### Response format
-
-The default format is what [existing post-receive hooks should expect](/post-receive-hooks/): A JSON body sent as the `payload` parameter in a POST. You can also specify to receive the raw JSON body with either an `Accept` header, or a `.json` extension.
-
- Accept: application/json
- https://github.com/{owner}/{repo}/events/push.json
-
-#### Callback URLs
-
-Callback URLs can use the `http://` protocol.
-
- # Send updates to postbin.org
- http://postbin.org/123
-
-#### Subscribing
-
-The GitHub PubSubHubbub endpoint is: `{% data variables.product.api_url_code %}/hub`. A successful request with curl looks like:
-
-``` shell
-curl -u "user" -i \
- {% data variables.product.api_url_pre %}/hub \
- -F "hub.mode=subscribe" \
- -F "hub.topic=https://github.com/{owner}/{repo}/events/push" \
- -F "hub.callback=http://postbin.org/123"
-```
-
-PubSubHubbub requests can be sent multiple times. If the hook already exists, it will be modified according to the request.
-
-##### Parameters
-
-Name | Type | Description
------|------|--------------
-``hub.mode``|`string` | **Required**. Either `subscribe` or `unsubscribe`.
-``hub.topic``|`string` |**Required**. The URI of the GitHub repository to subscribe to. The path must be in the format of `/{owner}/{repo}/events/{event}`.
-``hub.callback``|`string` | The URI to receive the updates to the topic.
-``hub.secret``|`string` | A shared secret key that generates a hash signature of the outgoing body content. You can verify a push came from GitHub by comparing the raw request body with the contents of the {% ifversion fpt or ghes > 2.22 or ghec %}`X-Hub-Signature` or `X-Hub-Signature-256` headers{% elsif ghes < 3.0 %}`X-Hub-Signature` header{% elsif ghae %}`X-Hub-Signature-256` header{% endif %}. You can see [the PubSubHubbub documentation](https://pubsubhubbub.github.io/PubSubHubbub/pubsubhubbub-core-0.4.html#authednotify) for more details.
diff --git a/translations/ja-JP/content/rest/reference/repository-metrics.md b/translations/ja-JP/content/rest/reference/repository-metrics.md
new file mode 100644
index 0000000000..aea394d6e0
--- /dev/null
+++ b/translations/ja-JP/content/rest/reference/repository-metrics.md
@@ -0,0 +1,61 @@
+---
+title: Repository metrics
+intro: 'The repository metrics API allows you to retrieve community profile, statistics, and traffic for your repository.'
+allowTitleToDifferFromFilename: true
+versions:
+ fpt: '*'
+ ghes: '*'
+ ghae: '*'
+ ghec: '*'
+topics:
+ - API
+miniTocMaxHeadingLevel: 3
+---
+
+{% ifversion fpt or ghec %}
+## Community
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'community' %}{% include rest_operation %}{% endif %}
+{% endfor %}
+
+{% endif %}
+
+## Statistics
+
+The Repository Statistics API allows you to fetch the data that {% data variables.product.product_name %} uses for visualizing different
+types of repository activity.
+
+### A word about caching
+
+Computing repository statistics is an expensive operation, so we try to return cached
+data whenever possible. If the data hasn't been cached when you query a repository's
+statistics, you'll receive a `202` response; a background job is also fired to
+start compiling these statistics. Give the job a few moments to complete, and
+then submit the request again. If the job has completed, that request will receive a
+`200` response with the statistics in the response body.
+
+Repository statistics are cached by the SHA of the repository's default branch; pushing to the default branch resets the statistics cache.
+
+### Statistics exclude some types of commits
+
+The statistics exposed by the API match the statistics shown by [different repository graphs](/github/visualizing-repository-data-with-graphs/about-repository-graphs).
+
+To summarize:
+- All statistics exclude merge commits.
+- Contributor statistics also exclude empty commits.
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'statistics' %}{% include rest_operation %}{% endif %}
+{% endfor %}
+
+{% ifversion fpt or ghec %}
+## Traffic
+
+For repositories that you have push access to, the traffic API provides access
+to the information provided in your repository graph. For more information, see "Viewing traffic to a repository."
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'traffic' %}{% include rest_operation %}{% endif %}
+{% endfor %}
+{% endif %}
\ No newline at end of file
diff --git a/translations/ja-JP/content/rest/reference/search.md b/translations/ja-JP/content/rest/reference/search.md
index 99d4a14e4f..19f0a12d45 100644
--- a/translations/ja-JP/content/rest/reference/search.md
+++ b/translations/ja-JP/content/rest/reference/search.md
@@ -58,7 +58,7 @@ GitHub Octocat in:readme user:defunkt
const queryString = 'q=' + encodeURIComponent('GitHub Octocat in:readme user:defunkt');
```
-See "[Searching on GitHub](/articles/searching-on-github/)"
+See "[Searching on GitHub](/search-github/searching-on-github)"
for a complete list of available qualifiers, their format, and an example of
how to use them. For information about how to use operators to match specific
quantities, dates, or to exclude results, see "[Understanding the search syntax](/search-github/getting-started-with-searching-on-github/understanding-the-search-syntax/)."
diff --git a/translations/ja-JP/content/rest/reference/webhooks.md b/translations/ja-JP/content/rest/reference/webhooks.md
new file mode 100644
index 0000000000..c9908012c1
--- /dev/null
+++ b/translations/ja-JP/content/rest/reference/webhooks.md
@@ -0,0 +1,77 @@
+---
+title: Webhooks
+intro: 'The webhooks API allows you to create and manage webhooks for your repositories.'
+allowTitleToDifferFromFilename: true
+versions:
+ fpt: '*'
+ ghes: '*'
+ ghae: '*'
+ ghec: '*'
+topics:
+ - API
+miniTocMaxHeadingLevel: 3
+---
+
+Repository webhooks allow you to receive HTTP `POST` payloads whenever certain events happen in a repository. {% data reusables.webhooks.webhooks-rest-api-links %}
+
+If you would like to set up a single webhook to receive events from all of your organization's repositories, see our API documentation for [Organization Webhooks](/rest/reference/orgs#webhooks).
+
+In addition to the REST API, {% data variables.product.prodname_dotcom %} can also serve as a [PubSubHubbub](#pubsubhubbub) hub for repositories.
+
+{% for operation in currentRestOperations %}
+ {% if operation.subcategory == 'webhooks' %}{% include rest_operation %}{% endif %}
+{% endfor %}
+
+### Receiving Webhooks
+
+In order for {% data variables.product.product_name %} to send webhook payloads, your server needs to be accessible from the Internet. We also highly suggest using SSL so that we can send encrypted payloads over HTTPS.
+
+#### Webhook headers
+
+{% data variables.product.product_name %} will send along several HTTP headers to differentiate between event types and payload identifiers. See [webhook headers](/developers/webhooks-and-events/webhook-events-and-payloads#delivery-headers) for details.
+
+### PubSubHubbub
+
+GitHub can also serve as a [PubSubHubbub](https://github.com/pubsubhubbub/PubSubHubbub) hub for all repositories. PSHB is a simple publish/subscribe protocol that lets servers register to receive updates when a topic is updated. The updates are sent with an HTTP POST request to a callback URL.
+Topic URLs for a GitHub repository's pushes are in this format:
+
+`https://github.com/{owner}/{repo}/events/{event}`
+
+The event can be any available webhook event. For more information, see "[Webhook events and payloads](/developers/webhooks-and-events/webhook-events-and-payloads)."
+
+#### Response format
+
+The default format is what [existing post-receive hooks should expect](/post-receive-hooks/): A JSON body sent as the `payload` parameter in a POST. You can also specify to receive the raw JSON body with either an `Accept` header, or a `.json` extension.
+
+ Accept: application/json
+ https://github.com/{owner}/{repo}/events/push.json
+
+#### Callback URLs
+
+Callback URLs can use the `http://` protocol.
+
+ # Send updates to postbin.org
+ http://postbin.org/123
+
+#### Subscribing
+
+The GitHub PubSubHubbub endpoint is: `{% data variables.product.api_url_code %}/hub`. A successful request with curl looks like:
+
+``` shell
+curl -u "user" -i \
+ {% data variables.product.api_url_pre %}/hub \
+ -F "hub.mode=subscribe" \
+ -F "hub.topic=https://github.com/{owner}/{repo}/events/push" \
+ -F "hub.callback=http://postbin.org/123"
+```
+
+PubSubHubbub requests can be sent multiple times. If the hook already exists, it will be modified according to the request.
+
+##### Parameters
+
+Name | Type | Description
+-----|------|--------------
+``hub.mode``|`string` | **Required**. Either `subscribe` or `unsubscribe`.
+``hub.topic``|`string` |**Required**. The URI of the GitHub repository to subscribe to. The path must be in the format of `/{owner}/{repo}/events/{event}`.
+``hub.callback``|`string` | The URI to receive the updates to the topic.
+``hub.secret``|`string` | A shared secret key that generates a hash signature of the outgoing body content. You can verify a push came from GitHub by comparing the raw request body with the contents of the {% ifversion fpt or ghes > 2.22 or ghec %}`X-Hub-Signature` or `X-Hub-Signature-256` headers{% elsif ghes < 3.0 %}`X-Hub-Signature` header{% elsif ghae %}`X-Hub-Signature-256` header{% endif %}. You can see [the PubSubHubbub documentation](https://pubsubhubbub.github.io/PubSubHubbub/pubsubhubbub-core-0.4.html#authednotify) for more details.
diff --git a/translations/ja-JP/data/release-notes/enterprise-server/3-0/20.yml b/translations/ja-JP/data/release-notes/enterprise-server/3-0/20.yml
index 96f00dcf71..d825693ff6 100644
--- a/translations/ja-JP/data/release-notes/enterprise-server/3-0/20.yml
+++ b/translations/ja-JP/data/release-notes/enterprise-server/3-0/20.yml
@@ -11,6 +11,7 @@ sections:
changes:
- An additional outer layer of `gzip` compression when creating a cluster support bundle with `ghe-cluster-suport-bundle` is now turned off by default. This outer compression can optionally be applied with the `ghe-cluster-suport-bundle -c` command line option.
- We have added extra text to the admin console to remind users about the mobile apps' data collection for experience improvement purposes.
+ - The {% data variables.product.prodname_github_connect %} data connection record now includes a list of enabled {% data variables.product.prodname_github_connect %} features. [Updated 2021-12-09]
known_issues:
- 新しくセットアップされたユーザを持たない{% data variables.product.prodname_ghe_server %}で、攻撃者が最初の管理ユーザを作成できました。
- アップグレードの過程で、カスタムのファイアウォールのルールが削除されます。
diff --git a/translations/ja-JP/data/release-notes/enterprise-server/3-1/12.yml b/translations/ja-JP/data/release-notes/enterprise-server/3-1/12.yml
index 90717317d4..feb0161f06 100644
--- a/translations/ja-JP/data/release-notes/enterprise-server/3-1/12.yml
+++ b/translations/ja-JP/data/release-notes/enterprise-server/3-1/12.yml
@@ -12,6 +12,7 @@ sections:
changes:
- An additional outer layer of `gzip` compression when creating a cluster support bundle with `ghe-cluster-suport-bundle` is now turned off by default. This outer compression can optionally be applied with the `ghe-cluster-suport-bundle -c` command line option.
- We have added extra text to the admin console to remind users about the mobile apps' data collection for experience improvement purposes.
+ - The {% data variables.product.prodname_github_connect %} data connection record now includes a list of enabled {% data variables.product.prodname_github_connect %} features. [Updated 2021-12-09]
known_issues:
- The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
- On a freshly set up {% data variables.product.prodname_ghe_server %} without any users, an attacker could create the first admin user.
diff --git a/translations/ja-JP/data/release-notes/enterprise-server/3-2/0-rc1.yml b/translations/ja-JP/data/release-notes/enterprise-server/3-2/0-rc1.yml
index 62d2d7a5ae..a59268d4f1 100644
--- a/translations/ja-JP/data/release-notes/enterprise-server/3-2/0-rc1.yml
+++ b/translations/ja-JP/data/release-notes/enterprise-server/3-2/0-rc1.yml
@@ -244,10 +244,10 @@ sections:
- heading: API Changes
notes:
# https://github.com/github/releases/issues/1253
- - Pagination support has been added to the Repositories REST API's "compare two commits" endpoint, which returns a list of commits reachable from one commit or branch, but unreachable from another. The API can also now return the results for comparisons over 250 commits. For more information, see the "[Repositories](/rest/reference/repos#compare-two-commits)" REST API documentation and "[Traversing with pagination](/rest/guides/traversing-with-pagination)."
+ - Pagination support has been added to the Repositories REST API's "compare two commits" endpoint, which returns a list of commits reachable from one commit or branch, but unreachable from another. The API can also now return the results for comparisons over 250 commits. For more information, see the "[Commits](/rest/reference/commits#compare-two-commits)" REST API documentation and "[Traversing with pagination](/rest/guides/traversing-with-pagination)."
# https://github.com/github/releases/issues/969
- - The REST API can now be used to programmatically resend or check the status of webhooks. For more information, see "[Repositories](/rest/reference/repos#webhooks)," "[Organizations](/rest/reference/orgs#webhooks)," and "[Apps](/rest/reference/apps#webhooks)" in the REST API documentation.
+ - The REST API can now be used to programmatically resend or check the status of webhooks. For more information, see "[Webhooks](/rest/reference/webhooks)," "[Organizations](/rest/reference/orgs#webhooks)," and "[Apps](/rest/reference/apps#webhooks)" in the REST API documentation.
# https://github.com/github/releases/issues/1349
- |
diff --git a/translations/ja-JP/data/release-notes/enterprise-server/3-2/0.yml b/translations/ja-JP/data/release-notes/enterprise-server/3-2/0.yml
index b5f39207ee..dd9ef8063b 100644
--- a/translations/ja-JP/data/release-notes/enterprise-server/3-2/0.yml
+++ b/translations/ja-JP/data/release-notes/enterprise-server/3-2/0.yml
@@ -246,7 +246,7 @@ sections:
- heading: API Changes
notes:
# https://github.com/github/releases/issues/1253
- - Pagination support has been added to the Repositories REST API's "compare two commits" endpoint, which returns a list of commits reachable from one commit or branch, but unreachable from another. The API can also now return the results for comparisons over 250 commits. For more information, see the "[Repositories](/rest/reference/repos#compare-two-commits)" REST API documentation and "[Traversing with pagination](/rest/guides/traversing-with-pagination)."
+ - Pagination support has been added to the Repositories REST API's "compare two commits" endpoint, which returns a list of commits reachable from one commit or branch, but unreachable from another. The API can also now return the results for comparisons over 250 commits. For more information, see the "[Commits](/rest/reference/commits#compare-two-commits)" REST API documentation and "[Traversing with pagination](/rest/guides/traversing-with-pagination)."
# https://github.com/github/releases/issues/969
- The REST API can now be used to programmatically resend or check the status of webhooks. For more information, see "[Repositories](/rest/reference/repos#webhooks)," "[Organizations](/rest/reference/orgs#webhooks)," and "[Apps](/rest/reference/apps#webhooks)" in the REST API documentation.
diff --git a/translations/ja-JP/data/release-notes/enterprise-server/3-2/4.yml b/translations/ja-JP/data/release-notes/enterprise-server/3-2/4.yml
index f2917e0daa..81a7d69e59 100644
--- a/translations/ja-JP/data/release-notes/enterprise-server/3-2/4.yml
+++ b/translations/ja-JP/data/release-notes/enterprise-server/3-2/4.yml
@@ -19,6 +19,7 @@ sections:
changes:
- An additional outer layer of `gzip` compression when creating a cluster support bundle with `ghe-cluster-suport-bundle` is now turned off by default. This outer compression can optionally be applied with the `ghe-cluster-suport-bundle -c` command line option.
- We have added extra text to the admin console to remind users about the mobile apps' data collection for experience improvement purposes.
+ - The {% data variables.product.prodname_github_connect %} data connection record now includes a list of enabled {% data variables.product.prodname_github_connect %} features. [Updated 2021-12-09]
known_issues:
- 新しくセットアップされたユーザを持たない{% data variables.product.prodname_ghe_server %}で、攻撃者が最初の管理ユーザを作成できました。
- アップグレードの過程で、カスタムのファイアウォールのルールが削除されます。
diff --git a/translations/ja-JP/data/release-notes/enterprise-server/3-3/0-rc1.yml b/translations/ja-JP/data/release-notes/enterprise-server/3-3/0-rc1.yml
index 1d5dfdbdaf..c025012731 100644
--- a/translations/ja-JP/data/release-notes/enterprise-server/3-3/0-rc1.yml
+++ b/translations/ja-JP/data/release-notes/enterprise-server/3-3/0-rc1.yml
@@ -147,7 +147,7 @@ sections:
notes:
- Most REST API previews have graduated and are now an official part of the API. Preview headers are no longer required for most REST API endpoints, but will still function as expected if you specify a graduated preview in the `Accept` header of a request. For previews that still require specifying the preview in the `Accept` header of a request, see "[API previews](/rest/overview/api-previews)."
- 'You can now use the REST API to configure custom autolinks to external resources. The REST API now provides beta `GET`/`POST`/`DELETE` endpoints which you can use to view, add, or delete custom autolinks associated with a repository. For more information, see "[Autolinks](/rest/reference/repos#autolinks)."'
- - 'You can now use the REST API to sync a forked repository with its upstream repository. For more information, see "[Repositories](/rest/reference/repos#sync-a-fork-branch-with-the-upstream-repository)" in the REST API documentation.'
+ - 'You can now use the REST API to sync a forked repository with its upstream repository. For more information, see "[Branches](/rest/reference/branches#sync-a-fork-branch-with-the-upstream-repository)" in the REST API documentation.'
- 'Enterprise administrators on GitHub Enterprise Server can now use the REST API to enable or disable Git LFS for a repository. For more information, see "[Repositories](/rest/reference/repos#git-lfs)."'
- 'You can now use the REST API to query the audit log for an enterprise. While audit log forwarding provides the ability to retain and analyze data with your own toolkit and determine patterns over time, the new endpoint can help you perform limited analysis on recent events. For more information, see "[{% data variables.product.prodname_enterprise %} administration](/rest/reference/enterprise-admin#get-the-audit-log-for-an-enterprise)" in the REST API documentation.'
- GitHub App user-to-server API requests can now read public resources using the REST API. This includes, for example, the ability to list a public repository's issues and pull requests, and to access a public repository's comments and content.
diff --git a/translations/ja-JP/data/release-notes/enterprise-server/3-3/0.yml b/translations/ja-JP/data/release-notes/enterprise-server/3-3/0.yml
index f84506c0ac..b007743794 100644
--- a/translations/ja-JP/data/release-notes/enterprise-server/3-3/0.yml
+++ b/translations/ja-JP/data/release-notes/enterprise-server/3-3/0.yml
@@ -44,6 +44,7 @@ sections:
- '{% data variables.product.prodname_ghe_server %} 3.3 includes the public beta of a repository cache for geographically-distributed teams and CI infrastructure. The repository cache keeps a read-only copy of your repositories available in additional geographies, which prevents clients from downloading duplicate Git content from your primary instance. For more information, see "[About repository caching](/admin/enterprise-management/caching-repositories/about-repository-caching)."'
- '{% data variables.product.prodname_ghe_server %} 3.3 includes improvements to the user impersonation process. An impersonation session now requires a justification for the impersonation, actions are recorded in the audit log as being performed as an impersonated user, and the user who is impersonated will receive an email notification that they have been impersonated by an enterprise administrator. For more information, see "[Impersonating a user](/enterprise-server@3.3/admin/user-management/managing-users-in-your-enterprise/impersonating-a-user)."'
- A new stream processing service has been added to facilitate the growing set of events that are published to the audit log, including events associated with Git and {% data variables.product.prodname_actions %} activity.
+ - The {% data variables.product.prodname_github_connect %} data connection record now includes a list of enabled {% data variables.product.prodname_github_connect %} features. [Updated 2021-12-09]
-
heading: トークンの変更
notes:
@@ -139,7 +140,7 @@ sections:
notes:
- Most REST API previews have graduated and are now an official part of the API. Preview headers are no longer required for most REST API endpoints, but will still function as expected if you specify a graduated preview in the `Accept` header of a request. For previews that still require specifying the preview in the `Accept` header of a request, see "[API previews](/rest/overview/api-previews)."
- 'You can now use the REST API to configure custom autolinks to external resources. The REST API now provides beta `GET`/`POST`/`DELETE` endpoints which you can use to view, add, or delete custom autolinks associated with a repository. For more information, see "[Autolinks](/rest/reference/repos#autolinks)."'
- - 'You can now use the REST API to sync a forked repository with its upstream repository. For more information, see "[Repositories](/rest/reference/repos#sync-a-fork-branch-with-the-upstream-repository)" in the REST API documentation.'
+ - 'You can now use the REST API to sync a forked repository with its upstream repository. For more information, see "[Branches](/rest/reference/branches#sync-a-fork-branch-with-the-upstream-repository)" in the REST API documentation.'
- 'Enterprise administrators on GitHub Enterprise Server can now use the REST API to enable or disable Git LFS for a repository. For more information, see "[Repositories](/rest/reference/repos#git-lfs)."'
- 'You can now use the REST API to query the audit log for an enterprise. While audit log forwarding provides the ability to retain and analyze data with your own toolkit and determine patterns over time, the new endpoint can help you perform limited analysis on recent events. For more information, see "[{% data variables.product.prodname_enterprise %} administration](/rest/reference/enterprise-admin#get-the-audit-log-for-an-enterprise)" in the REST API documentation.'
- GitHub App user-to-server API requests can now read public resources using the REST API. This includes, for example, the ability to list a public repository's issues and pull requests, and to access a public repository's comments and content.
diff --git a/translations/ja-JP/data/release-notes/github-ae/2021-06/2021-12-06.yml b/translations/ja-JP/data/release-notes/github-ae/2021-06/2021-12-06.yml
index 214117a2b8..770966b821 100644
--- a/translations/ja-JP/data/release-notes/github-ae/2021-06/2021-12-06.yml
+++ b/translations/ja-JP/data/release-notes/github-ae/2021-06/2021-12-06.yml
@@ -88,7 +88,7 @@ sections:
- |
With the [latest version of Octicons](https://github.com/primer/octicons/releases), the states of issues and pull requests are now more visually distinct so you can scan status more easily. For more information, see [{% data variables.product.prodname_blog %}](https://github.blog/changelog/2021-06-08-new-issue-and-pull-request-state-icons/).
- |
- You can now see all pull request review comments in the **Files** tab for a pull request by selecting the **Conversations** drop-down. You can also require that all pull request review comments are resolved before anyone merges the pull request. For more information, see "[About pull request reviews](/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews#discovering-and-navigating-conversations)" and "[About protected branches](/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#require-conversation-resolution-before-merging)." For more information about management of branch protection settings with the API, see "[Repositories](/rest/reference/repos#get-branch-protection)" in the REST API documentation and "[Mutations](/graphql/reference/mutations#createbranchprotectionrule)" in the GraphQL API documentation.
+ You can now see all pull request review comments in the **Files** tab for a pull request by selecting the **Conversations** drop-down. You can also require that all pull request review comments are resolved before anyone merges the pull request. For more information, see "[About pull request reviews](/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/about-pull-request-reviews#discovering-and-navigating-conversations)" and "[About protected branches](/github/administering-a-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#require-conversation-resolution-before-merging)." For more information about management of branch protection settings with the API, see "[Branches](/rest/reference/branches#get-branch-protection)" in the REST API documentation and "[Mutations](/graphql/reference/mutations#createbranchprotectionrule)" in the GraphQL API documentation.
- |
You can now upload video files everywhere you write Markdown on {% data variables.product.product_name %}. Share demos, show reproduction steps, and more in issue and pull request comments, as well as in Markdown files within repositories, such as READMEs. For more information, see "[Attaching files](/github/writing-on-github/working-with-advanced-formatting/attaching-files)."
- |
@@ -113,7 +113,7 @@ sections:
- |
You can now sort the repositories on a user or organization profile by star count.
- |
- The Repositories REST API's "compare two commits" endpoint, which returns a list of commits reachable from one commit or branch, but unreachable from another, now supports pagination. The API can also now return the results for comparisons over 250 commits. For more information, see the "[Repositories](/rest/reference/repos#compare-two-commits)" REST API documentation and "[Traversing with pagination](/rest/guides/traversing-with-pagination)."
+ The Repositories REST API's "compare two commits" endpoint, which returns a list of commits reachable from one commit or branch, but unreachable from another, now supports pagination. The API can also now return the results for comparisons over 250 commits. For more information, see the "[Commits](/rest/reference/commits#compare-two-commits)" REST API documentation and "[Traversing with pagination](/rest/guides/traversing-with-pagination)."
- |
When you define a submodule in {% data variables.product.product_location %} with a relative path, the submodule is now clickable in the web UI. Clicking the submodule in the web UI will take you to the linked repository. Previously, only submodules with absolute URLs were clickable. Relative paths for repositories with the same owner that follow the pattern ../REPOSITORY or relative paths for repositories with a different owner that follow the pattern ../OWNER/REPOSITORY are supported. For more information about working with submodules, see [Working with submodules](https://github.blog/2016-02-01-working-with-submodules/) on {% data variables.product.prodname_blog %}.
- |
diff --git a/translations/ja-JP/data/reusables/accounts/accounts-billed-separately.md b/translations/ja-JP/data/reusables/accounts/accounts-billed-separately.md
new file mode 100644
index 0000000000..3e99bbe898
--- /dev/null
+++ b/translations/ja-JP/data/reusables/accounts/accounts-billed-separately.md
@@ -0,0 +1 @@
+Each account on {% data variables.product.product_name %} is billed separately. Upgrading an organization account enables paid features for the organization's repositories only and does not affect the features available in repositories owned by any associated personal accounts. Similarly, upgrading a personal account enables paid features for the personal account's repositories only and does not affect the repositories of any organization accounts. For more information about account types, see "[Types of {% data variables.product.prodname_dotcom %} accounts](/get-started/learning-about-github/types-of-github-accounts)."
diff --git a/translations/ja-JP/data/reusables/organizations/organization-plans.md b/translations/ja-JP/data/reusables/organizations/organization-plans.md
new file mode 100644
index 0000000000..7a87c02ae6
--- /dev/null
+++ b/translations/ja-JP/data/reusables/organizations/organization-plans.md
@@ -0,0 +1,8 @@
+{% ifversion fpt or ghec %}
+All organizations can own an unlimited number of public and private repositories. You can use organizations for free, with {% data variables.product.prodname_free_team %}, which includes limited features on private repositories. To get the full feature set on private repositories and additional features at the organization level, including SAML single sign-on and improved support coverage, you can upgrade to {% data variables.product.prodname_team %} or {% data variables.product.prodname_ghe_cloud %}. {% data reusables.gated-features.more-info %}
+
+If you use {% data variables.product.prodname_ghe_cloud %}, you have the option to purchase a license for {% data variables.product.prodname_GH_advanced_security %} and use the features on private repositories. {% data reusables.advanced-security.more-info-ghas %}
+
+{% ifversion fpt %}
+{% data reusables.enterprise.link-to-ghec-trial %}{% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/translations/ja-JP/data/reusables/organizations/organizations_include.md b/translations/ja-JP/data/reusables/organizations/organizations_include.md
index dc896a09a4..c3d44c3426 100644
--- a/translations/ja-JP/data/reusables/organizations/organizations_include.md
+++ b/translations/ja-JP/data/reusables/organizations/organizations_include.md
@@ -6,15 +6,4 @@ Organizationには以下が含まれます。
- The option to [require all organization members to use two-factor authentication](/articles/requiring-two-factor-authentication-in-your-organization){% endif %}{% ifversion fpt%}
- The ability to [create and administer classrooms with GitHub Classroom](/education/manage-coursework-with-github-classroom/teach-with-github-classroom/manage-classrooms){% endif %}
-{% ifversion fpt or ghec %}
-You can use organizations for free, with
-{% data variables.product.prodname_free_team %}, which includes unlimited collaborators on unlimited public repositories with full features, and unlimited private repositories with limited features.
-
-For additional features, including SAML single sign-on and improved support coverage, you can upgrade to {% data variables.product.prodname_team %} or {% data variables.product.prodname_ghe_cloud %}. {% data reusables.gated-features.more-info %}
-
-If you use {% data variables.product.prodname_ghe_cloud %}, you have the option to purchase a license for {% data variables.product.prodname_GH_advanced_security %} and use the features on private repositories. {% data reusables.advanced-security.more-info-ghas %}
-
-{% ifversion fpt %}
-{% data reusables.enterprise.link-to-ghec-trial %}
-{% endif %}
-{% endif %}
+{% data reusables.organizations.organization-plans %}
diff --git a/translations/ja-JP/data/reusables/webhooks/commit_comment_properties.md b/translations/ja-JP/data/reusables/webhooks/commit_comment_properties.md
index 7f4ce34c43..3b8618181d 100644
--- a/translations/ja-JP/data/reusables/webhooks/commit_comment_properties.md
+++ b/translations/ja-JP/data/reusables/webhooks/commit_comment_properties.md
@@ -1,4 +1,4 @@
-| キー | 種類 | 説明 |
-| -------- | -------- | ----------------------------------------------------------------- |
-| `action` | `string` | 実行されたアクション。 `created `になりうる。 |
-| `コメント` | `オブジェクト` | [commit comment](/rest/reference/repos#get-a-commit-comment)リソース。 |
+| キー | 種類 | 説明 |
+| -------- | -------- | ------------------------------------------------------------------- |
+| `action` | `string` | 実行されたアクション。 `created `になりうる。 |
+| `コメント` | `オブジェクト` | [commit comment](/rest/reference/commits#get-a-commit-comment)リソース。 |
diff --git a/translations/ja-JP/data/reusables/webhooks/deploy_key_properties.md b/translations/ja-JP/data/reusables/webhooks/deploy_key_properties.md
index 98b272ae1e..da3b386ad2 100644
--- a/translations/ja-JP/data/reusables/webhooks/deploy_key_properties.md
+++ b/translations/ja-JP/data/reusables/webhooks/deploy_key_properties.md
@@ -1,4 +1,4 @@
-| キー | 種類 | 説明 |
-| -------- | -------- | ----------------------------------------------------------- |
-| `action` | `string` | 実行されたアクション。 `created`もしくは`deleted`のいずれか。 |
-| `key` | `オブジェクト` | [`deploy key`](/rest/reference/repos#get-a-deploy-key)リソース。 |
+| キー | 種類 | 説明 |
+| -------- | -------- | ----------------------------------------------------------------- |
+| `action` | `string` | 実行されたアクション。 `created`もしくは`deleted`のいずれか。 |
+| `key` | `オブジェクト` | [`deploy key`](/rest/reference/deployments#get-a-deploy-key)リソース。 |
diff --git a/translations/ja-JP/data/reusables/webhooks/deployment_short_desc.md b/translations/ja-JP/data/reusables/webhooks/deployment_short_desc.md
index 63422d2b4f..1e31eeeba3 100644
--- a/translations/ja-JP/data/reusables/webhooks/deployment_short_desc.md
+++ b/translations/ja-JP/data/reusables/webhooks/deployment_short_desc.md
@@ -1 +1 @@
-デプロイメントが作成されました。 {% data reusables.webhooks.action_type_desc %} 詳しい情報については「[デプロイメント](/rest/reference/repos#list-deployments)」 REST APIを参照してください。
+デプロイメントが作成されました。 {% data reusables.webhooks.action_type_desc %} 詳しい情報については「[デプロイメント](/rest/reference/deployments#list-deployments)」 REST APIを参照してください。
diff --git a/translations/ja-JP/data/reusables/webhooks/deployment_status_short_desc.md b/translations/ja-JP/data/reusables/webhooks/deployment_status_short_desc.md
index d852ba202e..d8ed6b4c56 100644
--- a/translations/ja-JP/data/reusables/webhooks/deployment_status_short_desc.md
+++ b/translations/ja-JP/data/reusables/webhooks/deployment_status_short_desc.md
@@ -1 +1 @@
-デプロイメントが作成されました。 {% data reusables.webhooks.action_type_desc %} 詳しい情報については「[デプロイメントステータス](/rest/reference/repos#list-deployment-statuses)」 REST APIを参照してください。
+デプロイメントが作成されました。 {% data reusables.webhooks.action_type_desc %} 詳しい情報については「[デプロイメントステータス](/rest/reference/deployments#list-deployment-statuses)」 REST APIを参照してください。
diff --git a/translations/ja-JP/data/ui.yml b/translations/ja-JP/data/ui.yml
index a5819802e6..49f8365c77 100644
--- a/translations/ja-JP/data/ui.yml
+++ b/translations/ja-JP/data/ui.yml
@@ -52,7 +52,7 @@ survey:
optional: 任意
required: 必須
email_placeholder: email@example.com
- email_label: さらに質問がある場合、ご連絡差し上げてもよいでしょうか？
+ email_label: If we can contact you with more questions, please enter your email address
send: 送信
feedback: ありがとうございます！フィードバックをいただきました。
not_support: 返信が必要な場合は、サポートにお問い合わせください。
diff --git a/translations/log/ja-resets.csv b/translations/log/ja-resets.csv
index ae2e5260d8..fbd674392c 100644
--- a/translations/log/ja-resets.csv
+++ b/translations/log/ja-resets.csv
@@ -169,7 +169,6 @@ translations/ja-JP/content/admin/authentication/managing-identity-and-access-for
translations/ja-JP/content/admin/authentication/managing-identity-and-access-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise.md,rendering error
translations/ja-JP/content/admin/authentication/managing-identity-and-access-for-your-enterprise/configuring-user-provisioning-for-your-enterprise.md,rendering error
translations/ja-JP/content/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users.md,rendering error
-translations/ja-JP/content/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/index.md,rendering error
translations/ja-JP/content/admin/configuration/configuring-network-settings/configuring-a-hostname.md,rendering error
translations/ja-JP/content/admin/configuration/configuring-network-settings/configuring-an-outbound-web-proxy-server.md,rendering error
translations/ja-JP/content/admin/configuration/configuring-network-settings/configuring-built-in-firewall-rules.md,rendering error
@@ -202,20 +201,30 @@ translations/ja-JP/content/admin/configuration/managing-connections-between-your
translations/ja-JP/content/admin/configuration/managing-connections-between-your-enterprise-accounts/enabling-unified-contributions-between-your-enterprise-account-and-githubcom.md,rendering error
translations/ja-JP/content/admin/configuration/managing-connections-between-your-enterprise-accounts/enabling-unified-search-between-your-enterprise-account-and-githubcom.md,rendering error
translations/ja-JP/content/admin/configuration/managing-connections-between-your-enterprise-accounts/index.md,rendering error
+translations/ja-JP/content/admin/enterprise-management/configuring-clustering/about-clustering.md,rendering error
translations/ja-JP/content/admin/enterprise-management/configuring-clustering/cluster-network-configuration.md,rendering error
translations/ja-JP/content/admin/enterprise-management/configuring-clustering/configuring-high-availability-replication-for-a-cluster.md,rendering error
+translations/ja-JP/content/admin/enterprise-management/configuring-clustering/index.md,rendering error
translations/ja-JP/content/admin/enterprise-management/configuring-clustering/monitoring-cluster-nodes.md,Listed in localization-support#489
translations/ja-JP/content/admin/enterprise-management/configuring-clustering/monitoring-cluster-nodes.md,parsing error
translations/ja-JP/content/admin/enterprise-management/configuring-high-availability/about-high-availability-configuration.md,rendering error
translations/ja-JP/content/admin/enterprise-management/configuring-high-availability/creating-a-high-availability-replica.md,rendering error
+translations/ja-JP/content/admin/enterprise-management/configuring-high-availability/index.md,rendering error
+translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/configuring-collectd.md,rendering error
+translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/index.md,rendering error
+translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/monitoring-using-snmp.md,rendering error
+translations/ja-JP/content/admin/enterprise-management/monitoring-your-appliance/recommended-alert-thresholds.md,rendering error
translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-cpu-or-memory-resources.md,rendering error
translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md,rendering error
+translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/index.md,rendering error
+translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/migrating-from-github-enterprise-1110x-to-2123.md,rendering error
translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrade-requirements.md,rendering error
translations/ja-JP/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server.md,rendering error
translations/ja-JP/content/admin/enterprise-support/overview/about-github-enterprise-support.md,rendering error
translations/ja-JP/content/admin/enterprise-support/overview/about-github-premium-support-for-github-enterprise-server.md,rendering error
translations/ja-JP/content/admin/enterprise-support/overview/about-github-premium-support-for-github-enterprise.md,rendering error
translations/ja-JP/content/admin/enterprise-support/overview/about-support-for-advanced-security.md,rendering error
+translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/index.md,rendering error
translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/preparing-to-submit-a-ticket.md,rendering error
translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/providing-data-to-github-support.md,rendering error
translations/ja-JP/content/admin/enterprise-support/receiving-help-from-github-support/reaching-github-support.md,rendering error
@@ -263,8 +272,12 @@ translations/ja-JP/content/admin/packages/enabling-github-packages-with-minio.md
translations/ja-JP/content/admin/packages/getting-started-with-github-packages-for-your-enterprise.md,rendering error
translations/ja-JP/content/admin/packages/quickstart-for-configuring-your-minio-storage-bucket-for-github-packages.md,rendering error
translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise.md,rendering error
+translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-dependency-insights-in-your-enterprise.md,rendering error
translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md,rendering error
+translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md,rendering error
+translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-project-board-policies-in-your-enterprise.md,rendering error
translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise.md,rendering error
+translations/ja-JP/content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-team-policies-in-your-enterprise.md,rendering error
translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-environment.md,Listed in localization-support#489
translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-environment.md,rendering error
translations/ja-JP/content/admin/policies/enforcing-policy-with-pre-receive-hooks/creating-a-pre-receive-hook-script.md,rendering error
@@ -296,10 +309,14 @@ translations/ja-JP/content/admin/user-management/managing-users-in-your-enterpri
translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/about-migrations.md,rendering error
translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/exporting-migration-data-from-githubcom.md,rendering error
translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/exporting-migration-data-from-your-enterprise.md,rendering error
+translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/index.md,rendering error
translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/migrating-data-to-your-enterprise.md,rendering error
+translations/ja-JP/content/admin/user-management/migrating-data-to-and-from-your-enterprise/preparing-to-migrate-data-to-your-enterprise.md,rendering error
translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/activity-dashboard.md,rendering error
translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/audit-logging.md,rendering error
translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/audited-actions.md,rendering error
+translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/log-forwarding.md,rendering error
+translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/managing-global-webhooks.md,rendering error
translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/searching-the-audit-log.md,rendering error
translations/ja-JP/content/admin/user-management/monitoring-activity-in-your-enterprise/viewing-push-logs.md,rendering error
translations/ja-JP/content/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on.md,rendering error
@@ -346,16 +363,37 @@ translations/ja-JP/content/authentication/troubleshooting-ssh/error-unknown-key-
translations/ja-JP/content/authentication/troubleshooting-ssh/index.md,rendering error
translations/ja-JP/content/authentication/troubleshooting-ssh/recovering-your-ssh-key-passphrase.md,rendering error
translations/ja-JP/content/billing/index.md,rendering error
+translations/ja-JP/content/billing/managing-billing-for-git-large-file-storage/index.md,rendering error
translations/ja-JP/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md,rendering error
translations/ja-JP/content/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md,Listed in localization-support#489
translations/ja-JP/content/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md,parsing error
translations/ja-JP/content/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces.md,rendering error
+translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md,rendering error
+translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md,rendering error
+translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/index.md,rendering error
+translations/ja-JP/content/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md,rendering error
translations/ja-JP/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md,rendering error
+translations/ja-JP/content/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts.md,rendering error
+translations/ja-JP/content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md,rendering error
+translations/ja-JP/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md,rendering error
translations/ja-JP/content/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md,rendering error
+translations/ja-JP/content/billing/managing-billing-for-your-github-account/index.md,rendering error
translations/ja-JP/content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md,rendering error
+translations/ja-JP/content/billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription.md,rendering error
translations/ja-JP/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md,rendering error
translations/ja-JP/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md,rendering error
+translations/ja-JP/content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md,rendering error
translations/ja-JP/content/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method.md,rendering error
+translations/ja-JP/content/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle.md,rendering error
+translations/ja-JP/content/billing/managing-your-github-billing-settings/index.md,rendering error
+translations/ja-JP/content/billing/managing-your-github-billing-settings/redeeming-a-coupon.md,rendering error
+translations/ja-JP/content/billing/managing-your-github-billing-settings/removing-a-payment-method.md,rendering error
+translations/ja-JP/content/billing/managing-your-github-billing-settings/setting-your-billing-email.md,rendering error
+translations/ja-JP/content/billing/managing-your-github-billing-settings/troubleshooting-a-declined-credit-card-charge.md,rendering error
+translations/ja-JP/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md,rendering error
+translations/ja-JP/content/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts.md,rendering error
+translations/ja-JP/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md,rendering error
+translations/ja-JP/content/billing/managing-your-license-for-github-enterprise/index.md,rendering error
translations/ja-JP/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-with-codeql.md,rendering error
translations/ja-JP/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning.md,rendering error
translations/ja-JP/content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning.md,rendering error
@@ -403,6 +441,7 @@ translations/ja-JP/content/code-security/supply-chain-security/managing-vulnerab
translations/ja-JP/content/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/viewing-and-updating-vulnerable-dependencies-in-your-repository.md,rendering error
translations/ja-JP/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md,Listed in localization-support#489
translations/ja-JP/content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md,rendering error
+translations/ja-JP/content/codespaces/codespaces-reference/allowing-your-codespace-to-access-a-private-image-registry.md,rendering error
translations/ja-JP/content/codespaces/codespaces-reference/disaster-recovery-for-codespaces.md,rendering error
translations/ja-JP/content/codespaces/customizing-your-codespace/changing-the-machine-type-for-your-codespace.md,rendering error
translations/ja-JP/content/codespaces/customizing-your-codespace/index.md,rendering error
@@ -498,6 +537,7 @@ translations/ja-JP/content/get-started/index.md,rendering error
translations/ja-JP/content/get-started/learning-about-github/about-github-advanced-security.md,Listed in localization-support#489
translations/ja-JP/content/get-started/learning-about-github/about-github-advanced-security.md,parsing error
translations/ja-JP/content/get-started/learning-about-github/access-permissions-on-github.md,rendering error
+translations/ja-JP/content/get-started/learning-about-github/githubs-products.md,rendering error
translations/ja-JP/content/get-started/learning-about-github/index.md,rendering error
translations/ja-JP/content/get-started/learning-about-github/types-of-github-accounts.md,rendering error
translations/ja-JP/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md,rendering error
@@ -513,6 +553,7 @@ translations/ja-JP/content/get-started/signing-up-for-github/index.md,rendering
translations/ja-JP/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-ae.md,rendering error
translations/ja-JP/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md,rendering error
translations/ja-JP/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server.md,rendering error
+translations/ja-JP/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md,rendering error
translations/ja-JP/content/get-started/signing-up-for-github/verifying-your-email-address.md,rendering error
translations/ja-JP/content/get-started/using-git/about-git-rebase.md,rendering error
translations/ja-JP/content/get-started/using-git/about-git-subtree-merges.md,rendering error
@@ -571,12 +612,14 @@ translations/ja-JP/content/graphql/guides/index.md,rendering error
translations/ja-JP/content/graphql/guides/managing-enterprise-accounts.md,rendering error
translations/ja-JP/content/graphql/guides/migrating-graphql-global-node-ids.md,rendering error
translations/ja-JP/content/graphql/index.md,rendering error
+translations/ja-JP/content/graphql/reference/mutations.md,rendering error
translations/ja-JP/content/issues/guides.md,rendering error
translations/ja-JP/content/issues/tracking-your-work-with-issues/filtering-and-searching-issues-and-pull-requests.md,rendering error
translations/ja-JP/content/issues/tracking-your-work-with-issues/planning-and-tracking-work-for-your-team-or-project.md,rendering error
translations/ja-JP/content/issues/trying-out-the-new-projects-experience/customizing-your-project-views.md,rendering error
translations/ja-JP/content/issues/trying-out-the-new-projects-experience/managing-access-to-projects.md,rendering error
translations/ja-JP/content/issues/using-labels-and-milestones-to-track-work/about-milestones.md,rendering error
+translations/ja-JP/content/organizations/collaborating-with-groups-in-organizations/about-organizations.md,rendering error
translations/ja-JP/content/organizations/collaborating-with-your-team/about-team-discussions.md,Listed in localization-support#489
translations/ja-JP/content/organizations/collaborating-with-your-team/about-team-discussions.md,rendering error
translations/ja-JP/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/about-two-factor-authentication-and-saml-single-sign-on.md,rendering error
@@ -694,18 +737,29 @@ translations/ja-JP/content/repositories/working-with-files/using-files/tracking-
translations/ja-JP/content/rest/guides/discovering-resources-for-a-user.md,rendering error
translations/ja-JP/content/rest/guides/getting-started-with-the-rest-api.md,rendering error
translations/ja-JP/content/rest/guides/traversing-with-pagination.md,rendering error
+translations/ja-JP/content/rest/guides/working-with-comments.md,rendering error
translations/ja-JP/content/rest/index.md,rendering error
translations/ja-JP/content/rest/overview/api-previews.md,rendering error
translations/ja-JP/content/rest/reference/actions.md,rendering error
translations/ja-JP/content/rest/reference/activity.md,rendering error
+translations/ja-JP/content/rest/reference/branches.md,rendering error
+translations/ja-JP/content/rest/reference/collaborators.md,rendering error
+translations/ja-JP/content/rest/reference/commits.md,rendering error
+translations/ja-JP/content/rest/reference/deployments.md,rendering error
translations/ja-JP/content/rest/reference/enterprise-admin.md,rendering error
+translations/ja-JP/content/rest/reference/index.md,rendering error
translations/ja-JP/content/rest/reference/issues.md,rendering error
translations/ja-JP/content/rest/reference/packages.md,rendering error
+translations/ja-JP/content/rest/reference/pages.md,rendering error
translations/ja-JP/content/rest/reference/permissions-required-for-github-apps.md,rendering error
+translations/ja-JP/content/rest/reference/pulls.md,rendering error
+translations/ja-JP/content/rest/reference/releases.md,rendering error
translations/ja-JP/content/rest/reference/repos.md,rendering error
+translations/ja-JP/content/rest/reference/repository-metrics.md,rendering error
translations/ja-JP/content/rest/reference/search.md,rendering error
translations/ja-JP/content/rest/reference/secret-scanning.md,rendering error
translations/ja-JP/content/rest/reference/teams.md,rendering error
+translations/ja-JP/content/rest/reference/webhooks.md,rendering error
translations/ja-JP/content/search-github/getting-started-with-searching-on-github/about-searching-on-github.md,rendering error
translations/ja-JP/content/search-github/getting-started-with-searching-on-github/enabling-githubcom-repository-search-from-your-private-enterprise-environment.md,rendering error
translations/ja-JP/content/search-github/searching-on-github/searching-commits.md,rendering error