Skip to content

Commit 702232f

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into mrb_03_14_2023_openai_net_quickstart
2 parents 2897615 + b46f907 commit 702232f

File tree

10 files changed

+190
-153
lines changed

10 files changed

+190
-153
lines changed

articles/active-directory/app-provisioning/use-scim-to-provision-users-and-groups.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-provisioning
99
ms.workload: identity
1010
ms.topic: tutorial
11-
ms.date: 03/14/2023
11+
ms.date: 03/15/2023
1212
ms.author: kenwith
1313
ms.reviewer: arvinh
1414
---
@@ -1202,7 +1202,7 @@ In the example of a request, to retrieve the current state of a user, the values
12021202

12031203
***Example 4. Query the value of a reference attribute to be updated***
12041204

1205-
If a reference attribute is to be updated, then Azure AD queries the service to determine whether the current value of the reference attribute in the identity store fronted by the service already matches the value of that attribute in Azure AD. For users, the only attribute of which the current value is queried in this way is the manager attribute. Here's an example of a request to determine whether the manager attribute of a user object currently has a certain value:
1205+
Azure AD checks the current attribute value in the identity store before updating it. However, only the manager attribute is the checked first for users. Here's an example of a request to determine whether the manager attribute of a user object currently has a certain value:
12061206
In the sample code, the request is translated into a call to the QueryAsync method of the services provider. The value of the properties of the object provided as the value of the parameters argument are as follows:
12071207

12081208
* parameters.AlternateFilters.Count: 2
@@ -1304,7 +1304,7 @@ Check with your application provider, or your application provider's documentati
13041304

13051305
### Getting started
13061306

1307-
Applications that support the SCIM profile described in this article can be connected to Azure AD using the "non-gallery application" feature in the Azure AD application gallery. Once connected, Azure AD runs a synchronization process every 40 minutes where it queries the application's SCIM endpoint for assigned users and groups, and creates or modifies them according to the assignment details.
1307+
Applications that support the SCIM profile described in this article can be connected to Azure AD using the "non-gallery application" feature in the Azure AD application gallery. Once connected, Azure AD runs a synchronization process. The process runs every 40 minutes. The process queries the application's SCIM endpoint for assigned users and groups, and creates or modifies them according to the assignment details.
13081308

13091309
**To connect an application that supports SCIM:**
13101310

