Skip to content

Commit c535228

Browse files
authored
Merge pull request #114040 from MicrosoftDocs/master
Merge Master to Live, 4 AM
2 parents 11572a8 + a068b34 commit c535228

File tree

231 files changed

+1981
-3060
lines changed

Some content is hidden

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

231 files changed

+1981
-3060
lines changed

.openpublishing.redirection.json

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5451,6 +5451,16 @@
54515451
"redirect_url": "/azure/event-grid/template-samples",
54525452
"redirect_document_id": false
54535453
},
5454+
{
5455+
"source_path": "articles/event-grid/premium-basic-tiers.md",
5456+
"redirect_url": "https://azure.microsoft.com/pricing/details/event-grid/",
5457+
"redirect_document_id": false
5458+
},
5459+
{
5460+
"source_path": "articles/event-grid/update-tier.md",
5461+
"redirect_url": "https://azure.microsoft.com/pricing/details/event-grid/",
5462+
"redirect_document_id": false
5463+
},
54545464
{
54555465
"source_path": "articles/azure-resource-manager/resource-manager-samples-powershell-deploy.md",
54565466
"redirect_url": "/azure/azure-resource-manager/templates/deploy-powershell",
@@ -20700,9 +20710,59 @@
2070020710
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
2070120711
"redirect_document_id": false
2070220712
},
20713+
{
20714+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-offer-process-parts.md",
20715+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20716+
"redirect_document_id": false
20717+
},
20718+
{
20719+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-prerequisites.md",
20720+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20721+
"redirect_document_id": false
20722+
},
20723+
{
20724+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-create-offer.md",
20725+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20726+
"redirect_document_id": false
20727+
},
20728+
{
20729+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-offer-settings-tab.md",
20730+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20731+
"redirect_document_id": false
20732+
},
20733+
{
20734+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-skus-tab.md",
20735+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20736+
"redirect_document_id": false
20737+
},
20738+
{
20739+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-marketplace-tab.md",
20740+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20741+
"redirect_document_id": false
20742+
},
20743+
{
20744+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-support-tab.md",
20745+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20746+
"redirect_document_id": false
20747+
},
20748+
{
20749+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-publish-offer.md",
20750+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20751+
"redirect_document_id": false
20752+
},
20753+
{
20754+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-update-existing-offer.md",
20755+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20756+
"redirect_document_id": false
20757+
},
20758+
{
20759+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-create-technical-assets.md",
20760+
"redirect_url": "/azure/marketplace/partner-center-portal/create-iot-edge-module-asset",
20761+
"redirect_document_id": false
20762+
},
2070320763
{
2070420764
"source_path": "articles/marketplace/partner-center-portal/billing-details.md",
20705-
"redirect_url": "https://docs.microsoft.com/azure/marketplace/marketplace-commercial-transaction-capabilities-and-considerations",
20765+
"redirect_url": "/azure/marketplace/marketplace-commercial-transaction-capabilities-and-considerations",
2070620766
"redirect_document_id": false
2070720767
},
2070820768
{
@@ -28220,6 +28280,16 @@
2822028280
"redirect_url": "/azure/storage/common/storage-designing-ha-apps-with-ragrs",
2822128281
"redirect_document_id": true
2822228282
},
28283+
{
28284+
"source_path": "articles/storage/common/storage-designing-ha-apps-with-ragrs.md",
28285+
"redirect_url": "/azure/storage/common/geo-redundant-design",
28286+
"redirect_document_id": true
28287+
},
28288+
{
28289+
"source_path": "articles/storage/blobs/storage-simulate-failure-ragrs-account-app.md",
28290+
"redirect_url": "/azure/storage/common/simulate-primary-region-failure",
28291+
"redirect_document_id": false
28292+
},
2822328293
{
2822428294
"source_path": "articles/storage/common/storage-redundancy-lrs.md",
2822528295
"redirect_url": "/azure/storage/common/storage-redundancy",
@@ -52208,6 +52278,12 @@
5220852278
"source_path": "articles/load-balancer/azure-media-player/components-limitations.md",
5220952279
"redirect_url": "/articles/load-balancer/concepts",
5221052280
"redirect_document_id": false
52281+
},
52282+
{
52283+
"source_path": "articles/virtual-machines/troubleshooting/linux-virtual-machine-cannot-start-fstab-errors.md",
52284+
"redirect_url": "/articles/virtual-machines/troubleshooting",
52285+
"redirect_document_id": false
5221152286
}
52287+
5221252288
]
5221352289
}

