Skip to content

Commit 5f83ccd

Browse files
authored
Merge pull request #218678 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents b4aa2e8 + 1358d00 commit 5f83ccd

File tree

6 files changed

+14
-9
lines changed

6 files changed

+14
-9
lines changed

articles/active-directory-b2c/tutorial-create-user-flows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The sign-up and sign-in user flow handles both sign-up and sign-in experiences w
7676

7777
1. Enter a **Name** for the user flow. For example, *signupsignin1*.
7878
1. For **Identity providers**, select **Email signup**.
79-
1. For **User attributes and claims**, choose the claims and attributes that you want to collect and send from the user during sign-up. For example, select **Show more**, and then choose attributes and claims for **Country/Region**, **Display Name**, and **Postal Code**. Select **OK**.
79+
1. For **User attributes and token claims**, choose the claims and attributes that you want to collect and send from the user during sign-up. For example, select **Show more**, and then choose attributes and claims for **Country/Region**, **Display Name**, and **Postal Code**. Select **OK**.
8080

8181
![Attributes and claims selection page with three claims selected](./media/tutorial-create-user-flows/signup-signin-attributes.png)
8282

articles/azure-app-configuration/howto-best-practices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ Use the App Configuration provider or SDK libraries to access App Configuration
7676

7777
You can also make your App Configuration data accessible to your application as *Application settings* or environment variables. With this approach, you can avoid changing your application code.
7878

79-
* Add references to your App Configuration data in the *Application settings* of your App Service or Azure Functions. For more information, see [Use App Configuration references for App Service and Azure Functions](../app-service/app-service-configuration-references.md).
80-
* [Export your App Configuration data](howto-import-export-data.md#export-data-to-azure-app-service) to the *Application settings* of your App Service or Azure Functions. Export your data again every time you make new changes in App Configuration if you like your application to pick up the change.
79+
* Add references to your App Configuration data in the *Application settings* of your App Service or Azure Functions. App Configuration offers tools to [export a collection of key-values as references](howto-import-export-data.md#export-data-to-azure-app-service) at once. For more information, see [Use App Configuration references for App Service and Azure Functions](../app-service/app-service-configuration-references.md).
80+
* [Export your App Configuration data](howto-import-export-data.md#export-data-to-azure-app-service) to the *Application settings* of your App Service or Azure Functions without selecting the option of export-as-reference. Export your data again every time you make new changes in App Configuration if you like your application to pick up the change.
8181

8282
## Reduce requests made to App Configuration
8383

articles/chaos-studio/chaos-studio-quickstart-azure-portal.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Create and run a chaos experiment using Azure Chaos Studio
33
description: Understand the steps to create and run a Chaos Studio experiment in 10mins
44
services: chaos-studio
5-
author: prashabora
5+
author: prasha-microsoft
66
ms.topic: quickstart
77
ms.date: 11/10/2021
88
ms.author: prashabora
@@ -26,6 +26,11 @@ If this is your first time using Chaos Studio, you must first register the Chaos
2626
5. In the list of resource providers that appears, search for **Microsoft.Chaos**.
2727
6. Click on the Microsoft.Chaos provider, and click the **Register** button.
2828

29+
## Create an Azure resource supported by Chaos Studio
30+
31+
Create an azure resource and ensure this is one of the supported [fault providers](chaos-studio-fault-providers.md). Also validate if this resource is being created in the [region](https://azure.microsoft.com/global-infrastructure/services/?products=chaos-studio) where Chaos Studio is available. In this experiment we choose an Azure Virtual Machine which is one of the supported fault providers for Chaos Studio.
32+
33+
2934
## Enable Chaos Studio on the Virtual Machine you created
3035
1. Open the [Azure portal](https://portal.azure.com).
3136
2. Search for **Chaos Studio (preview)** in the search bar.

articles/energy-data-services/tutorial-seismic-ddms-sdutil.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: template-tutorial #Required; leave this attribute/value as-is.
1313

1414
# Tutorial: Seismic store sdutil
1515

16-
Sdutil is a command line python utility tool designed to easily interact with seismic store. The seismic store is a cloud-based solution designed to store and manage datasets of any size in the cloud by enabling a secure way to access them through a scoped authorization mechanism. Seismic Store overcomes the object size limitations imposed by a cloud provider by managing generic datasets as multi-independent objects. This provides a generic, reliable, and better performing solution to handle data in cloud storage.
16+
Sdutil is a command line Python utility tool designed to easily interact with seismic store. The seismic store is a cloud-based solution designed to store and manage datasets of any size in the cloud by enabling a secure way to access them through a scoped authorization mechanism. Seismic Store overcomes the object size limitations imposed by a cloud provider by managing generic datasets as multi-independent objects. This provides a generic, reliable, and better performing solution to handle data in cloud storage.
1717

1818
**Sdutil** is an intuitive command line utility tool to interact with seismic store and perform some basic operations like upload or download datasets to or from seismic store, manage users, list folders content and more.
1919

@@ -305,7 +305,7 @@ Run the changelog script (`./changelog-generator.sh`) to automatically generate
305305

306306
Microsoft Energy Data Services instance is using OSDU™ M12 Version of sdutil. Follow the below steps if you would like to use SDUTIL to leverage the SDMS API of your MEDS instance.
307307

308-
1. Ensure you have followed the [installation](#prerequisites) and [configuration](#configuration) steps from above. This includes downloading the SDUTIL source code, configuring your python virtual environment, editing the `config.yaml` file and setting your three environment variables.
308+
1. Ensure you have followed the [installation](#prerequisites) and [configuration](#configuration) steps from above. This includes downloading the SDUTIL source code, configuring your Python virtual environment, editing the `config.yaml` file and setting your three environment variables.
309309

310310
2. Run below commands to sign in, list, upload and download files in the seismic store.
311311

articles/firewall/premium-features.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Azure Firewall Premium includes the following features:
2424

2525
- **TLS inspection** - decrypts outbound traffic, processes the data, then encrypts the data and sends it to the destination.
2626
- **IDPS** - A network intrusion detection and prevention system (IDPS) allows you to monitor network activities for malicious activity, log information about this activity, report it, and optionally attempt to block it.
27-
- **URL filtering** - extends Azure Firewall’s FQDN filtering capability to consider an entire URL. For example, `www.contoso.com/a/c` instead of `www.contoso.com`.
27+
- **URL filtering** - extends Azure Firewall’s FQDN filtering capability to consider an entire URL along with any additional path. For example, `www.contoso.com/a/c` instead of `www.contoso.com`.
2828
- **Web categories** - administrators can allow or deny user access to website categories such as gambling websites, social media websites, and others.
2929

3030
## TLS inspection
@@ -151,7 +151,7 @@ You can identify what category a given FQDN or URL is by using the **Web Categor
151151
152152
### Category change
153153

154-
Under the **Web Categories** tab in **Firewall Policy Settings**, you can request a categorization change if you:
154+
Under the **Web Categories** tab in **Firewall Policy Settings**, you can request a category change if you:
155155

156156
- think an FQDN or URL should be under a different category
157157

articles/frontdoor/billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ If the request can be served from the Front Door edge location's cache, Front Do
6565

6666
### Data transfer from origin to Front Door
6767

68-
When your origin server processes a request, it sends data back to Front Door so that it can be returned to the client. This traffic not billed by Front Door, even if the origin is in a different region to the Front Door edge location for the request.
68+
When your origin server processes a request, it sends data back to Front Door so that it can be returned to the client. This traffic is not billed by Front Door, even if the origin is in a different region to the Front Door edge location for the request.
6969

7070
If your origin is within Azure, the data egress from the Azure origin to Front Door isn't charged. However, you should determine whether those Azure services might bill you to process your requests.
7171

0 commit comments

Comments
 (0)