Skip to content

Commit 1844d71

Browse files
authored
Merge pull request #251581 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 73acb32 + 5800c0a commit 1844d71

21 files changed

+69
-65
lines changed

articles/active-directory/develop/v2-protocols-oidc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ To sign out a user, perform both of these operations:
321321
* Redirect the user's user-agent to the Microsoft identity platform's logout URI
322322
* Clear your app's cookies or otherwise end the user's session in your application.
323323

324-
If you fail to perform either operation, the user may remain authenticated and not be prompted to sign-in the next time they user your app.
324+
If you fail to perform either operation, the user may remain authenticated and not be prompted to sign-in the next time they use your app.
325325

326326
Redirect the user-agent to the `end_session_endpoint` as shown in the OpenID Connect configuration document. The `end_session_endpoint` supports both HTTP GET and POST requests.
327327

articles/active-directory/external-identities/add-users-administrator.md

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -126,22 +126,14 @@ If you need to manually add B2B collaboration users to a group after the user wa
126126
4. Select a group (or select **New group** to create a new one). It's a good idea to include in the group description that the group contains B2B guest users.
127127
5. Under **Manage**, select **Members**.
128128
6. Select **Add members**.
129-
7. Complete one of the following set of steps:
129+
7. Complete the following set of steps:
130130

131131
- *If the guest user is already in the directory:*
132132

133133
a. On the **Add members** page, start typing the name or email address of the guest user.
134134

135135
b. In the search results, choose the user, and then choose **Select**.
136136

137-
- *If the guest user isn't currently in the directory:*
138-
139-
a. On the **Add members** page, type the user's full email address in the search box, type a **Personal message** (optional), and then choose **Invite** to send an invitation.
140-
141-
b. Choose **Select**.
142-
143-
c. Now add the user to the group: On the **Members** page, choose **Add members**. Type the user's name or email address in the search box, choose the user in the results, and then choose **Select**.
144-
145137
You can also use dynamic groups with Azure AD B2B collaboration. For more information, see [Dynamic groups and Azure Active Directory B2B collaboration](use-dynamic-groups.md).
146138

147139
## Add guest users to an application
@@ -154,7 +146,7 @@ To add B2B collaboration users to an application, follow these steps:
154146
5. Under **Manage**, select **Users and groups**.
155147
6. Select **Add user/group**.
156148
7. On the **Add Assignment** page, select the link under **Users**.
157-
8. Complete one of the following set of steps:
149+
8. Complete the following set of steps:
158150

159151
- *If the guest user is already in the directory:*
160152

@@ -164,16 +156,6 @@ To add B2B collaboration users to an application, follow these steps:
164156

165157
c. On the **Add Assignment** page, choose **Assign** to add the user to the app.
166158

167-
- *If the guest user isn't currently in the directory:*
168-
169-
a. On the **Users** page, type the user's full email address in the search box, type a **Personal message** (optional), and then choose **Invite**.
170-
171-
b. Choose **Select**.
172-
173-
c. Now add the invited user to the application: On the **Add Assignment** page, choose the link under **Users**. Type the invited user's name or email address in the search box, choose the user in the results, and then choose **Select**.
174-
175-
d. On the **Add Assignment** page, choose **Assign**.
176-
177159
9. The guest user appears in the application's **Users and groups** list with the assigned role of **Default Access**. If the application provides different roles and you want to change the user's role, do the following:
178160

179161
a. Select the check box next to the guest user, and then select the **Edit** button.

articles/advisor/advisor-reference-cost-recommendations.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,11 @@ Learn more about [App Service plans](../app-service/overview-hosting-plans.md).
330330

331331
### Unused/Empty App Service plans
332332

333-
Your App Service plan has no apps running for at least 3 days. Consider deleting the resource to save costs.
333+
Your App Service plan has no apps running for at least 3 days. Consider deleting the resource to save costs or add new apps under it.
334334

335+
> [!NOTE]
336+
> It might take up to 48 hours for this recommendation to refresh after you take an action.
337+
335338
Learn more about [App Service plans](../app-service/overview-hosting-plans.md).
336339

337340
## Azure Monitor

