Skip to content

Commit 982a866

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-sf-7.1
2 parents f626461 + c7870a0 commit 982a866

File tree

123 files changed

+1539
-1372
lines changed

Some content is hidden

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

123 files changed

+1539
-1372
lines changed

.openpublishing.redirection.json

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,17 @@
345345
"redirect_url": "/azure/machine-learning/data-science-virtual-machine/dsvm-tools-languages",
346346
"redirect_document_id": true
347347
},
348+
{
349+
"source_path": "articles/machine-learning/data-science-virtual-machine/reference-centos-vm.md",
350+
"redirect_url": "/azure/machine-learning/data-science-virtual-machine/reference-deprecation",
351+
"redirect_document_id": false
352+
},
353+
{
354+
"source_path": "articles/machine-learning/data-science-virtual-machine/linux-dsvm-intro.md",
355+
"redirect_url": "/azure/machine-learning/data-science-virtual-machine/reference-deprecation",
356+
"redirect_document_id": true
357+
},
358+
348359
{
349360
"source_path": "articles/machine-learning/service/how-to-understand-accuracy-metrics.md",
350361
"redirect_url": "/azure/machine-learning/service/how-to-understand-automated-ml",
@@ -4055,11 +4066,21 @@
40554066
"redirect_url": "/azure/azure-government/documentation-government-welcome",
40564067
"redirect_document_id": false
40574068
},
4069+
{
4070+
"source_path": "articles/azure-government/documentation-government-k8.md",
4071+
"redirect_url": "/azure/azure-government",
4072+
"redirect_document_id": false
4073+
},
40584074
{
40594075
"source_path": "articles/azure-portal/resource-group-portal-linked-resources.md",
40604076
"redirect_url": "/azure/azure-portal/azure-portal-dashboards",
40614077
"redirect_document_id": false
40624078
},
4079+
{
4080+
"source_path": "articles/azure-resource-manager/templates/template-tutorial-create-linked-templates.md",
4081+
"redirect_url": "/azure/azure-resource-manager/templates/deployment-tutorial-linked-template",
4082+
"redirect_document_id": false
4083+
},
40634084
{
40644085
"source_path": "articles/azure-resource-manager/templates/template-tutorial-create-encrypted-storage-accounts.md",
40654086
"redirect_url": "/azure/azure-resource-manager/templates/template-tutorial-use-template-reference",
@@ -7586,7 +7607,7 @@
75867607
},
75877608
{
75887609
"source_path": "articles/azure-functions/functions-add-output-binding-storage-queue-python.md",
7589-
"redirect_url": "/azure/azure-functions/functions-add-output-binding-storage-queue-cli.md?pivots=programming-language-python",
7610+
"redirect_url": "/azure/azure-functions/functions-add-output-binding-storage-queue-cli?pivots=programming-language-python",
75907611
"redirect_document_id": false
75917612
},
75927613
{

articles/active-directory/devices/hybrid-azuread-join-manual.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Use the following table to get an overview of the steps that are required for yo
8484
| Configure service connection point | ![Check][1] | ![Check][1] | ![Check][1] |
8585
| Set up issuance of claims | | ![Check][1] | ![Check][1] |
8686
| Enable non-Windows 10 devices | | | ![Check][1] |
87-
| Verify joined devices | ![Check][1] | ![Check][1] | [Check][1] |
87+
| Verify joined devices | ![Check][1] | ![Check][1] | ![Check][1] |
8888

8989
## Configure a service connection point
9090

articles/active-directory/manage-apps/application-proxy-configure-single-sign-on-on-premises-apps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ Before you can provide SSO for on-premises applications, you need to enable Appl
7171

7272
2. In the **Set up Single Sign-On with SAML** page, go to the **Basic SAML Configuration** heading and select its **Edit** icon (a pencil). Make sure the **External URL** you configured in Application Proxy is populated in the **Identifier**, **Reply URL**, and **Logout URL** fields. These URLs are required for Application Proxy to work correctly.
7373

74-
3. Edit the **Reply URL** configured earlier so that its domain is reachable by Application Proxy. For example, if your **External URL** is `https://contosotravel-f128.msappproxy.net` and the original **Reply URL** was `https://contosotravel.com/acs`, you'll need to update the original **Reply URL** to `https://contosotravel-f128.msappproxy.net/acs`.
74+
3. Edit the **Reply URL** configured earlier so that its domain reachable on the internet via Application Proxy. For example, if your **External URL** is `https://contosotravel-f128.msappproxy.net` and the original **Reply URL** was `https://contosotravel.com/acs`, you'll need to update the original **Reply URL** to `https://contosotravel-f128.msappproxy.net/acs`.
7575

7676
![Enter basic SAML configuration data](./media/application-proxy-configure-single-sign-on-on-premises-apps/basic-saml-configuration.png)
7777

7878

7979
4. Select the checkbox next to the updated **Reply URL** to mark it as the default.
8080

81-
* If the required **Reply URL** is already listed, mark this **Reply URL** as default and delete the previously configured **Reply URL**.
81+
* Aftering marking the required **Reply URL** as default, you can also delete the previously configured **Reply URL** that used the internal URL.
8282

8383
* For an SP-initiated flow, make sure the back-end application specifies the correct **Reply URL** or Assertion Consumer Service URL for receiving the authentication token.
8484

articles/active-directory/users-groups-roles/linkedin-integration.md

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,22 @@ You can allow users in your organization to access their LinkedIn connections wi
2121

2222
> [!IMPORTANT]
2323
> The LinkedIn account connections setting is currently being rolled out to Azure AD organizations. When it is rolled out to your organization, it is enabled by default.
24-
>
24+
>
2525
> Exceptions:
26+
>
2627
> * The setting is not available for customers using Microsoft Cloud for US Government, Microsoft Cloud Germany, or Azure and Office 365 operated by 21Vianet in China.
2728
> * The setting is off by default for tenants provisioned in Germany. Note that the setting is not available for customers using Microsoft Cloud Germany.
2829
> * The setting is off by default for tenants provisioned in France.
2930
>
30-
> Once LinkedIn account connections are enabled for your organization, the account connections work after users consent to apps accessing company data on their behalf. For information about the user consent setting, see [How to remove a users access to an application](https://docs.microsoft.com/azure/active-directory/application-access-assignment-how-to-remove-assignment).
31+
> Once LinkedIn account connections are enabled for your organization, the account connections work after users consent to apps accessing company data on their behalf. For information about the user consent setting, see [How to remove a user's access to an application](https://docs.microsoft.com/azure/active-directory/application-access-assignment-how-to-remove-assignment).
3132
3233
## Enable LinkedIn account connections in the Azure portal
3334

3435
You can enable LinkedIn account connections for only the users you want to have access, from your entire organization to only selected users in your organization.
3536

3637
1. Sign in to the [Azure AD admin center](https://aad.portal.azure.com/) with an account that's a global admin for the Azure AD organization.
3738
1. Select **Users**.
38-
1. On the **Users** blade, select **User settings**.
39+
1. On the **Users** page, select **User settings**.
3940
1. Under **LinkedIn account connections**, allow users to connect their accounts to access their LinkedIn connections within some Microsoft apps. No data is shared until users consent to connect their accounts.
4041

4142
* Select **Yes** to enable the service for all users in your organization
@@ -50,25 +51,22 @@ You can enable LinkedIn account connections for only the users you want to have
5051
> LinkedIn integration is not fully enabled for your users until they consent to connect their accounts. No data is shared when you enable account connections for your users.
5152
5253
### Assign selected users with a group
53-
We have replaced the ‘Selected’ option that specifies a list of users with the option to select a group of users so that you can enable the ability to connect LinkedIn and Microsoft accounts for a single group instead of many individual users. If you don’t have LinkedIn account connections enabled for selected individual users, you don’t need to do anything. If you have previously enabled LinkedIn account connections for selected individual users, you should:
54+
55+
We have replaced the 'Selected' option that specifies a list of users with the option to select a group of users so that you can enable the ability to connect LinkedIn and Microsoft accounts for a single group instead of many individual users. If you don't have LinkedIn account connections enabled for selected individual users, you don't need to do anything. If you have previously enabled LinkedIn account connections for selected individual users, you should:
5456

5557
1. Get the current list of individual users
5658
1. Move the currently enabled individual users to a group
5759
1. Use the group from the previous as the selected group in the LinkedIn account connections setting in the Azure AD admin center.
5860

5961
> [!NOTE]
60-
> Even if you dont move your currently selected individual users to a group, they can still see LinkedIn information in Microsoft apps.
62+
> Even if you don't move your currently selected individual users to a group, they can still see LinkedIn information in Microsoft apps.
6163
62-
### Get the current list of selected users
64+
### Move currently selected users to a group
6365

66+
1. Create a CSV file of the users who are selected for LinkedIn account connections.
6467
1. Sign into Microsoft 365 with your administrator account.
65-
1. Go to https://linkedinselectedusermigration.azurewebsites.net/. You will see list of users who are selected for LinkedIn account connections.
66-
1. Export the list to a CSV file.
67-
68-
### Move the currently selected individual users to a group
69-
70-
1. Launch PowerShell
71-
1. Install Azure AD module by running `Install-Module AzureAD`
68+
1. Launch PowerShell.
69+
1. Install the Azure AD module by running `Install-Module AzureAD`
7270
1. Run the following script:
7371

7472
``` PowerShell

articles/app-service/environment/app-service-app-service-environment-control-inbound-traffic.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ Before locking down inbound network traffic with a network security group, it is
2727

2828
The following is a list of ports used by an App Service Environment. All ports are **TCP**, unless otherwise clearly noted:
2929

30-
* 454: **Required port** used by Azure infrastructure for managing and maintaining App Service Environments via SSL. Do not block traffic to this port. This port is always bound to the public VIP of an ASE.
31-
* 455: **Required port** used by Azure infrastructure for managing and maintaining App Service Environments via SSL. Do not block traffic to this port. This port is always bound to the public VIP of an ASE.
30+
* 454: **Required port** used by Azure infrastructure for managing and maintaining App Service Environments via TLS. Do not block traffic to this port. This port is always bound to the public VIP of an ASE.
31+
* 455: **Required port** used by Azure infrastructure for managing and maintaining App Service Environments via TLS. Do not block traffic to this port. This port is always bound to the public VIP of an ASE.
3232
* 80: Default port for inbound HTTP traffic to apps running in App Service Plans in an App Service Environment. On an ILB-enabled ASE, this port is bound to the ILB address of the ASE.
33-
* 443: Default port for inbound SSL traffic to apps running in App Service Plans in an App Service Environment. On an ILB-enabled ASE, this port is bound to the ILB address of the ASE.
33+
* 443: Default port for inbound TLS traffic to apps running in App Service Plans in an App Service Environment. On an ILB-enabled ASE, this port is bound to the ILB address of the ASE.
3434
* 21: Control channel for FTP. This port can be safely blocked if FTP is not being used. On an ILB-enabled ASE, this port can be bound to the ILB address for an ASE.
3535
* 990: Control channel for FTPS. This port can be safely blocked if FTPS is not being used. On an ILB-enabled ASE, this port can be bound to the ILB address for an ASE.
3636
* 10001-10020: Data channels for FTP. As with the control channel, these ports can be safely blocked if FTP is not being used. On an ILB-enabled ASE, this port can be bound to the ASE's ILB address.
@@ -58,7 +58,7 @@ The following demonstrates creating a network security group:
5858

5959
Once a network security group is created, one or more network security rules are added to it. Since the set of rules may change over time, it is recommended to space out the numbering scheme used for rule priorities to make it easy to insert additional rules over time.
6060

61-
The example below shows a rule that explicitly grants access to the management ports needed by the Azure infrastructure to manage and maintain an App Service Environment. Note that all management traffic flows over SSL and is secured by client certificates, so even though the ports are opened they are inaccessible by any entity other than Azure management infrastructure.
61+
The example below shows a rule that explicitly grants access to the management ports needed by the Azure infrastructure to manage and maintain an App Service Environment. Note that all management traffic flows over TLS and is secured by client certificates, so even though the ports are opened they are inaccessible by any entity other than Azure management infrastructure.
6262

6363
Get-AzureNetworkSecurityGroup -Name "testNSGexample" | Set-AzureNetworkSecurityRule -Name "ALLOW AzureMngmt" -Type Inbound -Priority 100 -Action Allow -SourceAddressPrefix 'INTERNET' -SourcePortRange '*' -DestinationAddressPrefix '*' -DestinationPortRange '454-455' -Protocol TCP
6464

0 commit comments

Comments
 (0)