Skip to content

Commit dbbff45

Browse files
authored
Merge pull request #205745 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 605a322 + 8ae1484 commit dbbff45

File tree

11 files changed

+45
-32
lines changed

11 files changed

+45
-32
lines changed

articles/active-directory/managed-identities-azure-resources/how-to-assign-app-role-managed-identity-cli.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Assign a managed identity to an application role using Azure CLI - Azure
33
description: Step-by-step instructions for assigning a managed identity access to another application's role, using Azure CLI.
44
services: active-directory
55
documentationcenter:
6-
author: christoc
6+
author: xstof
77
manager:
88
editor:
99

@@ -64,7 +64,7 @@ In this article, you learn how to assign a managed identity to an application ro
6464
6565
```azurecli
6666
appName="{name for your application}"
67-
serverSPOID=$(az ad sp list --filter "displayName eq 'My App'" --query '[0].objectId' -o tsv | tr -d '[:space:]')
67+
serverSPOID=$(az ad sp list --filter "displayName eq '$appName'" --query '[0].id' -o tsv | tr -d '[:space:]')
6868
echo "object id for server service principal is: $serverSPOID"
6969
```
7070
@@ -75,7 +75,7 @@ In this article, you learn how to assign a managed identity to an application ro
7575
7676
```azurecli
7777
appID="{application id for your application}"
78-
serverSPOID=$(az ad sp list --filter "appId eq '$appID'" --query '[0].objectId' -o tsv | tr -d '[:space:]')
78+
serverSPOID=$(az ad sp list --filter "appId eq '$appID'" --query '[0].id' -o tsv | tr -d '[:space:]')
7979
echo "object id for server service principal is: $serverSPOID"
8080
```
8181

articles/azure-maps/tutorial-search-location.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ The Map Control API is a convenient client library. This API allows you to easil
140140

141141
About this code:
142142

143-
* A `ready` event is added to the map, which fires when the map resources finnish loading and the map is ready to be accessed.
143+
* A `ready` event is added to the map, which fires when the map resources finish loading and the map is ready to be accessed.
144144
* In the map `ready` event handler, a data source is created to store result data.
145145
* A symbol layer is created and attached to the data source. This layer specifies how the result data in the data source should be rendered. In this case, the result is rendered with a dark blue round pin icon, centered over the results coordinate, that allows other icons to overlap.
146146
* The result layer is added to the map layers.

