Skip to content

Commit ccba723

Browse files
committed
Bringing even with master.
2 parents 45c5b5a + 81130a7 commit ccba723

File tree

345 files changed

+6131
-2609
lines changed

Some content is hidden

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

345 files changed

+6131
-2609
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10014,6 +10014,11 @@
1001410014
"redirect_url": "/azure/log-analytics/log-analytics-data-security",
1001510015
"redirect_document_id": false
1001610016
},
10017+
{
10018+
"source_path": "articles/log-analytics/log-analytics-concept-hybrid.md",
10019+
"redirect_url": "/azure/log-analytics/log-analytics-agent-overview",
10020+
"redirect_document_id": false
10021+
},
1001710022
{
1001810023
"source_path": "articles/log-analytics/log-analytics-change-tracking.md",
1001910024
"redirect_url": "/azure/automation/automation-change-tracking",

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,13 @@ To create a public container in Blob storage, do the following:
9494

9595
Configure Blob storage for Cross-Origin Resource Sharing by doing the following:
9696

97-
>[!NOTE]
98-
>Want to try out the UI customization feature by using our sample HTML and CSS content? We've provided [a simple helper tool](active-directory-b2c-reference-ui-customization-helper-tool.md) that uploads and configures our sample content on your Blob storage account. If you use the tool, skip ahead to [Modify your sign-up or sign-in custom policy](#modify-your-sign-up-or-sign-in-custom-policy).
99-
100-
1. On the **Storage** blade, under **Settings**, open **CORS**.
101-
2. Click **Add**.
102-
3. For **Allowed origins**, type an asterisk (\*).
103-
4. In the **Allowed verbs** drop-down list, select both **GET** and **OPTIONS**.
104-
5. For **Allowed headers**, type an asterisk (\*).
105-
6. For **Exposed headers**, type an asterisk (\*).
106-
7. For **Maximum age (seconds)**, type **200**.
107-
8. Click **Add**.
97+
1. In the menu, select **CORS**.
98+
2. For **Allowed origins**, enter `your-tenant-name.b2clogin.com`. Replace `your-tenant-name` with the name of your Azure AD B2C tenant. For example, `fabrikam.b2clogin.com`.
99+
3. For **Allowed Methods**, select both `GET` and `OPTIONS`.
100+
4. For **Allowed Headers**, enter an asterisk (*).
101+
5. For **Exposed Headers**, enter an asterisk (*).
102+
6. For **Max age**, enter 200.
103+
7. Click **Save**.
108104

109105
## Test CORS
110106

54.8 KB
Loading

articles/active-directory-b2c/tutorial-customize-ui.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: mtillman
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 10/30/2018
11+
ms.date: 11/12/2018
1212
ms.author: davidmu
1313
ms.component: B2C
1414
---
@@ -60,9 +60,11 @@ Although you can store your files in many ways, for this tutorial, you store the
6060
Azure AD B2C code in a browser uses a modern and standard approach to load custom content from a URL that you specify in a policy. Cross-origin resource sharing (CORS) allows restricted resources on a web page to be requested from other domains.
6161

6262
1. In the menu, select **CORS**.
63-
2. For **Allowed origins**, **Allowed headers**, and **Exposed headers**, enter `your-tenant-name.b2clogin.com`. Replace `your-tenant-name` with the name of your Azure AD B2C tenant. For example, `fabrikam.b2clogin.com`.
64-
3. For **Allowed verbs**, select both `GET` and `OPTIONS`.
65-
4. For **Max age**, enter 200.
63+
2. For **Allowed origins**, enter `your-tenant-name.b2clogin.com`. Replace `your-tenant-name` with the name of your Azure AD B2C tenant. For example, `fabrikam.b2clogin.com`.
64+
3. For **Allowed Methods**, select both `GET` and `OPTIONS`.
65+
4. For **Allowed Headers**, enter an asterisk (*).
66+
5. For **Exposed Headers**, enter an asterisk (*).
67+
6. For **Max age**, enter 200.
6668

6769
![Enable CORS](./media/tutorial-customize-ui/enable-cors.png)
6870

articles/active-directory/b2b/delegate-invitations.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ Add-MsolRoleMember -RoleObjectId 95e79109-95c0-4d8e-aee3-d01accf2d47b -RoleMembe
3030

3131
## Control who can invite
3232

33+
Go to Azure Active Directory > User Settings > Manage External Collaboration Settings
34+
3335
![externalusers](https://user-images.githubusercontent.com/13383753/45905128-2c47f680-bda4-11e8-955d-6219c67935e0.PNG)
3436

3537
With Azure AD B2B collaboration, a tenant admin can set the following invitation policies:

articles/active-directory/develop/v2-oauth2-client-creds-grant-flow.md

Lines changed: 63 additions & 43 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ The following policy must be set to **All**: **Users may register their devices
518518

519519
### Configure on-premises federation service
520520

521-
Your on-premises federation service must support issuing the **authenticationmethod** and **wiaormultiauthn** claims when receiving an authentication request to the Azure AD relying party holding a resouce_params parameter with an encoded value as shown below:
521+
Your on-premises federation service must support issuing the **authenticationmethod** and **wiaormultiauthn** claims when receiving an authentication request to the Azure AD relying party holding a resource_params parameter with an encoded value as shown below:
522522

523523
eyJQcm9wZXJ0aWVzIjpbeyJLZXkiOiJhY3IiLCJWYWx1ZSI6IndpYW9ybXVsdGlhdXRobiJ9XX0
524524

articles/active-directory/hybrid/how-to-connect-fed-single-adfs-multitenant-federation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ For AD FS in contoso.com to be able to authenticate users in fabrikam.com, a two
4343

4444
The default issuer set for a single domain federated to AD FS is "http://ADFSServiceFQDN/adfs/services/trust", for example, "http://fs.contoso.com/adfs/services/trust". Azure Active Directory requires unique issuer for each federated domain. Since the same AD FS is going to federate two domains, the issuer value needs to be modified so that it is unique for each domain AD FS federates with Azure Active Directory.
4545

46-
On the AD FS server, open Azure AD PowerShell and perform the following steps:
46+
On the AD FS server, open Azure AD PowerShell (ensure that the MSOnline module is installed) and perform the following steps:
4747

4848
Connect to the Azure Active Directory that contains the domain contoso.com
4949
Connect-MsolService

articles/active-directory/hybrid/how-to-connect-sync-feature-preferreddatalocation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ By default, Office 365 resources for your users are located in the same geo as y
2626
By setting the attribute **preferredDataLocation**, you can define a user's geo. You can have the user's Office 365 resources, such as the mailbox and OneDrive, in the same geo as the user, and still have one tenant for your entire organization.
2727

2828
> [!IMPORTANT]
29-
> Multi-Geo is currently available to customers with a minimum of 2,500 Office 365 Services subscriptions. Please talk to your Microsoft representative for details.
29+
> Multi-Geo is currently available to customers with a minimum of 5000 Office 365 Services subscriptions. Please talk to your Microsoft representative for details.
3030
>
3131
>
3232

articles/active-directory/manage-apps/configure-automatic-user-provisioning-portal.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.devlang: na
1313
ms.topic: conceptual
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16-
ms.date: 07/26/2017
16+
ms.date: 11/13/2018
1717
ms.author: barbkess
1818

1919
ms.reviewer: asmalser
@@ -74,7 +74,5 @@ This section provides addition details about the operation of the provisioning s
7474

7575
Links are provided to the **Provisioning activity report** that provides a log of all users and groups created, updated, and removed between Azure AD and the target application, and to the **Provisioning error report** that provides more detailed error messages for user and group objects that failed to be read, created, updated, or removed.
7676

77-
## Feedback
7877

79-
Please keep the feedback coming! Post your feedback and ideas for improvement in the **Admin Portal** section of our [feedback forum](https://feedback.azure.com/forums/169401-azure-active-directory/category/162510-admin-portal). The engineering team is excited about building cool new stuff every day, and they use your guidance to shape and define what to build next.
8078

0 commit comments

Comments
 (0)