Skip to content

Commit 63b74ec

Browse files
authored
Merge pull request #182400 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 2d2aeed + beebe01 commit 63b74ec

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

articles/azure-vmware/tutorial-nsx-t-network-segment.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ In this tutorial, you learn how to:
2424

2525
An Azure VMware Solution private cloud with access to the vCenter and NSX-T Manager interfaces. For more information, see the [Configure networking](tutorial-configure-networking.md) tutorial.
2626

27-
## Use NSX-T Manager to add network segment
28-
29-
The virtual machines (VMs) created in vCenter are placed onto the network segments created in NSX-T and are visible in vCenter.
30-
31-
[!INCLUDE [add-network-segment-steps](includes/add-network-segment-steps.md)]
3227

3328
## Use Azure portal to add an NSX-T segment
3429

3530
[!INCLUDE [create-nsxt-segment-azure-portal-steps](includes/create-nsxt-segment-azure-portal-steps.md)]
3631

32+
## Use NSX-T Manager to add network segment
33+
34+
The virtual machines (VMs) created in vCenter are placed onto the network segments created in NSX-T and are visible in vCenter.
35+
36+
[!INCLUDE [add-network-segment-steps](includes/add-network-segment-steps.md)]
3737

3838
## Verify the new network segment
3939

articles/defender-for-cloud/enhanced-security-features-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ No. When you enable [Microsoft Defender for servers](defender-for-servers-introd
8080
An alternative is to enable Microsoft Defender for servers at the Log Analytics workspace level. If you do this, only servers reporting to that workspace will be protected and billed. However, several capabilities will be unavailable. These include just-in-time VM access, network detections, regulatory compliance, adaptive network hardening, adaptive application control, and more.
8181

8282
### If I already have a license for Microsoft Defender for Endpoint can I get a discount for Defender for servers?
83-
If you've already got a license for Microsoft Defender for Endpoint for Servers (purchased through an Office E5 explicit "Defender for Endpoint **Servers**" license), you won't have to pay for that part of your Microsoft Defender for servers license. Learn more about [this license](/microsoft-365/security/defender-endpoint/minimum-requirements#licensing-requirements).
83+
If you've already got a license for **Microsoft Defender for Endpoint for Servers**, you won't have to pay for that part of your Microsoft Defender for servers license. Learn more about [this license](/microsoft-365/security/defender-endpoint/minimum-requirements#licensing-requirements).
8484

85-
To request your discount, [contact Defender for Cloud's support team](https://ms.portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/overview). You'll need to provide the relevant workspace ID, region, and number of Microsoft Defender for Endpoint licenses applied for machines in the given workspace.
85+
To request your discount, [contact Defender for Cloud's support team](https://ms.portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/overview). You'll need to provide the relevant workspace ID, region, and number of Microsoft Defender for Endpoint for servers licenses applied for machines in the given workspace.
8686

8787
The discount will be effective starting from the approval date, and won't take place retroactively.
8888
### My subscription has Microsoft Defender for servers enabled, do I pay for not-running servers?

articles/defender-for-cloud/integration-defender-for-endpoint.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,9 @@ Defender for Cloud automatically deploys the extension to machines running:
268268
Defender for Endpoint is included at no extra cost with **Microsoft Defender for servers**. Alternatively, it can be purchased separately for 50 machines or more.
269269
270270
### If I already have a license for Microsoft Defender for Endpoint, can I get a discount for Microsoft Defender for servers?
271-
If you've already got a license for Microsoft Defender for Endpoint for Servers (purchased through an Office E5 explicit "Defender for Endpoint **Servers**" license), you won't have to pay for that part of your Microsoft Defender for servers license. Learn more about [this license](/microsoft-365/security/defender-endpoint/minimum-requirements#licensing-requirements).
271+
If you've already got a license for **Microsoft Defender for Endpoint for Servers** , you won't have to pay for that part of your Microsoft Defender for servers license. Learn more about [this license](/microsoft-365/security/defender-endpoint/minimum-requirements#licensing-requirements).
272272
273-
To request your discount, [contact Defender for Cloud's support team](https://ms.portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/overview). You'll need to provide the relevant workspace ID, region, and number of Microsoft Defender for Endpoint licenses applied for machines in the given workspace.
273+
To request your discount, [contact Defender for Cloud's support team](https://ms.portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/overview). You'll need to provide the relevant workspace ID, region, and number of Microsoft Defender for Endpoint for servers licenses applied for machines in the given workspace.
274274
275275
The discount will be effective starting from the approval date, and won't take place retroactively.
276276

articles/logic-apps/logic-apps-gateway-connection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ After you create your gateway resource and associate your Azure subscription wit
101101

102102
1. In the Azure portal, create or open your logic app in the Logic App Designer.
103103

104-
1. Add a connector that supports on-premises connections, for example, **SQL Server**.
104+
1. Add a connector that supports on-premises connections. If this connector has both a [managed version](../connectors/managed.md#on-premises-connectors) and a [built-in version](../connectors/built-in.md), make sure that you use the managed version.
105105

106106
1. Select **Connect via on-premises data gateway**.
107107

articles/machine-learning/how-to-create-attach-kubernetes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ aks_target.wait_for_completion(show_output = True)
187187
For more information on the classes, methods, and parameters used in this example, see the following reference documents:
188188

189189
* [AksCompute.ClusterPurpose](/python/api/azureml-core/azureml.core.compute.aks.akscompute.clusterpurpose)
190-
* [AksCompute.provisioning_configuration](/python/api/azureml-core/azureml.core.compute.akscompute#attach-configuration-resource-group-none--cluster-name-none--resource-id-none--cluster-purpose-none-)
190+
* [AksCompute.provisioning_configuration](/python/api/azureml-core/azureml.core.compute.akscompute?view=azure-ml-py#provisioning-configuration-agent-count-none--vm-size-none--ssl-cname-none--ssl-cert-pem-file-none--ssl-key-pem-file-none--location-none--vnet-resourcegroup-name-none--vnet-name-none--subnet-name-none--service-cidr-none--dns-service-ip-none--docker-bridge-cidr-none--cluster-purpose-none--load-balancer-type-none--load-balancer-subnet-none-)
191191
* [ComputeTarget.create](/python/api/azureml-core/azureml.core.compute.computetarget#create-workspace--name--provisioning-configuration-)
192192
* [ComputeTarget.wait_for_completion](/python/api/azureml-core/azureml.core.compute.computetarget#wait-for-completion-show-output-false-)
193193

0 commit comments

Comments
 (0)