articles/azure-monitor/logs/workspace-design.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ While you should avoid sending duplicate data to multiple workspaces because of
106106
### Data access control
107107
When you grant a user [access to a workspace](manage-access.md#azure-rbac), they have access to all data in that workspace. This is appropriate for a member of a central administration or security team who must access data for all resources. Access to the workspace is also determined by resource-context RBAC and table-level RBAC.
108108

109-
Resource-context RBAC](manage-access.md#access-mode)
109+
[Resource-context RBAC](manage-access.md#access-mode)
110110
By default, if a user has read access to an Azure resource, they inherit permissions to any of that resource's monitoring data sent to the workspace. This allows users to access information about resources they manage without being granted explicit access to the workspace. If you need to block this access, you can change the [access control mode](manage-access.md#access-control-mode) to require explicit workspace permissions.
111111

112112
- **If you want users to be able to access data for their resources**, keep the default access control mode of *Use resource or workspace permissions*.

articles/backup/backup-azure-file-folder-backup-faq.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ sections:
3131
How long are vault credentials valid?
3232
answer: |
3333
Vault credentials expire after 10 days. If the credentials file expires, download the file again from the Azure portal.
34+
35+
- question: |
36+
Why do I need to update my MARS agent for the vault credentials to work?
37+
answer: |
38+
A new parameter is added to the vault credentials file. It can be parsed correctly only with MARS agent version 2.0.9249.0 and above.
3439
3540
- question: |
3641
What characters are allowed for the passphrase?

articles/cognitive-services/cognitive-services-apis-create-account.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The multi-service resource is named **Cognitive Services** in the portal. The mu
3838
* **Speech** - Speech
3939
* **Vision** - Computer Vision, Custom Vision, Face
4040

41-
1. You can select this link to create an Azure Cognitive multi-service resource: [Create a Cognitive Services resource](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne).
41+
1. You can select this link to create an Azure Cognitive multi-service resource: [Create a Cognitive Services resource](https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne).
4242

4343
1. On the **Create** page, provide the following information:
4444

@@ -51,10 +51,10 @@ The multi-service resource is named **Cognitive Services** in the portal. The mu
5151
### [Decision](#tab/decision)
5252

5353
1. You can select one of these links to create a Decision resource:
54-
- [Anomaly Detector](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesAnomalyDetector)
55-
- [Content Moderator](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesContentModerator)
56-
- [Metrics Advisor](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesMetricsAdvisor)
57-
- [Personalizer](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesPersonalizer)
54+
- [Anomaly Detector](https://portal.azure.com/#create/Microsoft.CognitiveServicesAnomalyDetector)
55+
- [Content Moderator](https://portal.azure.com/#create/Microsoft.CognitiveServicesContentModerator)
56+
- [Metrics Advisor](https://portal.azure.com/#create/Microsoft.CognitiveServicesMetricsAdvisor)
57+
- [Personalizer](https://portal.azure.com/#create/Microsoft.CognitiveServicesPersonalizer)
5858

5959
1. On the **Create** page, provide the following information:
6060

@@ -65,11 +65,11 @@ The multi-service resource is named **Cognitive Services** in the portal. The mu
6565
### [Language](#tab/language)
6666

6767
1. You can select one of these links to create a Language resource:
68-
- [Immersive reader](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesImmersiveReader)
69-
- [Language Understanding (LUIS)](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesLUISAllInOne)
70-
- [Language service](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesTextAnalytics)
71-
- [Translator](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesTextTranslation)
72-
- [QnA Maker](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesQnAMaker)
68+
- [Immersive reader](https://portal.azure.com/#create/Microsoft.CognitiveServicesImmersiveReader)
69+
- [Language Understanding (LUIS)](https://portal.azure.com/#create/Microsoft.CognitiveServicesLUISAllInOne)
70+
- [Language service](https://portal.azure.com/#create/Microsoft.CognitiveServicesTextAnalytics)
71+
- [Translator](https://portal.azure.com/#create/Microsoft.CognitiveServicesTextTranslation)
72+
- [QnA Maker](https://portal.azure.com/#create/Microsoft.CognitiveServicesQnAMaker)
7373

7474
1. On the **Create** page, provide the following information:
7575

@@ -79,7 +79,7 @@ The multi-service resource is named **Cognitive Services** in the portal. The mu
7979

8080
### [Speech](#tab/speech)
8181

82-
1. You can select this link to create a Speech resource: [Speech Services](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesSpeechServices)
82+
1. You can select this link to create a Speech resource: [Speech Services](https://portal.azure.com/#create/Microsoft.CognitiveServicesSpeechServices)
8383

8484
1. On the **Create** page, provide the following information:
8585

@@ -90,9 +90,9 @@ The multi-service resource is named **Cognitive Services** in the portal. The mu
9090
### [Vision](#tab/vision)
9191

9292
1. You can select one of these links to create a Vision resource:
93-
- [Computer vision](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesComputerVision)
94-
- [Custom vision service](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesCustomVision)
95-
- [Face](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesFace)
93+
- [Computer vision](https://portal.azure.com/#create/Microsoft.CognitiveServicesComputerVision)
94+
- [Custom vision service](https://portal.azure.com/#create/Microsoft.CognitiveServicesCustomVision)
95+
- [Face](https://portal.azure.com/#create/Microsoft.CognitiveServicesFace)
9696

9797
1. On the **Create** page, provide the following information:
9898

@@ -112,7 +112,7 @@ The multi-service resource is named **Cognitive Services** in the portal. The mu
112112

113113
1. From the quickstart pane that opens, you can access the resource endpoint and manage keys.
114114
<!--
115-
1. If you missed the previous steps or need to find your resource later, go to the [Azure services](https://ms.portal.azure.com/#home) home page. From here you can view recent resources, select **My resources**, or use the search box to find your resource by name.
115+
1. If you missed the previous steps or need to find your resource later, go to the [Azure services](https://portal.azure.com/#home) home page. From here you can view recent resources, select **My resources**, or use the search box to find your resource by name.
116116
117117
:::image type="content" source="media/cognitive-services-apis-create-account/home-my-resources.png" alt-text="Find resource keys from home screen":::
118118
-->

articles/communication-services/concepts/troubleshooting-info.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ The Azure Communication Services SMS SDK uses the following error codes to help
352352
| 4006 | The Destination/To number isn't reachable| Try resending the message at a later time |
353353
| 4007 | The Destination/To number has opted out of receiving messages from you| Mark the Destination/To number as opted out so that no further message attempts are made to the number|
354354
| 4008 | You've exceeded the maximum number of messages allowed for your profile| Ensure you aren't exceeding the maximum number of messages allowed for your number or use queues to batch the messages |
355+
| 4009 | Message is rejected by Microsoft Entitlement System| Most often it happens if fraudulent activity is detected. Please contact support for more details |
355356
| 5000 | Message failed to deliver. Please reach out Microsoft support team for more details| File a support request through the Azure portal |
356357
| 5001 | Message failed to deliver due to temporary unavailability of application/system| |
357358
| 5002 | Message Delivery Timeout| Try resending the message |

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,12 @@ If you enabled the integration, but still don't see the extension running on you
326326
### What are the licensing requirements for Microsoft Defender for Endpoint?
327327
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.
328328
329+
### Do I need to buy a separate anti-malware solution to protect my machines?
330+
No. With MDE integration in Defender for Servers, you'll also get malware protection on your machines.
331+
- On Windows Server 2012 R2 with MDE unified solution integration enabled, Defender for Servers will deploy [Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows) in *active mode*.
332+
- On newer Windows Server operating systems, Microsoft Defender Antivirus is part of the operating system and will be enabled in *active mode*.
333+
- On Linux, Defender for Servers will deploy MDE including the anti-malware component, and set the component in *passive mode*.
334+
329335
### If I already have a license for Microsoft Defender for Endpoint, can I get a discount for Microsoft Defender for Servers?
330336
If you already have a license for **Microsoft Defender for Endpoint for Servers** , you won't pay for that part of your [Microsoft Defender for Servers Plan 2](defender-for-servers-introduction.md#plan-2-formerly-defender-for-servers) license. Learn more about [the Microsoft 365 license](/microsoft-365/security/defender-endpoint/minimum-requirements#licensing-requirements).
331337

articles/key-vault/general/security-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ For more information about authentication to Key Vault, see [Authenticate to Azu
7676

7777
## Conditional access
7878

79-
Key Vault provides support for Azure Azure Active Directory Conditional Access policies. By using Conditional Access policies, you can apply the right access controls to Key Vault when needed to keep your organization secure and stay out of your user's way when not needed.
79+
Key Vault provides support for Azure Active Directory Conditional Access policies. By using Conditional Access policies, you can apply the right access controls to Key Vault when needed to keep your organization secure and stay out of your user's way when not needed.
8080

8181
For more information, see [Conditional Access overview](../../active-directory/conditional-access/overview.md)
8282

articles/private-link/private-link-service-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ After a consumer initiates a connection, the service provider can accept or reje
4242

4343
### Delete your service
4444

45-
If the Private Link service is no longer in use, you can delete it. However, before your delete the service, ensure that there are no private endpoint connections associated with it. You can reject all connections and delete the service.
45+
If the Private Link service is no longer in use, you can delete it. However, before you delete the service, ensure that there are no private endpoint connections associated with it. You can reject all connections and delete the service.
4646

4747
## Properties
4848

articles/service-fabric/service-fabric-containers-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Compared to virtual machines, containers have the following advantages:
4646
Service Fabric supports the deployment of Docker containers on Linux, and Windows Server containers on Windows Server 2016 and later, along with support for Hyper-V isolation mode.
4747

4848
Container runtimes compatible with ServiceFabric:
49-
- Mirantis Container Runtime
50-
- Moby
49+
- Linux: Mirantis Container Runtime + Ubuntu
50+
- Windows: Mirantis Container Runtime + Windows Server 2019/2022
5151

5252
#### Docker containers on Linux
5353

0 commit comments

Comments
 (0)