Skip to content

Commit 13a289b

Browse files
huypubhuypub
authored
Merge pull request #84929 from MicrosoftDocs/master
8/9 AM Publish
2 parents 70c22f7 + e3db8c7 commit 13a289b

File tree

45 files changed

+856
-235
lines changed

Some content is hidden

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

45 files changed

+856
-235
lines changed

‎articles/active-directory-b2c/active-directory-b2c-ui-customization-custom.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ Create HTML content with your product's brand name in the title.
4848

4949
2. Paste the copied snippet in a text editor, and then save the file as *customize-ui.html*.
5050

51+
> [!NOTE]
52+
> HTML form elements will be removed due to security restrictions if you use login.microsoftonline.com. Please use b2clogin.com if you want to use HTML form elements in your custom HTML content. See [Use b2clogin.com](b2clogin.md) for other benefits.
53+
5154
## Create an Azure Blob storage account
5255

5356
>[!NOTE]

‎articles/active-directory-b2c/b2clogin.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@ ms.subservice: B2C
1717

1818
When you set up an identity provider for sign-up and sign-in in your Azure Active Directory (Azure AD) B2C application, you need to specify a redirect URL. In the past, login.microsoftonline.com was used, now you should be using b2clogin.com.
1919

20+
> [!NOTE]
21+
> You can use JavaScript client-side code (currently in preview) in b2clogin.com. Your JavaScript code will be removed from your custom page if you use login.microsoftonline.com. Additional security restrictions are also applied to login.microsoftonline.com, such as removing HTML form elements from your custom page.
22+
2023
Using b2clogin.com gives you additional benefits, such as:
2124

2225
- Space consumed in the cookie header by Microsoft services is reduced.
2326
- Your URLs no longer include a reference to Microsoft. For example, `https://your-tenant-name.b2clogin.com/tenant-id/oauth2/authresp`.
2427

25-
>[!NOTE]
28+
> [!NOTE]
2629
> You can use both the tenant name and the tenant GUID as follows:
2730
> * `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com` (which still refers to `onmicrosoft.com`)
2831
> * `https://your-tenant-name.b2clogin.com/your-tenant-guid` (in which case there is no reference to Microsoft at all)

‎articles/active-directory/manage-apps/functions-for-customizing-application-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ Based on the user's first name, middle name and last name, you need to generate
389389

390390
SelectUniqueValue(
391391
Join("@", NormalizeDiacritics(StripSpaces(Join(".", [PreferredFirstName], [PreferredLastName]))), "contoso.com"),
392-
Join("@", NormalizeDiacritics(StripSpaces(Join(".", Mid([PreferredFirstName], 1, 1), [PreferredLastName]))), "contoso.com")
392+
Join("@", NormalizeDiacritics(StripSpaces(Join(".", Mid([PreferredFirstName], 1, 1), [PreferredLastName]))), "contoso.com"),
393393
Join("@", NormalizeDiacritics(StripSpaces(Join(".", Mid([PreferredFirstName], 1, 2), [PreferredLastName]))), "contoso.com")
394394
)
395395

‎articles/active-directory/saas-apps/iwellnessnow-tutorial.md

Lines changed: 84 additions & 149 deletions
Large diffs are not rendered by default.

