1
0
mirror of synced 2025-12-23 11:54:18 -05:00

Merge branch 'main' into lucalves/spelling-fix

This commit is contained in:
Janice
2020-10-22 08:04:15 -07:00
committed by GitHub
151 changed files with 514 additions and 311 deletions

View File

@@ -45,6 +45,12 @@ Before enabling {% if currentVersion ver_gt "enterprise-server@2.21" %}{% data v
``` shell
$ ghe-dep-graph-enable
```
{% note %}
**Note**: For more information about enabling access to the administrative shell via SSH, see "[Accessing the administrative shell (SSH)](/enterprise/{{ currentVersion }}/admin/configuration/accessing-the-administrative-shell-ssh)."
{% endnote %}
3. Return to {% data variables.product.prodname_ghe_server %}.
{% data reusables.enterprise_site_admin_settings.access-settings %}
{% data reusables.enterprise_site_admin_settings.business %}

View File

@@ -25,7 +25,7 @@ Before launching {% data variables.product.product_location_enterprise %} on Goo
#### Supported machine types
{% data variables.product.prodname_ghe_server %} is supported on the following Google Compute Engine (GCE) machine types. For more information, see [the Google Cloud Platform machine types article](https://cloud.google.com/compute/docs/machine-types).
{% if currentVersion != "free-pro-team@latest" %}
| High-memory |
------------- |
| n1-highmem-4 |
@@ -34,7 +34,6 @@ Before launching {% data variables.product.product_location_enterprise %} on Goo
| n1-highmem-32 |
| n1-highmem-64 |
| n1-highmem-96 |
{% endif %}
#### Recommended machine types

View File

@@ -11,7 +11,7 @@ When using LDAP or built-in authentication, two-factor authentication is support
{% data reusables.enterprise_user_management.external_auth_disables_2fa %}
For more information, see [this chart on authentication methods that support 2FA](/enterprise/{{ currentVersion }}/user/articles/about-two-factor-authentication/#authentication-methods-that-support-2fa).
For more information, see "[About two-factor authentication](/github/authenticating-to-github/about-two-factor-authentication)."
### Requirements for enforcing two-factor authentication