Skip to content

Commit e3db8c7

Browse files
huypubhuypub
authored
Merge pull request #84818 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 9711c18 + fd48557 commit e3db8c7

17 files changed

+43
-25
lines changed

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

+3
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

+4-1
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

+1-1
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/slack-provisioning-tutorial.md

+3-1
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

+2-2
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

+1
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/azure-functions/functions-create-first-java-maven.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public class Function {
119119

120120
## Run the function locally
121121

122-
Change directory to the newly created project folder and build and run the function with Maven:
122+
Change directory to the newly created project folder (the one containing your host.json and pom.xml files) and build and run the function with Maven:
123123

124124
```CMD
125125
cd fabrikam-function

‎articles/azure-functions/functions-run-local.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ The following steps use Homebrew to install the Core Tools on macOS.
8989
9090
The following steps use [APT](https://wiki.debian.org/Apt) to install Core Tools on your Ubuntu/Debian Linux distribution. For other Linux distributions, see the [Core Tools readme](https://github.com/Azure/azure-functions-core-tools/blob/master/README.md#linux).
9191
92-
1. Register the Microsoft product key as trusted:
92+
1. Install the Microsoft package repository GPG key, to validate package integrity:
9393
9494
```bash
9595
curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg

‎articles/azure-government/documentation-government-services-securityandidentity.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ The Qualys Vulnerability Assessment agent is not available.
3737
- **Windows Defender Advanced Threat Protection alerts**
3838
Windows Defender ATP installation on Windows VMs via Security Center and the associated alerts are not available.
3939

40-
### Alerts and notifications
41-
42-
- **Email notifications for high severity alerts and JIT access**
43-
Alerts and just-in-time access will function normally. However, email notifications are not available.
40+
### Notifications
4441

4542
- **Azure activity logs**
4643
User activity in Security Center is not logged in Azure activity logs in Microsoft Azure Government. This means that there’s no trace or audit for user performed actions.

‎articles/event-grid/custom-event-quickstart.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ The endpoint for your web app must include the suffix `/api/updates/`.
8080
endpoint=https://$sitename.azurewebsites.net/api/updates
8181
8282
az eventgrid event-subscription create \
83-
-g gridResourceGroup \
84-
--topic-name $topicname \
85-
--name demoViewerSub \
83+
--source-resource-id "/subscriptions/{subscription-id}/resourceGroups/{resource-group}/providers/Microsoft.EventGrid/topics/$topicname"
84+
--name demoViewerSub
8685
--endpoint $endpoint
86+
8787
```
8888

8989
View your web app again, and notice that a subscription validation event has been sent to it. Select the eye icon to expand the event data. Event Grid sends the validation event so the endpoint can verify that it wants to receive event data. The web app includes code to validate the subscription.

‎articles/lighthouse/how-to/onboard-customer.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Locations : {}
103103
# Log in first with az login if you're not using Cloud Shell
104104
105105
az account set –subscription <subscriptionId>
106-
az provider show –namespace "Microsoft.ManagedServices" –-output table
106+
az provider show --namespace "Microsoft.ManagedServices" --output table
107107
```
108108

109109
This should return results similar to the following:
@@ -151,16 +151,16 @@ In order to define authorizations, you'll need to know the ID values for each us
151151
# Log in first with az login if you're not using Cloud Shell
152152
153153
# To retrieve the objectId for an Azure AD group
154-
az ad group list –-query "[?displayName == '<yourGroupName>'].objectId" –-output tsv
154+
az ad group list --query "[?displayName == '<yourGroupName>'].objectId" --output tsv
155155
156156
# To retrieve the objectId for an Azure AD user
157-
az ad user show –-upn-or-object-id "<yourUPN>" –-query "objectId" –-output tsv
157+
az ad user show --upn-or-object-id "<yourUPN>" –-query "objectId" --output tsv
158158
159159
# To retrieve the objectId for an SPN
160-
az ad sp list –-query "[?displayName == '<spDisplayName>'].objectId" –-output tsv
160+
az ad sp list --query "[?displayName == '<spDisplayName>'].objectId" --output tsv
161161
162162
# To retrieve role definition IDs
163-
az role definition list –-name "<roleName>" | grep name
163+
az role definition list --name "<roleName>" | grep name
164164
```
165165

166166
## Create an Azure Resource Manager template

‎articles/machine-learning/service/concept-deep-learning-vs-machine-learning.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ One important task that deep learning can perform is e-discovery. Companies are
7373

7474
## What are artificial neural networks?
7575

76-
An artificial neural network is a deep learning model inspired by the way biological neural networks in the human brain process information. There are multiple types of artificial neural networks that are currently being used. The most popular artificial neural network typologies are discussed below.
76+
Artificial neural networks are formed by layers of connected nodes. Deep learning models use neural networks with a very large number of layers. The most popular artificial neural network typologies are discussed below.
7777

7878
### Feedforward neural network
7979

‎articles/network-watcher/network-watcher-nsg-flow-logging-portal.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ NSG flow logging requires the **Microsoft.Insights** provider. To register the p
105105
![Select flow Logs version](./media/network-watcher-nsg-flow-logging-portal/select-flow-log-version.png)
106106

107107
9. Select the storage account that you created in step 3.
108+
> [!NOTE]
109+
> NSG Flow Logs do not work with storage accounts if:
110+
> * The storage accounts have a firewall enabled.
111+
> * The storage accounts have [hierarchical namespace](https://docs.microsoft.com/azure/storage/blobs/data-lake-storage-namespace) enabled.
112+
1. In the top, left corner of portal, select **All services**. In the **Filter** box, type *Network Watcher*. When **Network Watcher** appears in the search results, select it.
108113
10. Set **Retention (days)** to 5, and then select **Save**.
109114

110115
## Download flow log
@@ -210,7 +215,7 @@ The value for **mac** in the previous output is the MAC address of the network i
210215
| A | Action | Whether the traffic was allowed (A) or denied (D).
211216
| C | Flow State **Version 2 Only** | Captures the state of the flow. Possible states are **B**: Begin, when a flow is created. Statistics aren't provided. **C**: Continuing for an ongoing flow. Statistics are provided at 5-minute intervals. **E**: End, when a flow is terminated. Statistics are provided. |
212217
| 30 | Packets sent - Source to destination **Version 2 Only** | The total number of TCP or UDP packets sent from source to destination since last update. |
213-
| 16978 | Bytes sent - Source to destination **Version 2 Only** | The total number of TCP or UDP packet bytes sent from source to destination since last update. Packet bytes include the packet header and payload. |
218+
| 16978 | Bytes sent - Source to destination **Version 2 Only** | The total number of TCP or UDP packet bytes sent from source to destination since last update. Packet bytes include the packet header and payload. |
214219
| 24 | Packets sent - Destination to source **Version 2 Only** | The total number of TCP or UDP packets sent from destination to source since last update. |
215220
| 14008| Bytes sent - Destination to source **Version 2 Only** | The total number of TCP and UDP packet bytes sent from destination to source since last update. Packet bytes include packet header and payload.|
216221

‎articles/sql-database/sql-database-active-geo-replication.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ To achieve real business continuity, adding database redundancy between datacent
7171
> [!NOTE]
7272
> The log replay is delayed on the secondary database if there are schema updates on the Primary. The latter requires a schema lock on the secondary database.
7373
> [!IMPORTANT]
74-
> You can use geo-replication to create a secondary database in the same region as the primary. You can use this secondary to load-balance a read-only workloads in the same region. However, a secondary database in the same region does not provide additional fault resilience and therefore is not a suitable failover target for disaster recovery. It will also not guarantee avaialability zone isolation. Use Business critical or Premium service tier with [zone redundant configuration](sql-database-high-availability.md#zone-redundant-configuration) to achieve avaialability zone isolation.
74+
> You can use geo-replication to create a secondary database in the same region as the primary. You can use this secondary to load-balance a read-only workloads in the same region. However, a secondary database in the same region does not provide additional fault resilience and therefore is not a suitable failover target for disaster recovery. It will also not guarantee availability zone isolation. Use Business critical or Premium service tier with [zone redundant configuration](sql-database-high-availability.md#zone-redundant-configuration) to achieve availability zone isolation.
7575
>
7676
7777
- **Planned failover**

‎articles/virtual-desktop/set-up-scaling-script.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Next, you'll need to create the securely stored credentials:
6060
Install-Module Microsoft.RdInfra.RdPowershell
6161
```
6262
63-
3. Open the edit pane and load the **Function-PSStoredCredentials.ps1** file.
63+
3. Open the edit pane and load the **Function-PSStoredCredentials.ps1** file, then run the whole script (F5)
6464
4. Run the following cmdlet:
6565
6666
```powershell
@@ -106,7 +106,7 @@ After configuring the configuration .xml file, you'll need to configure the Task
106106
4. Go to the **Triggers** tab, then select **New…**
107107
5. In the **New Trigger** dialog, under **Advanced settings**, check **Repeat task every** and select the appropriate period and duration (for example, **15 minutes** or **Indefinitely**).
108108
6. Select the **Actions** tab and **New…**
109-
7. In the **New Action** dialog, enter **powershell.exe** into the **Program/script** field, then enter **C:\\scaling\\RDSScaler.ps1** into the **Add arguments (optional)** field.
109+
7. In the **New Action** dialog, enter **powershell.exe** into the **Program/script** field, then enter **C:\\scaling\\basicScale.ps1** into the **Add arguments (optional)** field.
110110
8. Go to the **Conditions** and **Settings** tabs and select **OK** to accept the default settings for each.
111111
9. Enter the password for the administrative account where you plan to run the scaling script.
112112

‎articles/virtual-network/troubleshoot-outbound-smtp-connectivity.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ For Enterprise Agreement Azure users, there's no change in the technical ability
3333
## Pay-As-You-Go
3434
If you signed up before November 15, 2017 for the Pay-As-You-Go or Microsoft Partner Network subscription offers, there will be no change in the technical ability to try outbound email delivery. You'll continue to be able to try outbound email delivery from Azure VMs within these subscriptions directly to external email providers without any restrictions from the Azure platform. Again, it's not guaranteed that email providers will accept incoming email from any given user, and users will have to work directly with email providers to fix any message delivery or SPAM filtering issues that involve specific providers.
3535

36-
For Pay-As-You-Go or Microsoft Partner Network subscriptions that were created after November 15, 2017, there will be technical restrictions that block email that’s sent directly from VMs within these subscriptions. If you want the ability to send email from Azure VMs directly to external email providers (not using an authenticated SMTP relay), you can make a request to remove the restriction. Requests will be reviewed and approved at Microsoft’s discretion, and they'll be granted only after additional anti-fraud checks are made. To make a request, open a support case by using the following issue type: **Subscription Management** Problem type: **Request to enable Port 25 email flow**. Make sure that you add details about why your deployment has to send mail directly to mail providers instead of using an authenticated relay.
36+
For Pay-As-You-Go or Microsoft Partner Network subscriptions that were created after November 15, 2017, there will be technical restrictions that block email that’s sent directly from VMs within these subscriptions. If you want the ability to send email from Azure VMs directly to external email providers (not using an authenticated SMTP relay), you can make a request to remove the restriction. Requests will be reviewed and approved at Microsoft’s discretion, and they'll be granted only after additional anti-fraud checks are made. To make a request, open a support case by using the following issue type: **Technical** > **Virtual Network** > **Connectivity** > **Cannot send email (SMTP/Port 25)**. Make sure that you add details about why your deployment has to send mail directly to mail providers instead of using an authenticated relay.
3737

3838
After a Pay-As-You-Go or Microsoft Partner Network subscription is exempted and the VMs have been 'Stopped' & 'Started' from the Azure portal, all VMs within that subscription will be exempted going forward. The exemption is only applicable to the subscription requested.
3939

‎includes/vpn-gateway-faq-bgp-include.md

+7
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ Yes, the following ASNs are [reserved by IANA](http://www.iana.org/assignments/i
3434

3535
23456, 64496-64511, 65535-65551 and 429496729
3636

37+
### What Private ASNs can I use?
38+
The useable range of Private ASNs that can be used are:
39+
40+
* 64512-65514, 65521-65534
41+
42+
These ASNs are not reserved by IANA or Azure for use and therefore can be used to assign to your Azure VPN Gateway.
43+
3744
### Can I use the same ASN for both on-premises VPN networks and Azure VNets?
3845
No, you must assign different ASNs between your on-premises networks and your Azure VNets if you are connecting them together with BGP. Azure VPN Gateways have a default ASN of 65515 assigned, whether BGP is enabled or not for your cross-premises connectivity. You can override this default by assigning a different ASN when creating the VPN gateway, or change the ASN after the gateway is created. You will need to assign your on-premises ASNs to the corresponding Azure Local Network Gateways.
3946

0 commit comments

Comments
 (0)