‎articles/active-directory/saas-apps/slack-provisioning-tutorial.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ For more information on how to read the Azure AD provisioning logs, see [Reporti
117117

118118
* Only updates if these two settings are configured in Slack's workplace/organization - **Profile syncing is enabled** and **Users cannot change their display name**.
119119

120-
* Slack's **userName** attribute has to be under 21 characters and have a unique value.
120+
* Slack's **userName** attribute has to be under 21 characters and have a unique value.
121+
122+
* Slack only allows matching with the attributes **userName** and **email**.
121123

122124
## Additional Resources
123125

‎articles/aks/ssh.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ To configure your virtual machine scale set-based for SSH access, find the name
3535
Use the [az aks show][az-aks-show] command to get the resource group name of your AKS cluster, then the [az vmss list][az-vmss-list] command to get the name of your scale set.
3636

3737
```azurecli-interactive
38-
CLUSTER_RESOURCE_GROUP=$(az aks show --resource-group myResourceGroup --name myAKSCluster --query nodeResourceGroup -o tsv)
38+
$CLUSTER_RESOURCE_GROUP=$(az aks show --resource-group myResourceGroup --name myAKSCluster --query nodeResourceGroup -o tsv)
3939
SCALE_SET_NAME=$(az vmss list --resource-group $CLUSTER_RESOURCE_GROUP --query [0].name -o tsv)
4040
```
4141

@@ -92,7 +92,7 @@ To configure your virtual machine availability set-based AKS cluster for SSH acc
9292
Use the [az aks show][az-aks-show] command to get the resource group name of your AKS cluster, then the [az vm list][az-vm-list] command to list the virtual machine name of your cluster's Linux node.
9393

9494
```azurecli-interactive
95-
CLUSTER_RESOURCE_GROUP=$(az aks show --resource-group myResourceGroup --name myAKSCluster --query nodeResourceGroup -o tsv)
95+
$CLUSTER_RESOURCE_GROUP=$(az aks show --resource-group myResourceGroup --name myAKSCluster --query nodeResourceGroup -o tsv)
9696
az vm list --resource-group $CLUSTER_RESOURCE_GROUP -o table
9797
```
9898

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ Note the following constraints when making a backup request:
172172
- While backup is in progress, **avoid changes in service management** such as SKU upgrade or downgrade, change in domain name, and more.
173173
- Restore of a **backup is guaranteed only for 30 days** since the moment of its creation.
174174
- **Usage data** used for creating analytics reports **isn't included** in the backup. Use [Azure API Management REST API][azure api management rest api] to periodically retrieve analytics reports for safekeeping.
175+
- In addition, the following items are not part of the backup data: custom domain SSL certificates and any intermediate or root certificates uploaded by customer, developer portal content, and virtual network integration settings.
175176
- The frequency with which you perform service backups affect your recovery point objective. To minimize it, we recommend implementing regular backups and performing on-demand backups after you make changes to your API Management service.
176177
- **Changes** made to the service configuration, (for example, APIs, policies, and developer portal appearance) while backup operation is in process **might be excluded from the backup and will be lost**.
177178
- **Allow** access from control plane to Azure Storage Account. Customer should open the following set of Inbound IPs on their Storage Account for Backup.

‎articles/app-service/containers/tutorial-custom-docker-image.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Build a custom image and for Web App for Containers - Azure App Service | Microsoft Docs
2+
title: Build a custom image and run in App Service from a private registry
33
description: How to use a custom Docker image for Web App for Containers.
44
keywords: azure app service, web app, linux, docker, container
55
services: app-service

‎articles/app-service/overview-hosting-plans.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ When you create an App Service plan in a certain region (for example, West Europ
2828
- Region (West US, East US, etc.)
2929
- Number of VM instances
3030
- Size of VM instances (Small, Medium, Large)
31-
- Pricing tier (Free, Shared, Basic, Standard, Premium, PremiumV2, Isolated, Consumption)
31+
- Pricing tier (Free, Shared, Basic, Standard, Premium, PremiumV2, Isolated)
3232

3333
The _pricing tier_ of an App Service plan determines what App Service features you get and how much you pay for the plan. There are a few categories of pricing tiers:
3434

3535
- **Shared compute**: **Free** and **Shared**, the two base tiers, runs an app on the same Azure VM as other App Service apps, including apps of other customers. These tiers allocate CPU quotas to each app that runs on the shared resources, and the resources cannot scale out.
3636
- **Dedicated compute**: The **Basic**, **Standard**, **Premium**, and **PremiumV2** tiers run apps on dedicated Azure VMs. Only apps in the same App Service plan share the same compute resources. The higher the tier, the more VM instances are available to you for scale-out.
37-
- **Isolated**: This tier runs dedicated Azure VMs on dedicated Azure Virtual Networks, which provides network isolation on top of compute isolation to your apps. It provides the maximum scale-out capabilities.
38-
- **Consumption**: This tier is only available to [function apps](../azure-functions/functions-overview.md). It scales the functions dynamically depending on workload. For more information, see [Azure Functions hosting plans comparison](../azure-functions/functions-scale.md).
37+
- **Isolated**: This tier runs dedicated Azure VMs on dedicated Azure Virtual Networks. It provides network isolation on top of compute isolation to your apps. It provides the maximum scale-out capabilities.
3938

4039
[!INCLUDE [app-service-dev-test-note](../../includes/app-service-dev-test-note.md)]
4140

@@ -75,9 +74,8 @@ This section describes how App Service apps are billed. For detailed, region-spe
7574
Except for **Free** tier, an App Service plan carries an hourly charge on the compute resources it uses.
7675

7776
- In the **Shared** tier, each app receives a quota of CPU minutes, so _each app_ is charged hourly for the CPU quota.
78-
- In the dedicated compute tiers (**Basic**, **Standard**, **Premium**, **PremiumV2**), The App Service plan defines the number of VM instances the apps are scaled to, so _each VM instance_ in the App Service plan has an hourly charge. These VM instances are charged the same regardless how many apps are running on them. To avoid unexpected charges, see [Clean up an App Service plan](app-service-plan-manage.md#delete).
79-
- In the **Isolated** tier, the App Service Environment defines the number of isolated workers that run your apps, and _each worker_ is charged hourly. In addition, there's an hourly base fee for the running the App Service Environment itself.
80-
- (Azure Functions only) The **Consumption** tier dynamically allocates VM instances to service a function app's workload, and is charged dynamically per second by Azure. For more information, see [Azure Functions pricing](https://azure.microsoft.com/pricing/details/functions/).
77+
- In the dedicated compute tiers (**Basic**, **Standard**, **Premium**, **PremiumV2**), the App Service plan defines the number of VM instances the apps are scaled to, so _each VM instance_ in the App Service plan has an hourly charge. These VM instances are charged the same regardless how many apps are running on them. To avoid unexpected charges, see [Clean up an App Service plan](app-service-plan-manage.md#delete).
78+
- In the **Isolated** tier, the App Service Environment defines the number of isolated workers that run your apps, and _each worker_ is charged hourly. In addition, there's an hourly base fee for the running the App Service Environment itself.
8179

8280
You don't get charged for using the App Service features that are available to you (configuring custom domains, SSL certificates, deployment slots, backups, etc.). The exceptions are:
8381

‎articles/application-gateway/migrate-v1-v2.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: vhorne
66
ms.service: application-gateway
77
ms.topic: article
8-
ms.date: 6/18/2019
8+
ms.date: 08/10/2019
99
ms.author: victorh
1010
---
1111

@@ -79,7 +79,7 @@ To run the script:
7979
-sslCertificates <comma-separated SSLCert objects as above>
8080
-trustedRootCertificates <comma-separated Trusted Root Cert objects as above>
8181
-privateIpAddress <private IP string>
82-
-publicIpResourceName <public IP name string>
82+
-publicIpResourceId <public IP name string>
8383
-validateMigration -enableAutoScale
8484
```
8585

@@ -179,6 +179,10 @@ The Azure PowerShell script creates a new v2 gateway with an appropriate size to
179179

180180
No. The script doesn't replicate this configuration for v2. You must add the log configuration separately to the migrated v2 gateway.
181181

182+
### Does this script support certificates uploaded to Azure KeyVault ?
183+
184+
No. Currently the script does not support certificates in KeyVault. However, this is being considered for a future version.
185+
182186
### I ran into some issues with using this script. How can I get help?
183187

184188
You can send an email to appgwmigrationsup@microsoft.com, open a support case with Azure Support, or do both.

0 commit comments

Comments
 (0)