Skip to content

Commit 23f1df1

Browse files
authored
Merge pull request #205281 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 7586613 + c52ac51 commit 23f1df1

File tree

6 files changed

+21
-17
lines changed

6 files changed

+21
-17
lines changed

articles/active-directory/develop/reference-aadsts-error-codes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ The `error` field has several possible values - review the protocol documentatio
177177
| AADSTS50178 | SessionControlNotSupportedForPassthroughUsers - Session control isn't supported for passthrough users. |
178178
| AADSTS50180 | WindowsIntegratedAuthMissing - Integrated Windows authentication is needed. Enable the tenant for Seamless SSO. |
179179
| AADSTS50187 | DeviceInformationNotProvided - The service failed to perform device authentication. |
180-
| AADSTS50194 | Application '{appId}'({appName}) is n't configured as a multi-tenant application. Usage of the /common endpoint isn't supported for such applications created after '{time}'. Use a tenant-specific endpoint or configure the application to be multi-tenant. |
180+
| AADSTS50194 | Application '{appId}'({appName}) isn't configured as a multi-tenant application. Usage of the /common endpoint isn't supported for such applications created after '{time}'. Use a tenant-specific endpoint or configure the application to be multi-tenant. |
181181
| AADSTS50196 | LoopDetected - A client loop has been detected. Check the app’s logic to ensure that token caching is implemented, and that error conditions are handled correctly. The app has made too many of the same request in too short a period, indicating that it is in a faulty state or is abusively requesting tokens. |
182182
| AADSTS50197 | ConflictingIdentities - The user could not be found. Try signing in again. |
183183
| AADSTS50199 | CmsiInterrupt - For security reasons, user confirmation is required for this request. Because this is an "interaction_required" error, the client should do interactive auth. This occurs because a system webview has been used to request a token for a native application - the user must be prompted to ask if this was actually the app they meant to sign into. To avoid this prompt, the redirect URI should be part of the following safe list: <br />http://<br />https://<br />msauth://(iOS only)<br />msauthv2://(iOS only)<br />chrome-extension:// (desktop Chrome browser only) |

articles/active-directory/fundamentals/road-to-the-cloud-implement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Client workstations are traditionally joined to AD and managed via group policy
7070

7171
[Windows Autopilot](/mem/autopilot/windows-autopilot) is highly recommended to establish a streamlined onboarding and device provisioning, which can enforce these directives.
7272

73-
For more information, see [Get started with cloud native Windows endpoints - Microsoft Endpoint Manager](/mem/cloud-native-windows-endpoints)
73+
For more information, see [Learn more about cloud-native endpoints](/mem/cloud-native-endpoints-overview)
7474

7575
## Applications
7676

articles/backup/guidance-best-practices.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,7 @@ To help you protect your backup data and meet the security needs of your busines
212212
- In terms of the scope of the access,
213213

214214
- _User2_ can access only the Resources of Subscription1, and User3 can access only the Resources of Subscription2.
215-
- _User4_ is a Backup Operator. It has the permission to enable backup, trigger on-demand backup, trigger
216-
- Restores, along with the capabilities of a Backup Reader. However, in this scenario, its scope is limited only to Subscription2.
215+
- _User4_ is a Backup Operator. It has the permission to enable backup, trigger on-demand backup, trigger restores, along with the capabilities of a Backup Reader. However, in this scenario, its scope is limited only to Subscription2.
217216
- _User1_ is a Backup Contributor. It has the permission to create vaults, create/modify/delete backup policies, and stop backups, along with the capabilities of a Backup Operator. However, in this scenario, its scope is limited only to _Subscription1_.
218217

219218
- Storage accounts used by Recovery Services vaults are isolated and can't be accessed by users for any malicious purposes. The access is only allowed through Azure Backup management operations, such as restore.
@@ -388,4 +387,4 @@ Watch the following video to learn how to leverage Azure Monitor to configure va
388387
Read the following articles as starting points for using Azure Backup:
389388

