Skip to content

Commit 885dc17

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into pauljewell-client-management
2 parents 80152ad + b3a9776 commit 885dc17

File tree

910 files changed

+6981
-6832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

910 files changed

+6981
-6832
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,7 @@
994994
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
995995
"articles/postgresql/.openpublishing.redirection.postgresql.json",
996996
"articles/purview/.openpublishing.redirection.purview.json",
997+
"articles/sap/.openpublishing.redirection.sap.json",
997998
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
998999
"articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
9991000
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",

articles/active-directory-b2c/add-identity-provider.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: garrodonnell
66
manager: CelesteDG
77

88
ms.author: godonnell
9-
ms.date: 01/19/2022
9+
ms.date: 02/08/2023
1010
ms.custom: mvc
1111
ms.topic: how-to
1212
ms.service: active-directory
@@ -19,7 +19,7 @@ You can configure Azure AD B2C to allow users to sign in to your application wit
1919

2020
With external identity provider federation, you can offer your consumers the ability to sign in with their existing social or enterprise accounts, without having to create a new account just for your application.
2121

22-
On the sign-up or sign-in page, Azure AD B2C presents a list of external identity providers the user can choose for sign-in. Once they select one of the external identity providers, they're taken (redirected) to the selected provider's website to complete the sign-in process. After the user successfully signs in, they're returned to Azure AD B2C for authentication of the account in your application.
22+
On the sign-up or sign-in page, Azure AD B2C presents a list of external identity providers the user can choose for sign-in. Once a user selects an external identity provider, they're redirected to the selected provider's website to complete their sign-in. After they successfully sign in, they're returned to Azure AD B2C for authentication with your application.
2323

2424
![Diagram showing mobile sign-in example with a social account (Facebook).](media/add-identity-provider/external-idp.png)
2525

articles/active-directory-b2c/sign-in-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: conceptual
12-
ms.date: 01/18/2022
12+
ms.date: 02/08/2023
1313
ms.author: godonnell
1414
ms.subservice: B2C
1515

articles/active-directory/develop/msal-shared-devices.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ ms.service: active-directory
99
ms.subservice: develop
1010
ms.topic: conceptual
1111
ms.workload: identity
12-
ms.date: 02/06/2023
12+
ms.date: 02/08/2023
1313
ms.author: henrymbugua
1414
ms.reviewer: brandwe
1515
ms.custom: aaddev
1616
---
1717

1818
# Overview of shared device mode
1919

20-
Shared device mode is a feature of Azure Active Directory(Azure AD) that allows you to build and deploy applications that support frontline workers and educational scenarios that require shared Android and iOS devices.
20+
Shared device mode is a feature of Azure Active Directory (Azure AD) that allows you to build and deploy applications that support frontline workers and educational scenarios that require shared Android and iOS devices.
2121

2222
> [!IMPORTANT]
2323
> Shared device mode for iOS [!INCLUDE [PREVIEW BOILERPLATE](../../../includes/active-directory-develop-preview.md)]
@@ -36,7 +36,7 @@ Azure AD enables these scenarios with a feature called **shared device mode**.
3636

3737
As mentioned, shared device mode is a feature of Azure AD that enables you to:
3838

39-
- Build applications that support frontline workers
39+
- Build applications that support frontline workers.
4040
- Deploy devices to frontline workers with apps that support shared device mode.
4141

4242
### Build applications that support frontline workers

