Merge pull request #13048 from github/repo-sync

repo sync

Author: Octomerger

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.

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)."

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 %}
 

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 %}

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 %}.

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: '*'

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: