Skip to content

Commit 0f5f373

Browse files
authored
Merge pull request #97430 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents d6554bf + 6e01b9e commit 0f5f373

File tree

31 files changed

+135
-111
lines changed

31 files changed

+135
-111
lines changed

articles/active-directory/saas-apps/hrworks-single-sign-on-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ To configure Azure AD single sign-on with HRworks Single Sign-On, perform the fo
105105
`https://login.hrworks.de/?companyId=<companyId>&directssologin=true`
106106

107107
> [!NOTE]
108-
> The value is not real. Update the value with the actual Sign-On URL. Contact [HRworks Single Sign-On Client support team](mailto:support@hrworks.de) to get the value. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
108+
> The value is not real. Update the value with the actual Sign-On URL. Contact the [HRworks Single Sign-On Client support team](https://www.hrworks.de/dienstleistungen/support/) to get the value. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
109109

110110
5. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Federation Metadata XML** from the given options as per your requirement and save it on your computer.
111111

articles/active-directory/saas-apps/idc-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
9494
`https://www.idc.com/saml-welcome/<SamlWelcomeCode>`
9595

9696
> [!NOTE]
97-
> These values are not real. Update these values with the actual Identifier and Reply URL. Contact [IDC Client support team](mailto:[email protected]) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
97+
> These values are not real. Update these values with the actual Identifier and Reply URL. Contact the IDC Client support team to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
9898
9999
1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, find **Federation Metadata XML** and select **Download** to download the certificate and save it on your computer.
100100

@@ -136,7 +136,7 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
136136

137137
## Configure IDC SSO
138138

139-
To configure single sign-on on **IDC** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to [IDC support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
139+
To configure single sign-on on the **IDC** side, send the downloaded **Federation Metadata XML** and appropriate copied URLs from the Azure portal to the IDC support team. IDC configures this setting so the SAML SSO connection is set properly on both sides.
140140

141141
### Create IDC test user
142142

articles/azure-app-configuration/quickstart-dotnet-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ In this quickstart, you incorporate Azure App Configuration into a .NET Framewor
109109
110110
## Next steps
111111
112-
In this quickstart, you created a new App Configuration store and used it with a .NET Framework console app. The value `AppSettings` of `ConfiguratoinManager` won't change after the application is started. The App Configuration .NET Standard configuration provider library, however can also be used in a .NET Framework app. To learn how to enable your .NET Framework app to dynamically refresh configuration settings, continue to the next tutorial.
112+
In this quickstart, you created a new App Configuration store and used it with a .NET Framework console app. The value `AppSettings` of `ConfigurationManager` won't change after the application is started. The App Configuration .NET Standard configuration provider library, however can also be used in a .NET Framework app. To learn how to enable your .NET Framework app to dynamically refresh configuration settings, continue to the next tutorial.
113113
114114
> [!div class="nextstepaction"]
115115
> [Enable dynamic configuration](./enable-dynamic-configuration-dotnet.md)

articles/azure-resource-manager/move-support-resources.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,9 +1263,9 @@ Jump to a resource provider namespace:
12631263
> [!div class="mx-tableFixed"]
12641264
> | Resource type | Resource group | Subscription |
12651265
> | ------------- | ----------- | ---------- |
1266-
> | account | Yes | Yes |
1267-
> | account / extension | Yes | Yes |
1268-
> | account / project | Yes | Yes |
1266+
> | account | No | No |
1267+
> | account / extension | No | No |
1268+
> | account / project | No | No |
12691269
12701270
> [!IMPORTANT]
12711271
> To change the subscription for Azure DevOps, see [change the Azure subscription used for billing](/azure/devops/organizations/billing/change-azure-subscription?toc=/azure/azure-resource-manager/toc.json).

articles/batch/batch-task-output.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ For more information on persisting task output with the Batch service API, see [
4747

4848
### Use the Batch File Conventions library for .NET
4949

50-
Batch defines an optional set of conventions for naming task output files in Azure Storage. The [Batch File Conventions standard](https://github.com/Azure/azure-sdk-for-net/tree/psSdkJson6/src/SDKs/Batch/Support/FileConventions#conventions) describes these conventions. The File Conventions standard determines the names of the destination container and blob path in Azure Storage for a given output file based on the names of the job and task.
50+
Batch defines an optional set of conventions for naming task output files in Azure Storage. The [Batch File Conventions standard](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/batch/Microsoft.Azure.Batch.Conventions.Files#conventions) describes these conventions. The File Conventions standard determines the names of the destination container and blob path in Azure Storage for a given output file based on the names of the job and task.
5151

5252
It's up to you whether you decide to use the File Conventions standard for naming your output data files. You can also name the destination container and blob however you wish. If you do use the File Conventions standard for naming output files, then your output files are available for viewing in the [Azure portal][portal].
5353

54-
Developers building Batch solutions with C# and .NET can use the [File Conventions library for .NET][nuget_package] to persist task data to an Azure Storage account, according to the [Batch File Conventions standard](https://github.com/Azure/azure-sdk-for-net/tree/psSdkJson6/src/SDKs/Batch/Support/FileConventions#conventions). The File Conventions library handles moving output files to Azure Storage and naming destination containers and blobs in a well-known way.
54+
Developers building Batch solutions with C# and .NET can use the [File Conventions library for .NET][nuget_package] to persist task data to an Azure Storage account, according to the [Batch File Conventions standard](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/batch/Microsoft.Azure.Batch.Conventions.Files#conventions). The File Conventions library handles moving output files to Azure Storage and naming destination containers and blobs in a well-known way.
5555

5656
For more information on persisting task output with the File Conventions library for .NET, see [Persist job and task data to Azure Storage with the Batch File Conventions library for .NET](batch-task-output-file-conventions.md).
5757

5858
### Implement the Batch File Conventions standard
5959

60-
If you are using a language other than .NET, you can implement the [Batch File Conventions standard](https://github.com/Azure/azure-sdk-for-net/tree/psSdkJson6/src/SDKs/Batch/Support/FileConventions#conventions) in your own application.
60+
If you are using a language other than .NET, you can implement the [Batch File Conventions standard](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/batch/Microsoft.Azure.Batch.Conventions.Files#conventions) in your own application.
6161

6262
You may want to implement the File Conventions naming standard yourself when you want a proven naming scheme, or when you want to view task output in the Azure portal.
6363

articles/cognitive-services/LUIS/index.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ landingContent:
5959
- text: "Portal: Create a new LUIS app"
6060
url: get-started-portal-build-app.md
6161
- text: Using C# SDK
62-
url: sdk-python-quickstart-authoring-app.md
62+
url: sdk-csharp-quickstart-authoring-app.md
6363
- text: Using Python SDK
6464
url: sdk-python-quickstart-authoring-app.md
6565

@@ -90,7 +90,7 @@ landingContent:
9090
- text: "Portal: Deploy app to prediction endpoint"
9191
url: get-started-portal-deploy-app.md
9292
- text: Using C# SDK
93-
url: sdk-python-quickstart-authoring-app.md#train-the-app
93+
url: sdk-csharp-quickstart-authoring-app.md#train-the-app
9494
- text: Using Python SDK
9595
url: sdk-python-quickstart-authoring-app.md#train-the-app
9696

@@ -150,4 +150,4 @@ landingContent:
150150
- text: Ask questions on Stack Overflow
151151
url: https://stackoverflow.com/questions/tagged/LUIS
152152
- text: Influence service with UserVoice
153-
url: https://cognitive.uservoice.com/forums/551524-luis
153+
url: https://cognitive.uservoice.com/forums/551524-luis

articles/cognitive-services/personalizer/what-is-personalizer.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.author: diberry
1515

1616
# What is Personalizer?
1717

18-
Azure Personalizer is a cloud-based API service that allows you to choose the best experience to show to your users, learning from their collective real-time behavior.
18+
Azure Personalizer is a cloud-based API service that allows your application to choose the best experience to show to your users, learning from their collective real-time behavior.
1919

2020
* Provide information about your users and content and receive the top action to show your users.
2121
* No need to clean and label data before using Personalizer.
@@ -56,8 +56,8 @@ Personalizer is not a service to persist and manage user profile information, or
5656

5757
Personalizer Service has two APIs:
5858

59-
* Send information (_features_) about your users and the content (_actions_) to personalize. Personalizer responds with the top action.
60-
* Send feedback to Personalizer about how well the ranking worked as a [reward score](concept-rewards.md).
59+
* *Rank*: Use the Rank API to determine which _action_ to show, in the current _context_. Actions are sent as an array of JSON objects, with an ID and information (_features_) about each; context is sent as another JSON object. The API returns the actionId that your application should render to the user.
60+
* *Reward*: After your user interacts with your application, you measure how well the personalization worked as a number between 0 and 1 and send it as a [reward score](concept-rewards.md).
6161

6262
![Basic sequence of events for Personalization](media/what-is-personalizer/personalization-intro.png)
6363

articles/container-instances/container-instances-container-groups.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ Azure Container Instances allocates resources such as CPUs, memory, and optional
4343

4444
### Resource usage by instances
4545

46-
Each container instance is allocated the resources specified in its resource request. However, the resource usage by a container instance in a group depends on how you configure its optional [resource limit][resource-limits] property.
46+
Each container instance is allocated the resources specified in its resource request. However, the resource usage by a container instance in a group depends on how you configure its optional [resource limit][resource-limits] property. The resource limit must be less than than the mandatory [resource request][resource-requests] property.
4747

4848
* If you don't specify a resource limit, the instance's maximum resource usage is the same as its resource request.
4949

5050
* If you specify a resource limit for an instance, you can adjust the instance's resource usage for its workload, either reducing or increasing usage relative to the resource request. The maximum resource limit you can set is the total resources allocated to the group.
5151

52-
For example, in a group with two instances requesting 1 CPU, one of your containers might run a workload that requires more CPUs to run than the other.
52+
For example, in a group with two instances requesting 1 CPU, one of your containers might run a workload that requires more CPUs to run than the other.
5353

54-
In this scenario, you could set a resource limit of 0.5 CPU for one instance, and a limit of 2 CPUs for the second. This configuration limits the first container's resource usage to 0.5 CPU, allowing the second container to use up to the full 2 CPUs if available.
54+
In this scenario, you could set a resource limit of 0.5 CPU for one instance, and a limit of 2 CPUs for the second. This configuration limits the first container's resource usage to 0.5 CPU, allowing the second container to use up to the full 2 CPUs if available.
5555

5656
For more information, see the [ResourceRequirements][resource-requirements] property in the container groups REST API.
5757

articles/cosmos-db/provision-throughput-autopilot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.date: 11/04/2019
1313
Azure Cosmos DB allows you to provision throughput on your containers in either manual or autopilot mode. This article describes the benefits and use cases of autopilot mode.
1414

1515
> [!NOTE]
16-
> Autopilot mode is currently available in public preview. To enable autopilot feature for your Azure Cosmos account, see the [enable autopilot](#enable-autopilot) section of this article. You can enable autopilot for new databases and containers only,it's not available for existing containers and databases.
16+
> Autopilot mode is currently available in public preview. To enable autopilot feature for your Azure Cosmos account, see the [enable autopilot](#enable-autopilot) section of this article. You can enable autopilot for new databases and containers only, it's not available for existing containers and databases.
1717
1818
In addition to manual provisioning of throughput, you can now configure Azure cosmos containers in autopilot mode. Azure Cosmos containers and databases configured in autopilot mode will **automatically and instantly scale the provisioned throughput based on your application needs without compromising the SLAs.**
1919

articles/data-factory/data-flow-source.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ You can modify the column data types in a down-stream derived-column transformat
151151

152152
### Import schema
153153

154-
Datasets like Avro and CosmosDB that support complex data structures do not require schema definitions to exist in the dataset. Therefore, you will be able to click the "Import Schema" button the Projection tab for these types of sources.
154+
Datasets like Avro and CosmosDB that support complex data structures do not require schema definitions to exist in the dataset. Therefore, you will be able to click the **Import Schema** button on the **Projection** tab for these types of sources.
155155

156156
## CosmosDB specific settings
157157

0 commit comments

Comments
 (0)