Skip to content

Commit e257a7e

Browse files
authored
Merge branch 'main' into notifications-anchor-fix
2 parents 361a595 + dbf5f90 commit e257a7e

8 files changed

Lines changed: 17 additions & 14 deletions

File tree

content/admin/enterprise-support/about-github-premium-support-for-github-enterprise-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ In addition to all of the benefits of {% data variables.contact.enterprise_suppo
3737

3838
{% data reusables.support.signing-up-for-premium-support %}
3939

40-
{% data reusables.support.scope-of-support %} For more information, see "[Reaching {% data variables.product.prodname_ghe_server %} Support](/enterprise/admin/guides/enterprise-support/reaching-github-support)."
40+
{% data reusables.support.scope-of-support %}
4141

4242
{% data reusables.support.contacting-premium-support %}
4343

content/admin/enterprise-support/about-github-premium-support-for-github-enterprise.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ In addition to all of the benefits of {% data variables.contact.enterprise_suppo
3535

3636
{% data reusables.support.signing-up-for-premium-support %}
3737

38-
{% data reusables.support.scope-of-support %} For more information, see "[Reaching {% data variables.product.prodname_ghe_server %} Support](/enterprise/admin/guides/enterprise-support/reaching-github-support)."
38+
{% data reusables.support.scope-of-support %}
3939

4040
{% data reusables.support.contacting-premium-support %}
4141

content/admin/installation/installing-github-enterprise-server-on-hyper-v.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Installing GitHub Enterprise Server on Hyper-V
3-
intro: 'To install {% data variables.product.prodname_ghe_server %} on Hyper-V, you must deploy onto a machine running Windows Server 2008 through Windows Server 2016.'
3+
intro: 'To install {% data variables.product.prodname_ghe_server %} on Hyper-V, you must deploy onto a machine running Windows Server 2008 through Windows Server 2019.'
44
redirect_from:
55
- /enterprise/admin/guides/installation/installing-github-enterprise-on-hyper-v/
66
- /enterprise/admin/installation/installing-github-enterprise-server-on-hyper-v
@@ -13,7 +13,7 @@ topics:
1313
### Prerequisites
1414

1515
- {% data reusables.enterprise_installation.software-license %}
16-
- You must have Windows Server 2008 through Windows Server 2016, which support Hyper-V.
16+
- You must have Windows Server 2008 through Windows Server 2019, which support Hyper-V.
1717
- Most actions needed to create your virtual machine (VM) may also be performed using the [Hyper-V Manager](https://docs.microsoft.com/windows-server/virtualization/hyper-v/manage/remotely-manage-hyper-v-hosts). However, we recommend using the Windows PowerShell command-line shell for initial setup. Examples using PowerShell are included below. For more information, see the Microsoft guide "[Getting Started with Windows PowerShell](https://docs.microsoft.com/powershell/scripting/getting-started/getting-started-with-windows-powershell?view=powershell-5.1)."
1818

1919
### Hardware considerations

content/admin/user-management/customizing-user-messages-for-your-enterprise.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,15 @@ Mandatory messages have a variety of uses.
7272
- Telling users how to get help with {% data variables.product.product_location %}
7373
- Ensuring that all users read your terms of service for using {% data variables.product.product_location %}
7474

75-
{% note %}
76-
77-
**Note:** After you configure a mandatory message for {% data variables.product.product_location %}, you cannot change or remove the message.
75+
If you include Markdown checkboxes in the message, all checkboxes must be selected before the user can dismiss the message. For example, if you include your terms of service in the mandatory message, you can require that each user selects a checkbox to confirm the user has read the terms.
7876

79-
{% endnote %}
77+
Each time a user sees a mandatory message, an audit log event is created. The event includes the version of the message that the user saw. For more information see "[Audited actions](/admin/user-management/audited-actions)."
8078

79+
{% note %}
8180

82-
If you include Markdown checkboxes in the message, all checkboxes must be selected before the user can dismiss the message. For example, if you include your terms of service in the mandatory message, you can require that each user selects a checkbox to confirm the user has read the terms.
81+
**Note:** If you change the mandatory message for {% data variables.product.product_location %}, users who have already acknowledged the message will not see the new message.
8382

84-
Each time a user sees a mandatory message, an audit log event is created. The event includes the version of the message that the user saw. For more information see "[Audited actions](/admin/user-management/audited-actions)."
83+
{% endnote %}
8584

8685
{% data reusables.enterprise-accounts.access-enterprise %}
8786
{% data reusables.enterprise-accounts.settings-tab %}

content/github/working-with-github-support/submitting-a-ticket.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ topics:
1111

1212
If your account uses a paid {% data variables.product.prodname_dotcom %} product, you can directly contact {% data variables.contact.github_support %}. If your account uses {% data variables.product.prodname_free_user %} for user accounts and organizations, you can contact {% data variables.contact.contact_support %} to report account, security, and abuse issues. For more information, see "[About GitHub Support](/github/working-with-github-support/about-github-support)."
1313

14-
If you use {% data variables.product.prodname_ghe_server %}, {% data variables.product.prodname_ghe_cloud %}, or the {% data variables.product.premium_support_plan %} you must submit tickets using the {% data variables.contact.enterprise_portal %}.
14+
If you do not have an enterprise account, please use the {% data variables.contact.enterprise_portal %} to submit tickets. For more information about enterprise accounts, see "[About enterprise accounts](/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts)."
1515

1616
### Submitting a ticket using the {% data variables.contact.support_portal %}
1717

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
### Accessing premium content
33

4-
You can access premium content by signing in to the {% data variables.contact.contact_enterprise_portal %}.
4+
You can access premium content by signing in to the {% data variables.contact.contact_landing_page_portal %}.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
### Contacting {% data variables.contact.premium_support %}
33

4-
{% data variables.contact.premium_support %} customers can use the {% data variables.contact.contact_enterprise_portal %} to report issues in writing, in English. You can also receive English-language support over the phone. For the {% data variables.contact.premium_support %} phone number, see "[24x7 Phone Support](https://enterprise.githubsupport.com/hc/en-us/articles/360029707371-24x7-Phone-Support)" in the {% data variables.contact.enterprise_portal %}.
4+
{% data variables.contact.premium_support %} customers can use the {% data variables.contact.contact_landing_page_portal %} to report issues in writing, in English.

data/variables/contact.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,14 @@ contact_enterprise_portal: '[GitHub Enterprise Support portal](https://enterpris
3636
ae_azure_portal: 'Azure Support portal'
3737
contact_ae_portal: '[Azure Support portal](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade)'
3838

39-
# GitHub Support portal (for dotcom)
39+
# GitHub Support portal (for dotcom - this sends users to a contact form)
4040
support_portal: 'GitHub Support portal'
4141
contact_support_portal: '[GitHub Support portal](https://support.github.com/contact)'
4242

43+
# GitHub Support portal (this sends users to the Support landing page)
44+
landing_page_portal: 'GitHub Support portal'
45+
contact_landing_page_portal: '[GitHub Support portal](https://support.github.com/)'
46+
4347
# The team that provides GitHub Community Support on the GitHub Community forum (for GitHub Free)
4448
community_support: 'GitHub Community Support'
4549

0 commit comments

Comments
 (0)