@@ -1398,7 +1398,7 @@ The provisioning service supports the [authorization code grant](https://tools.i
13981398
> [!NOTE]
13991399
> OAuth v1 is not supported due to exposure of the client secret. OAuth v2 is supported.
14001400

1401-
It is recommended, but not required, that you support multiple secrets for easy renewal without downtime.
1401+
It's recommended, but not required, that you support multiple secrets for easy renewal without downtime.
14021402

14031403
#### How to set up OAuth code grant flow
14041404

articles/active-directory/external-identities/direct-federation.md

Lines changed: 18 additions & 18 deletions
Large diffs are not rendered by default.

articles/active-directory/manage-apps/migrate-okta-sign-on-policies-to-azure-active-directory-conditional-access.md

Lines changed: 130 additions & 103 deletions
Large diffs are not rendered by default.

articles/azure-monitor/app/tutorial-asp-net-core.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ public class ValuesController : ControllerBase
349349
public ActionResult<IEnumerable<string>> Get()
350350
{
351351
//Info level traces are not captured by default
352-
_logger.LogInformation("An example of an Info trace..")
352+
_logger.LogInformation("An example of an Info trace..");
353353
_logger.LogWarning("An example of a Warning trace..");
354354
_logger.LogError("An example of an Error level message");
355355

articles/azure-netapp-files/performance-benchmarks-azure-vmware-solution.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.service: azure-netapp-files
1212
ms.workload: storage
1313
ms.tgt_pltfrm: na
1414
ms.topic: conceptual
15-
ms.date: 02/07/2023
15+
ms.date: 03/15/2023
1616
ms.author: anfdocs
1717
---
1818
# Azure NetApp Files datastore performance benchmarks for Azure VMware Solution
@@ -28,6 +28,8 @@ The following `read:write` I/O ratios were tested for each scenario: `100:0, 75:
2828

2929
Benchmarks documented in this article were performed with sufficient volume throughput to prevent soft limits from affecting performance. Benchmarks can be achieved with Azure NetApp Files Premium and Ultra service levels, and in some cases with Standard service level. For more information on volume throughput, see [Performance considerations for Azure NetApp Files](azure-netapp-files-performance-considerations.md).
3030

31+
Refer to the [Azure NetApp Files datastore for Azure VMware Solution TCO Estimator](https://aka.ms/anfavscalc) to understand the sizing and associated cost benefits of Azure NetApp Files datastores.
32+
3133
## Environment details
3234

3335
The results in this article were achieved using the following environment configuration:

articles/cognitive-services/Translator/document-translation/how-to-guides/create-use-glossaries.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ A glossary is a list of terms with definitions that you create for the Document
1616

1717
* **No translation**. For example, you can restrict Document Translation from translating product name brands by using a glossary with the same source and target text.
1818

19-
* **Specify translation for words with several meanings**. Choose a specific translation for poly&#8203;semantic words.
19+
* **Specified translations for ambiguous words**. Choose a specific translation for poly&#8203;semantic words.
2020

2121
## Create, upload, and use a glossary file
2222

@@ -26,7 +26,7 @@ A glossary is a list of terms with definitions that you create for the Document
2626

2727
The following English-source glossary contains words that can have different meanings depending upon the context in which they're used. The glossary provides the expected translation for each word in the file to help ensure accuracy.
2828

29-
For instance, when the word `Bank` appears in a financial document, it would be translated as `Banque` to reflect its financial meaning. If the word `Bank` appears in a geography document, it might be translated as `shore` to reflect its topographical meaning. Similarly, the word `Crane` can refer to either a `bird` or a `machine`.
29+
For instance, when the word `Bank` appears in a financial document, it should be translated to reflect its financial meaning. If the word `Bank` appears in a geographical document, it may refer to shore to reflect its topographical meaning. Similarly, the word `Crane` can refer to either a bird or machine.
3030

3131
***Example glossary .tsv file: English-to-French***
3232

articles/network-watcher/diagnose-vm-network-routing-problem.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.custom: template-tutorial, mvc, engagement-fy23
1414

1515
# Tutorial: Diagnose a virtual machine network routing problem using the Azure portal
1616

17-
When you deploy a virtual machine (VM), Azure creates several [system default routes](/articles/virtual-network/virtual-networks-udr-overview.md#system-routes?toc=%2Fazure%2Fnetwork-watcher%2Ftoc.json&tabs=json) for it. You can create [custom routes](/articles/virtual-network/virtual-networks-udr-overview.md#custom-routes?toc=%2Fazure%2Fnetwork-watcher%2Ftoc.json&tabs=json) to override some of Azure's system routes. Sometimes, a custom route can result in a VM not being able to communicate with the intended destination. You can use Azure Network Watcher [next hop](network-watcher-next-hop-overview.md) capability to troubleshoot and diagnose the VM routing problem that's preventing it from correctly communicating with other resources.
17+
When you deploy a virtual machine (VM), Azure creates several [system default routes](/azure/virtual-network/virtual-networks-udr-overview#system-routes?toc=%2Fazure%2Fnetwork-watcher%2Ftoc.json&tabs=json) for it. You can create [custom routes](/azure/virtual-network/virtual-networks-udr-overview#custom-routes?toc=%2Fazure%2Fnetwork-watcher%2Ftoc.json&tabs=json) to override some of Azure's system routes. Sometimes, a custom route can result in a VM not being able to communicate with the intended destination. You can use Azure Network Watcher [next hop](network-watcher-next-hop-overview.md) capability to troubleshoot and diagnose the VM routing problem that's preventing it from correctly communicating with other resources.
1818

1919
In this tutorial, you learn how to:
2020

@@ -268,7 +268,7 @@ The custom route with prefix 0.0.0.0/0 overrode Azure default route and caused a
268268
:::image type="content" source="./media/diagnose-vm-network-routing-problem/effective-routes-custom.png" alt-text="Screenshot the effective routes after overriding Azure default system routes using a custom route.":::
269269

270270
> [!NOTE]
271-
> In this tutorial, traffic to `www.bing.com` was dropped because **myNVA** was not set up to forward traffic. To learn how to set up a virtual machine to forward traffic, see [Turn on IP forwarding](/articles/virtual-network/tutorial-create-route-table-portal.md#turn-on-ip-forwarding).
271+
> In this tutorial, traffic to `www.bing.com` was dropped because **myNVA** was not set up to forward traffic. To learn how to set up a virtual machine to forward traffic, see [Turn on IP forwarding](/azure/virtual-network/tutorial-create-route-table-portal#turn-on-ip-forwarding).
272272
273273
## Clean up resources
274274

articles/network-watcher/network-watcher-nsg-flow-logging-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: halkazwini
77
ms.service: network-watcher
88
ms.topic: conceptual
99
ms.workload: infrastructure-services
10-
ms.date: 02/27/2023
10+
ms.date: 03/15/2023
1111
ms.author: halkazwini
1212
ms.custom: template-concept, engagement-fy23
1313
---
@@ -391,7 +391,7 @@ If you want to retain data forever and don't want to apply any retention policy,
391391

392392
### User-defined inbound TCP rules
393393

394-
network security groups are implemented as a [stateful firewall](https://en.wikipedia.org/wiki/Stateful_firewall?oldformat=true). But because of current platform limitations, user-defined rules that affect inbound TCP flows are implemented in a stateless way.
394+
Network security groups are implemented as a [stateful firewall](https://en.wikipedia.org/wiki/Stateful_firewall?oldformat=true). But because of current platform limitations, user-defined rules that affect inbound TCP flows are implemented in a stateless way.
395395

396396
Flows that user-defined inbound rules affect become non-terminating. Additionally, byte and packet counts aren't recorded for these flows. Because of those factors, the number of bytes and packets reported in NSG flow logs (and Network Watcher traffic analytics) could be different from actual numbers.
397397

0 commit comments

Comments
 (0)