390389
* [Azure Backup overview](backup-overview.md)
391-
* [Frequently Asked Questions](backup-azure-backup-faq.yml)
390+
* [Frequently Asked Questions](backup-azure-backup-faq.yml)

articles/cosmos-db/mongodb/how-to-create-container-mongodb.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,18 @@ This article explains the different ways to create a collection in Azure Cosmos
4343
## <a id="dotnet-mongodb"></a>Create using .NET SDK
4444

4545
```csharp
46-
// Create a collection with a partition key by using Mongo Shell:
47-
db.runCommand( { shardCollection: "myDatabase.myCollection", key: { myShardKey: "hashed" } } )
46+
var bson = new BsonDocument
47+
{
48+
{ "customAction", "CreateCollection" },
49+
{ "collection", "<CollectionName>" },//update CollectionName
50+
{ "shardKey", "<ShardKeyName>" }, //update ShardKey
51+
{ "offerThroughput", 400} //update Throughput
52+
};
53+
var shellCommand = new BsonDocumentCommand<BsonDocument>(bson);
54+
// Create a collection with a partition key by using Mongo Driver:
55+
db.RunCommand(shellCommand);
4856
```
4957

50-
> [!Note]
51-
> MongoDB wire protocol does not understand the concept of [Request Units](../request-units.md). To create a new collection with provisioned throughput on it, use the Azure portal or Cosmos DB SDKs for SQL API.
52-
5358
If you encounter timeout exception when creating a collection, do a read operation to validate if the collection was created successfully. The read operation throws an exception until the collection create operation is successful. For the list of status codes supported by the create operation see the [HTTP Status Codes for Azure Cosmos DB](/rest/api/cosmos-db/http-status-codes-for-cosmosdb) article.
5459

5560
## <a id="cli-mongodb"></a>Create using Azure CLI

