Skip to content

Commit be7c9d7

Browse files
authored
Merge pull request #186387 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 807b969 + 712391e commit be7c9d7

File tree

9 files changed

+12
-9
lines changed

9 files changed

+12
-9
lines changed

articles/active-directory-b2c/azure-monitor.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ After you deploy the template, it can take a few minutes (typically no more than
140140

141141
After you've deployed the template and waited a few minutes for the resource projection to complete, follow these steps to associate your subscription with your Azure AD B2C directory.
142142

143+
> [!NOTE]
144+
> On the **Portal settings | Directories + subscriptions** page, ensure that your Azure AD B2C and Azure AD tenants are selected under **Current + delegated directories**.
145+
143146
1. Sign out of the Azure portal if you're currently signed in (this allows your session credentials to be refreshed in the next step).
144147
1. Sign in to the [Azure portal](https://portal.azure.com) with your **Azure AD B2C** administrative account. This account must be a member of the security group you specified in the [Delegate resource management](#3-delegate-resource-management) step.
145148
1. Select the **Directories + subscriptions** icon in the portal toolbar.

articles/active-directory/develop/scenario-protected-web-api-verification-scope-app-roles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public class TodoListController : Controller
169169
/// The web API will accept only tokens 1) for users, 2) that have the `access_as_user` scope for
170170
/// this API.
171171
/// </summary>
172-
const string[] scopeRequiredByApi = new string[] { "access_as_user" };
172+
static readonly string[] scopeRequiredByApi = new string[] { "access_as_user" };
173173

174174
// GET: api/values
175175
[HttpGet]

articles/api-management/export-api-power-platform.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Once the connector is created, navigate to your [Power Apps](https://make.powera
4141
:::image type="content" source="media/export-api-power-platform/custom-connector-power-app.png" alt-text="Custom connector in Power Platform":::
4242

4343
> [!NOTE]
44-
> To call the API from the PowerApps test console, you need to add the "https://flow.microsoft.com" URL as an origin to the [CORS policy](api-management-cross-domain-policies.md#CORS) in your API Management instance.
44+
> To call the API from the Power Apps test console, you need to add the "https://flow.microsoft.com" URL as an origin to the [CORS policy](api-management-cross-domain-policies.md#CORS) in your API Management instance.
4545
4646
## Next steps
4747

articles/azure-arc/data/release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ This release introduces the following features or capabilities:
424424

425425
- Delete an Azure Arc PostgreSQL Hyperscale from the Azure portal when its Data Controller was configured for Direct connectivity mode.
426426
- Deploy Azure Arc-enabled PostgreSQL Hyperscale from the Azure database for Postgres deployment page in the Azure portal. See [Select Azure Database for PostgreSQL deployment option - Microsoft Azure](https://ms.portal.azure.com/#create/Microsoft.PostgreSQLServer).
427-
- Specify storage classes and Postgres extensions when deploying Azure Arc-enabled PostgreSQL Hyperscale from the Azure portal.
427+
- Specify storage classes and PostgreSQL extensions when deploying Azure Arc-enabled PostgreSQL Hyperscale from the Azure portal.
428428
- Reduce the number of worker nodes in your Azure Arc-enabled PostgreSQL Hyperscale. You can do this operation (known as scale in as opposed to scale out when you increase the number of worker nodes) from `azdata` command-line.
429429

430430
#### Azure Arc-enabled SQL Managed Instance

articles/backup/blob-backup-configure-manage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ To assign the required role for storage accounts that you need to protect, follo
6161
![Role assignment options](./media/blob-backup-configure-manage/role-assignment-options.png)
6262

6363
>[!NOTE]
64-
>The role assignment might take up to 10 minutes to take effect.
64+
>The role assignment might take up to 30 minutes to take effect.
6565
6666
## Create a backup policy
6767

articles/ddos-protection/ddos-protection-reference-architectures.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.custom: fasttrack-edit
1616
DDoS Protection Standard is designed [for services that are deployed in a virtual network](../virtual-network/virtual-network-for-azure-services.md). The following reference architectures are arranged by scenarios, with architecture patterns grouped together.
1717

1818
> [!NOTE]
19-
> Protected resources include public IPs attached to an IaaS VM, Load Balancer (Classic & Standard Load Balancers), Application Gateway (including WAF) cluster, Firewall, Bastion, VPN Gateway, Service Fabric or an IaaS based Network Virtual Appliance (NVA). PaaS services (multitenant) are not supported at present. This includes Azure App Service Environment for PowerApps or API management in a virtual network with a public IP.
19+
> Protected resources include public IPs attached to an IaaS VM, Load Balancer (Classic & Standard Load Balancers), Application Gateway (including WAF) cluster, Firewall, Bastion, VPN Gateway, Service Fabric or an IaaS based Network Virtual Appliance (NVA). PaaS services (multitenant) are not supported at present. This includes Azure App Service Environment for Power Apps or API management in a virtual network with a public IP.
2020
2121
## Virtual machine (Windows/Linux) workloads
2222

@@ -75,7 +75,7 @@ documentation.
7575

7676

7777
> [!NOTE]
78-
> Azure App Service Environment for PowerApps or API management in a virtual network with a public IP are both not natively supported.
78+
> Azure App Service Environment for Power Apps or API management in a virtual network with a public IP are both not natively supported.
7979
8080
## Hub-and-spoke network topology with Azure Firewall and Azure Bastion
8181

articles/marketplace/test-drive-azure-subscription-setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ This article explains how to set up an Azure Marketplace subscription and **Dyna
9595

9696
:::image type="content" source="./media/test-drive/sign-in-to-account.png" alt-text="Signing in to your account.":::
9797

98-
6. Create a new Security Group and add it to Canvas App (Power Apps). This step is only applicable to Dynamics 365 for Customer Engagement & PowerApps offers with the Canvas Apps option.
98+
6. Create a new Security Group and add it to Canvas App (Power Apps). This step is only applicable to Dynamics 365 for Customer Engagement & Power Apps offers with the Canvas Apps option.
9999
1. Create a new Security Group.
100100
1. Go to **Azure Active Directory**.
101101
1. Under **Manage**, select **Groups**.

articles/stream-analytics/stream-analytics-javascript-user-defined-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ This method follows the same implementation behavior as the one available in Int
193193
```javascript
194194
function main(datetime){
195195
const options = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' };
196-
return event.toLocaleDateString('de-DE', options);
196+
return datetime.toLocaleDateString('de-DE', options);
197197
}
198198
```
199199

articles/virtual-machines/vm-applications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ Most 3rd party applications in Windows are available as .exe or .msi installers.
202202

203203
Installer executables typically launch a user interface (UI) and require someone to click through the UI. If the installer supports a silent mode parameter, it should be included in your installation string.
204204

205-
Cmd.exe also expects executable files to have the extension .exe, so you need to rename the file to have te .exe extension.
205+
Cmd.exe also expects executable files to have the extension .exe, so you need to rename the file to have the .exe extension.
206206

207207
If I wanted to create a VM application package for myApp.exe, which ships as an executable, my VM Application is called 'myApp', so I write the command assuming that the application package is in the current directory:
208208

0 commit comments

Comments
 (0)