articles/active-directory/cloud-provisioning/how-to-prerequisites.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ Run the [IdFix tool](https://docs.microsoft.com/office365/enterprise/prepare-dir
4343

4444
1. Identify a domain-joined host server running Windows Server 2012 R2 or greater with a minimum of 4-GB RAM and .NET 4.7.1+ runtime.
4545

46+
1. The PowerShell execution policy on the local server must be set to Undefined or RemoteSigned.
47+
4648
1. If there's a firewall between your servers and Azure AD, configure the following items:
4749
- Ensure that agents can make *outbound* requests to Azure AD over the following ports:
4850

articles/active-directory/develop/active-directory-configurable-token-lifetimes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.reviewer: hirsin, jlu, annaba
2020
You can specify the lifetime of a token issued by Azure Active Directory (Azure AD). You can set token lifetimes for all apps in your organization, for a multi-tenant (multi-organization) application, or for a specific service principal in your organization.
2121

2222
> [!IMPORTANT]
23-
> After hearing from customers during the preview, we've implemented [authentication session management capabilities](https://go.microsoft.com/fwlink/?linkid=2083106) in Azure AD Conditional Access. You can use this new feature to configure refresh token lifetimes by setting sign in frequency. After May 1, 2020 you will not be able to use Configurable Token Lifetime policy to configure session and refresh tokens. You can still configure access token lifetimes after the deprecation.
23+
> After hearing from customers during the preview, we've implemented [authentication session management capabilities](https://go.microsoft.com/fwlink/?linkid=2083106) in Azure AD Conditional Access. You can use this new feature to configure refresh token lifetimes by setting sign in frequency. After May 30, 2020 no new tenant will be able to use Configurable Token Lifetime policy to configure session and refresh tokens. The deprecation will happen within several months after that, which means that we will stop honoring existing session and refresh tokens polices. You can still configure access token lifetimes after the deprecation.
2424
2525
In Azure AD, a policy object represents a set of rules that are enforced on individual applications or on all applications in an organization. Each policy type has a unique structure, with a set of properties that are applied to objects to which they are assigned.
2626

articles/active-directory/develop/quickstart-v2-aspnet-webapp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ In this quickstart, you use a code sample to learn how an ASP.NET web app to sig
4040
> 1. Select **New registration**.
4141
> 1. When the **Register an application** page appears, enter your application's registration information:
4242
> - In the **Name** section, enter a meaningful application name that will be displayed to users of the app, for example `ASPNET-Quickstart`.
43-
> - Add `http://localhost:44368/` in **Redirect URI**, and click **Register**.
43+
> - Add `https://localhost:44368/` in **Redirect URI**, and click **Register**.
4444
> - From the left navigation pane under the Manage section, select **Authentication**
4545
> - Under the **Implicit Grant** sub-section, select **ID tokens**.
4646
> - And then select **Save**.

articles/active-directory/develop/single-sign-on-saml-protocol.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ The `Response` element includes the result of the authorization request. Azure A
149149

150150
### Issuer
151151

152-
Azure AD sets the `Issuer` element to `https://login.microsoftonline.com/<TenantIDGUID>/` where \<TenantIDGUID> is the tenant ID of the Azure AD tenant.
152+
Azure AD sets the `Issuer` element to `https://sts.windows.net/<TenantIDGUID>/` where \<TenantIDGUID> is the tenant ID of the Azure AD tenant.
153153

154154
For example, a response with Issuer element could look like the following sample:
155155

156156
```
157-
<Issuer xmlns="urn:oasis:names:tc:SAML:2.0:assertion"> https://login.microsoftonline.com/82869000-6ad1-48f0-8171-272ed18796e9/</Issuer>
157+
<Issuer xmlns="urn:oasis:names:tc:SAML:2.0:assertion"> https://sts.windows.net/82869000-6ad1-48f0-8171-272ed18796e9/</Issuer>
158158
```
159159

160160
### Status
@@ -187,7 +187,7 @@ In addition to the `ID`, `IssueInstant` and `Version`, Azure AD sets the followi
187187
This is set to `https://sts.windows.net/<TenantIDGUID>/`where \<TenantIDGUID> is the Tenant ID of the Azure AD tenant.
188188

189189
```
190-
<Issuer>https://login.microsoftonline.com/82869000-6ad1-48f0-8171-272ed18796e9/</Issuer>
190+
<Issuer>https://sts.windows.net/82869000-6ad1-48f0-8171-272ed18796e9/</Issuer>
191191
```
192192

193193
#### Signature

articles/active-directory/hybrid/how-to-connect-fed-group-claims.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ author: billmath
1818

1919
Azure Active Directory can provide a users group membership information in tokens for use within applications. Two main patterns are supported:
2020

21-
- Groups identified by their Azure Active Directory object identifier (OID) attribute
22-
- Groups identified by sAMAccountName or GroupSID attributes for Active Directory (AD) synchronized groups and users
21+
- Groups identified by their Azure Active Directory object identifier (OID) attribute
22+
- Groups identified by sAMAccountName or GroupSID attributes for Active Directory (AD) synchronized groups and users
2323

2424
> [!IMPORTANT]
2525
> There are a number of caveats to note for this functionality:
-184 Bytes
Loading
-26.4 KB
Loading
-30.6 KB
Loading

articles/active-directory/identity-protection/howto-identity-protection-configure-notifications.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: identity-protection
88
ms.topic: conceptual
9-
ms.date: 10/18/2019
9+
ms.date: 05/05/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -47,12 +47,11 @@ Configure the users at risk email in the **Azure portal** under **Azure Active D
4747
The weekly digest email contains a summary of new risk detections.
4848
It includes:
4949

50-
- Users at risk
51-
- Suspicious activities
52-
- Detected vulnerabilities
50+
- New risky users detected
51+
- New risky sign-ins detected (in real-time)
5352
- Links to the related reports in Identity Protection
5453

55-
![Weekly digest email](./media/howto-identity-protection-configure-notifications/400.png)
54+
![Weekly digest email](./media/howto-identity-protection-configure-notifications/weekly-digest-email.png)
5655

5756
By default, recipients include all Global Admins. Global Admins can also add other Global Admins, Security Admins, Security Readers as recipients.
5857

0 commit comments

Comments
 (0)