articles/machine-learning/how-to-create-component-pipelines-cli.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ From the `cli/jobs/pipelines-with-components/basics` directory of the [`azureml-
5353
- Interface: inputs and outputs. For example, a model training component will take training data and number of epochs as input, and generate a trained model file as output. Once the interface is defined, different teams can develop and test the component independently.
5454
- Command, code & environment: the command, code and environment to run the component. Command is the shell command to execute the component. Code usually refers to a source code directory. Environment could be an AzureML environment(curated or customer created), docker image or conda environment.
5555
56-
- **component_src**: This is the source code directory for a specific component. It contains the source code that will be executed in the component. You can use your preferred lanuage(Python, R...). The code must be executed by a shell command. The source code can take a few inputs from shell command line to control how this step is going to be executed. For example, a training step may take training data, learning rate, number of epochs to control the training process. The argument of a shell command is used to pass inputs and outputs to the code.
56+
- **component_src**: This is the source code directory for a specific component. It contains the source code that will be executed in the component. You can use your preferred language(Python, R...). The code must be executed by a shell command. The source code can take a few inputs from shell command line to control how this step is going to be executed. For example, a training step may take training data, learning rate, number of epochs to control the training process. The argument of a shell command is used to pass inputs and outputs to the code.
5757
5858
Now let's create a pipeline using the `3b_pipeline_with_data` example. We'll explain the detailed meaning of each file in following sections.
5959
@@ -114,7 +114,7 @@ In the *3b_pipeline_with_data* example, we've created a three steps pipeline.
114114

115115
### Read and write data in pipeline
116116

117-
One common scenario is to read and write data in your pipeline. In AuzreML, we use the same schema to [read and write data](how-to-read-write-data-v2.md) for all type of jobs (pipeline job, command job, and sweep job). Below are pipeline job examples of using data for common scenarios.
117+
One common scenario is to read and write data in your pipeline. In AzureML, we use the same schema to [read and write data](how-to-read-write-data-v2.md) for all type of jobs (pipeline job, command job, and sweep job). Below are pipeline job examples of using data for common scenarios.
118118

119119
- [local data](https://github.com/Azure/azureml-examples/tree/sdk-preview/cli/jobs/pipelines-with-components/basics/4a_local_data_input)
120120
- [web file with public URL](https://github.com/Azure/azureml-examples/blob/sdk-preview/cli/jobs/pipelines-with-components/basics/4c_web_url_input/pipeline.yml)
@@ -131,14 +131,14 @@ The most common used schema of the component YAML is described in below table. S
131131

132132
|key|description|
133133
|------|------|
134-
|name|**Required**. Name of the component. Must be unique across the AzureML workspace. Must start with lowercase letter. Allow lowercase letters, numbers and understore(_). Maximum length is 255 characters.|
134+
|name|**Required**. Name of the component. Must be unique across the AzureML workspace. Must start with lowercase letter. Allow lowercase letters, numbers and underscore(_). Maximum length is 255 characters.|
135135
|display_name|Display name of the component in the studio UI. Can be non-unique within the workspace.|
136136
|command|**Required** the command to execute|
137137
|code|Local path to the source code directory to be uploaded and used for the component.|
138138
|environment|**Required**. The environment that will be used to execute the component.|
139139
|inputs|Dictionary of component inputs. The key is a name for the input within the context of the component and the value is the component input definition. Inputs can be referenced in the command using the ${{ inputs.<input_name> }} expression.|
140140
|outputs|Dictionary of component outputs. The key is a name for the output within the context of the component and the value is the component output definition. Outputs can be referenced in the command using the ${{ outputs.<output_name> }} expression.|
141-
|is_deterministic|Whether to reuse previous job's result if the component inputs not change. Default value is `true`, also known as resue by default. The common scenario to set it as `false` is to force reload data from a cloud storage or URL.|
141+
|is_deterministic|Whether to reuse the previous job's result if the component inputs did not change. Default value is `true`, also known as reuse by default. The common scenario when set as `false` is to force reload data from a cloud storage or URL.|
142142

143143
For the example in *3b_pipeline_with_data/componentA.yml*, componentA has one data input and one data output, which can be connected to other steps in the parent pipeline. All the files under `code` section in component YAML will be uploaded to AzureML when submitting the pipeline job. In this example, files under `./componentA_src` will be uploaded (line 16 in *componentA.yml*). You can see the uploaded source code in Studio UI: double select the ComponentA step and navigate to Snapshot tab, as shown in below screenshot. We can see it's a hello-world script just doing some simple printing, and write current datetime to the `componentA_output` path. The component takes input and output through command line argument, and it's handled in the *hello.py* using `argparse`.
144144

articles/service-health/service-health-portal-update.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: Azure Service Health portal update
3-
description: We're' updating the Azure Service Health portal experience to let users engage with service events and manage actions to maintain the business continuity of impacted applications.
3+
description: We're updating the Azure Service Health portal experience to let users engage with service events and manage actions to maintain the business continuity of impacted applications.
44
ms.topic: overview
55
ms.date: 06/10/2022
66
---
77

88
# Azure Service Health portal update
99

10-
We're' updating the Azure Service Health portal experience. The new experience lets users engage with service events and manage actions to maintain the business continuity of impacted applications.
10+
We're updating the Azure Service Health portal experience. The new experience lets users engage with service events and manage actions to maintain the business continuity of impacted applications.
1111

1212
## Highlights of the new experience
1313

@@ -45,4 +45,4 @@ You can use the scope column in the details view to filter on scope (Tenant vs S
4545

4646
You can now see events at both Tenant and Subscription level scope in Health History blade if you have Tenant level administrator access. The scope column in the details view indicates if the incident is a Tenant or Subscription level incident. You can also filter on scope (Tenant vs Subscriber).
4747

48-
:::image type="content" source="media/service-health-portal-update/health-history-window-1.png" alt-text="A screenshot of the health history user interface.":::
48+
:::image type="content" source="media/service-health-portal-update/health-history-window-1.png" alt-text="A screenshot of the health history user interface.":::

0 commit comments

Comments
 (0)