articles/api-management/api-management-howto-disaster-recovery-backup-restore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ $apiManagementResourceGroup="apimresourcegroup";
214214
$storageAccountName="backupstorageaccount";
215215
$storageResourceGroup="storageresourcegroup";
216216
$containerName="backups";
217-
$blobName="ContosoBackup.apimbackup;
217+
$blobName="ContosoBackup.apimbackup"
218218
```
219219

220220
### Access using storage access key

articles/api-management/compute-infrastructure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The following table summarizes the compute platforms currently used for instance
3131
<sup>2</sup> Newly created instances in these tiers and some existing instances in Developer and Premium tiers configured with virtual networks or availability zones.
3232

3333
> [!NOTE]
34-
> Currently, the `stv2` platform isn't available in the US Government cloud or in the following Azure regions: China East, China East 2, China North, China North 2.
34+
> Currently, the `stv2` platform isn't available in the following Azure regions: China East, China East 2, China North, China North 2.
3535
>
3636
> Also, as Qatar Central is a recently established Azure region, only the `stv2` platform is supported for API Management services deployed in this region.
3737

articles/api-management/graphql-apis-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ GraphQL is an open-source, industry-standard query language for APIs. Unlike RES
3535
The GraphQL specification explicitly solves common issues experienced by client web apps that rely on REST APIs:
3636

3737
* It can take a large number of requests to fulfill the data needs for a single page
38-
* REST APIs often return more data than needed the page being rendered
38+
* REST APIs often return more data than needed by the page being rendered
3939
* The client app needs to poll to get new information
4040

4141
Using a GraphQL API, the client app can specify the data they need to render a page in a query document that is sent as a single request to a GraphQL service. A client app can also subscribe to data updates pushed from the GraphQL service in real time.

articles/azure-functions/functions-event-grid-blob-trigger.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ With ngrok already running, start your local project as follows:
441441
Open a new terminal and run the following `mvn` command to start the debugging session.
442442

443443
```bash
444-
mvn azure-functions:run
444+
mvn azure-functions:run -DenableDebug
445445
```
446446
::: zone-end
447447
::: zone pivot="programming-language-javascript,programming-language-typescript,programming-language-powershell,programming-language-python,programming-language-csharp"

articles/azure-monitor/app/convert-classic-resource.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,19 @@ When you query directly from the Log Analytics workspace, you only see data that
121121
> [!NOTE]
122122
> If you rename your Application Insights resource after you migrate to the workspace-based model, the Application Insights **Logs** tab no longer shows the telemetry collected before renaming. You can see all old and new data on the **Logs** tab of the associated Log Analytics resource.
123123
124+
125+
## Identifying the Application Insights resources by ingestion type
126+
127+
Use the following script to identify your Application Insights resources by ingestion type.
128+
129+
#### Example
130+
131+
```azurecli
132+
133+
Get-AzApplicationInsights -SubscriptionId '7faeaa41-541f-48da-82b4-3dc10c594b85' | Format-Table -Property Name, IngestionMode, WorkspaceResourceId, @{label='Type';expression={if ($_.ingestionMode -eq 'LogAnalytics') {'Workspace-based'} elseif ($_.IngestionMode -eq 'ApplicatonInsights') {'Classic'}}}
134+
135+
```
136+
124137
## Programmatic resource migration
125138

126139
This section helps you migrate your resources.

articles/azure-monitor/essentials/azure-monitor-workspace-manage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This article shows you how to create and delete an Azure Monitor workspace. When
3131
Use the following command to create an Azure Monitor workspace using Azure CLI.
3232

3333
```azurecli
34-
az resource create --resource-group <resource-group-name> --namespace microsoft.monitor --resource-type accounts --name <azure-monitor-workspace-name> --location <location> --properties {}
34+
az resource create --resource-group <resource-group-name> --namespace microsoft.monitor --resource-type accounts --name <azure-monitor-workspace-name> --location <location> --properties "{}"
3535
```
3636

3737
### [Resource Manager](#tab/resource-manager)

articles/azure-vmware/faq.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ sections:
9595
- question: How long does it take to provision the initial three hosts in a cluster?
9696
answer: At the moment, the provisioning can take roughly 3-4 hours. Adding a single node in existing/same cluster takes between 30 - 45 minutes.
9797

98+
- question: Can I use the folder name "AVS-vendor-folders" for vCenter Server VM folders in Azure VMware Solution?
99+
answer: No, "AVS-vendor-folders" is a reserved name within Azure VMware Solution and using it may lead to conflicts with the intended functionality or cause unexpected behavior within the vCenter management environment specific to Azure VMware Solution. Please choose an alternative folder name that aligns with your organizational needs while avoiding conflicts with predefined naming conventions in Azure VMware Solution.
98100

99101
- name: VMware solution software
100102
questions:

0 commit comments

Comments
 (0)