articles/active-directory/manage-apps/manage-application-permissions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ $spApplicationPermissions = Get-AzureADServicePrincipalAppRoleAssignedTo -Object
7474
7575
# Remove all application permissions
7676
$spApplicationPermissions | ForEach-Object {
77-
Remove-AzureADServicePrincipalAppRoleAssignment -ObjectId $_.PrincipalId -AppRoleAssignmentId $_.objectId
77+
Remove-AzureADServiceAppRoleAssignment -ObjectId $_.PrincipalId -AppRoleAssignmentId $_.objectId
7878
}
7979
```
8080

@@ -232,4 +232,4 @@ Run the following queries to remove appRoleAssignments of users or groups to the
232232
## Next steps
233233
234234
- [Configure user consent setting](configure-user-consent.md)
235-
- [Configure admin consent workflow](configure-admin-consent-workflow.md)
235+
- [Configure admin consent workflow](configure-admin-consent-workflow.md)

articles/app-service/environment/creation.md

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.author: madsd
1616
1717
## Before you create your App Service Environment
1818

19-
Be aware that after you create your App Service Environment, you can't change any of the following:
19+
After you create your App Service Environment, you can't change any of the following:
2020

2121
- Location
2222
- Subscription
@@ -32,15 +32,15 @@ Make your subnet large enough to hold the maximum size that you'll scale your Ap
3232

3333
Before you deploy your App Service Environment, think about the virtual IP (VIP) type and the deployment type.
3434

35-
With an *internal VIP*, an address in your App Service Environment subnet reaches your apps. Your apps aren't on a public DNS. When you create your App Service Environment in the Azure portal, you have an option to create an Azure private DNS zone for your App Service Environment. With an *external VIP*, your apps are on an address facing the public internet, and they're in a public DNS.
35+
With an *internal VIP*, an address in your App Service Environment subnet reaches your apps. Your apps aren't on a public DNS. When you create your App Service Environment in the Azure portal, you have an option to create an Azure private DNS zone for your App Service Environment. With an *external VIP*, your apps are on an address facing the public internet, and they're in a public DNS. For both *internal VIP* and *external VIP* you can specify *Inbound IP address*, you can select *Automatic* or *Manual* options. If you want to use the *Manual* option for an *external VIP*, you must first create a standard *Public IP address* in Azure.
3636

37-
For the deployment type, you can choose *single zone*, *zone redundant*, or *host group*. The single zone is available in all regions where App Service Environment v3 is available. With the single zone deployment type, you have a minimum charge in your App Service plan of one instance of Windows Isolated v2. As soon as you have one or more instances, then that charge goes away. It isn't an additive charge.
37+
For the deployment type, you can choose *single zone*, *zone redundant*, or *host group*. The single zone is available in all regions where App Service Environment v3 is available. With the single zone deployment type, you have a minimum charge in your App Service plan of one instance of Windows Isolated v2. As soon as you've one or more instances, then that charge goes away. It isn't an additive charge.
3838

39-
In a zone redundant App Service Environment, your apps spread across three zones in the same region. Zone redundant is available in regions that support availability zones. With this deployment type, the smallest size for your App Service plan is three instances. That ensures that there is an instance in each availability zone. App Service plans can be scaled up one or more instances at a time. Scaling doesn't need to be in units of three, but the app is only balanced across all availability zones when the total instances are multiples of three.
39+
In a zone redundant App Service Environment, your apps spread across three zones in the same region. Zone redundant is available in regions that support availability zones. With this deployment type, the smallest size for your App Service plan is three instances. That ensures that there's an instance in each availability zone. App Service plans can be scaled up one or more instances at a time. Scaling doesn't need to be in units of three, but the app is only balanced across all availability zones when the total instances are multiples of three.
4040

41-
A zone redundant deployment has triple the infrastructure, and ensures that even if two of the three zones go down, your workloads remain available. Due to the increased system need, the minimum charge for a zone redundant App Service Environment is nine instances. If you have fewer than this number of instances, the difference is charged as Windows I1v2. If you have nine or more instances, there is no added charge to have a zone redundant App Service Environment. To learn more about zone redundancy, see [Regions and availability zones](./overview-zone-redundancy.md).
41+
A zone redundant deployment has triple the infrastructure, and ensures that even if two of the three zones go down, your workloads remain available. Due to the increased system need, the minimum charge for a zone redundant App Service Environment is nine instances. If you've fewer than this number of instances, the difference is charged as Windows I1v2. If you've nine or more instances, there's no added charge to have a zone redundant App Service Environment. To learn more about zone redundancy, see [Regions and availability zones](./overview-zone-redundancy.md).
4242

43-
In a host group deployment, your apps are deployed onto a dedicated host group. The dedicated host group isn't zone redundant. With this type of deployment, you can install and use your App Service Environment on dedicated hardware. There is no minimum instance charge for using App Service Environment on a dedicated host group, but you do have to pay for the host group when you're provisioning the App Service Environment. You also pay a discounted App Service plan rate as you create your plans and scale out.
43+
In a host group deployment, your apps are deployed onto a dedicated host group. The dedicated host group isn't zone redundant. With this type of deployment, you can install and use your App Service Environment on dedicated hardware. There's no minimum instance charge for using App Service Environment on a dedicated host group, but you do have to pay for the host group when you're provisioning the App Service Environment. You also pay a discounted App Service plan rate as you create your plans and scale out.
4444

4545
With a dedicated host group deployment, there are a finite number of cores available that are used by both the App Service plans and the infrastructure roles. This type of deployment can't reach the 200 total instance count normally available in App Service Environment. The number of total instances possible is related to the total number of App Service plan instances, plus the load-based number of infrastructure roles.
4646

@@ -50,19 +50,23 @@ Here's how:
5050

5151
1. Search Azure Marketplace for *App Service Environment v3*.
5252

53-
1. From the **Basics** tab, for **Subscription**, select the subscription. For **Resource Group**, select or create the resource group, and enter the name of your App Service Environment. For **Virtual IP**, select **Internal** if you want your inbound address to be an address in your subnet. Select **External** if you want your inbound address to face the public internet. For **App Service Environment Name**, enter a name. The name you choose will also be used for the domain suffix. For example, if the name you choose is *contoso*, and you have an internal VIP, the domain suffix will be `contoso.appserviceenvironment.net`. If the name you choose is *contoso*, and you have an external VIP, the domain suffix will be `contoso.p.azurewebsites.net`.
53+
2. From the **Basics** tab, for **Subscription**, select the subscription. For **Resource Group**, select or create the resource group, and enter the name of your App Service Environment. For **Virtual IP**, select **Internal** if you want your inbound address to be an address in your subnet. Select **External** if you want your inbound address to face the public internet. For **App Service Environment Name**, enter a name. The name you choose will also be used for the domain suffix. For example, if the name you choose is *contoso*, and you have an internal VIP, the domain suffix will be `contoso.appserviceenvironment.net`. If the name you choose is *contoso*, and you have an external VIP, the domain suffix will be `contoso.p.azurewebsites.net`.
5454

5555
![Screenshot that shows the App Service Environment basics tab.](./media/creation/creation-basics.png)
5656

57-
1. From the **Hosting** tab, for **Host group deployment**, select **Enabled** or **Disabled**. If you enable this option, you can deploy onto dedicated hardware. If you do so, you're charged for the entire dedicated host during the creation of the App Service Environment, and then you're charged a reduced price for your App Service plan instances.
57+
3. From the **Hosting** tab, for **Physical hardware isolation**, select **Enabled** or **Disabled**. If you enable this option, you can deploy onto dedicated hardware. With a dedicated host deployment, you're charged for two dedicated hosts per our pricing when you create the App Service Environment v3 and then, as you scale, you're charged a specialized Isolated v2 rate per vCore. I1v2 uses two vCores, I2v2 uses four vCores, and I3v2 uses eight vCores per instance.
5858

5959
![Screenshot that shows the App Service Environment hosting selections.](./media/creation/creation-hosting.png)
6060

61-
1. From the **Networking** tab, for **Virtual Network**, select or create your virtual network. For **Subnet**, select or create your subnet. If you're creating an App Service Environment with an internal VIP, you can configure Azure DNS private zones to point your domain suffix to your App Service Environment. For more details, see the DNS section in [Use an App Service Environment][UsingASE].
61+
4. From the **Networking** tab, for **Virtual Network**, select or create your virtual network. For **Subnet**, select or create your subnet. If you're creating an App Service Environment with an internal VIP, you can configure Azure DNS private zones to point your domain suffix to your App Service Environment. For more information, see the DNS section in [Use an App Service Environment][UsingASE]. If you're creating an App Service Environment with an internal VIP, you can specify private IP address using **Manual** option for **Inbound IP address**.
6262

63-
![Screenshot that shows App Service Environment networking selections.](./media/creation/creation-networking.png)
63+
![Screenshot that shows App Service Environment networking (ASE Internal) selections.](./media/creation/creation-networking-internal.png)
6464

65-
1. From the **Review + create** tab, check that your configuration is correct, and select **Create**. Your App Service Environment can take up to two hours to create.
65+
If you're creating an App Service Environment with an external VIP, you can select public IP address using **Manual** option for **Inbound IP address**.
66+
67+
![Screenshot that shows App Service Environment networking (ASE External) selections.](./media/creation/creation-networking-external.png)
68+
69+
5. From the **Review + create** tab, check that your configuration is correct, and select **Create**. Your App Service Environment can take up to two hours to create.
6670

6771
When your App Service Environment has been successfully created, you can select it as a location when you're creating your apps.
6872

-41.3 KB
Loading
11.3 KB
Loading
83.8 KB
Loading
97.4 KB
Loading

0 commit comments

Comments
 (0)