Skip to content

Commit 4f8a16a

Browse files
authored
Merge pull request #111472 from julieMSFT/release-ignite-arcadia
Dirty Pr to resolve merge conflicts with master in release-ignite-arcadia
2 parents b376727 + 3cd5a39 commit 4f8a16a

File tree

260 files changed

+2375
-2206
lines changed

Some content is hidden

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

260 files changed

+2375
-2206
lines changed

.openpublishing.redirection.json

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4952,6 +4952,11 @@
49524952
"redirect_url": "/azure/azure-resource-manager/management/view-activity-logs",
49534953
"redirect_document_id": false
49544954
},
4955+
{
4956+
"source_path": "articles/event-grid/event-sources.md",
4957+
"redirect_url": "/azure/event-grid/overview#event-sources",
4958+
"redirect_document_id": false
4959+
},
49554960
{
49564961
"source_path": "articles/event-grid/event-subscription-template.md",
49574962
"redirect_url": "/azure/event-grid/template-samples",
@@ -43791,6 +43796,76 @@
4379143796
"redirect_url": "/azure/cognitive-services/acoustics/what-is-acoustics",
4379243797
"redirect_document_id": false
4379343798
},
43799+
{
43800+
"source_path": "articles/cognitive-services/Acoustics/what-is-acoustics.md",
43801+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/what-is-acoustics",
43802+
"redirect_document_id": false
43803+
},
43804+
{
43805+
"source_path": "articles/cognitive-services/Acoustics/unity-quickstart.md",
43806+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unity-quickstart",
43807+
"redirect_document_id": false
43808+
},
43809+
{
43810+
"source_path": "articles/cognitive-services/Acoustics/unreal-quickstart.md",
43811+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unreal-quickstart",
43812+
"redirect_document_id": false
43813+
},
43814+
{
43815+
"source_path": "articles/cognitive-services/Acoustics/unity-baking.md",
43816+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unity-baking",
43817+
"redirect_document_id": false
43818+
},
43819+
{
43820+
"source_path": "articles/cognitive-services/Acoustics/unity-workflow.md",
43821+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unity-workflow",
43822+
"redirect_document_id": false
43823+
},
43824+
{
43825+
"source_path": "articles/cognitive-services/Acoustics/unreal-baking.md",
43826+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unreal-baking",
43827+
"redirect_document_id": false
43828+
},
43829+
{
43830+
"source_path": "articles/cognitive-services/Acoustics/unreal-workflow.md",
43831+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unreal-workflow",
43832+
"redirect_document_id": false
43833+
},
43834+
{
43835+
"source_path": "articles/cognitive-services/Acoustics/design-process.md",
43836+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/design-process",
43837+
"redirect_document_id": false
43838+
},
43839+
{
43840+
"source_path": "articles/cognitive-services/Acoustics/bake-resolution.md",
43841+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/bake-resolution",
43842+
"redirect_document_id": false
43843+
},
43844+
{
43845+
"source_path": "articles/cognitive-services/Acoustics/create-azure-account.md",
43846+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/create-azure-account",
43847+
"redirect_document_id": false
43848+
},
43849+
{
43850+
"source_path": "articles/cognitive-services/Acoustics/unity-integration.md",
43851+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unity-integration",
43852+
"redirect_document_id": false
43853+
},
43854+
{
43855+
"source_path": "articles/cognitive-services/Acoustics/unreal-integration.md",
43856+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/unreal-integration",
43857+
"redirect_document_id": false
43858+
},
43859+
{
43860+
"source_path": "articles/cognitive-services/Acoustics/faq.md",
43861+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/faq",
43862+
"redirect_document_id": false
43863+
},
43864+
{
43865+
"source_path": "articles/cognitive-services/Acoustics/known-issues.md",
43866+
"redirect_url": "https://docs.microsoft.com/gaming/acoustics/known-issues",
43867+
"redirect_document_id": false
43868+
},
4379443869
{
4379543870
"source_path": "articles/iot-central/howto-export-data.md",
4379643871
"redirect_url": "/azure/iot-central/core/howto-export-data-event-hubs-service-bus",

articles/active-directory-b2c/azure-monitor.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ To onboard your Azure AD tenant (the **Customer**), create an [Azure Resource Ma
8080

8181
Download the Azure Resource Manager template and parameter files:
8282

83-
- [rgDelegatedResourceManagement.json](https://raw.githubusercontent.com/Azure/Azure-Lighthouse-samples/master/Azure-Delegated-Resource-Management/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.json)
84-
- [rgDelegatedResourceManagement.parameters.json](https://raw.githubusercontent.com/Azure/Azure-Lighthouse-samples/master/Azure-Delegated-Resource-Management/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.parameters.json)
83+
- [rgDelegatedResourceManagement.json](https://github.com/Azure/Azure-Lighthouse-samples/blob/master/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.json)
84+
- [rgDelegatedResourceManagement.parameters.json](https://github.com/Azure/Azure-Lighthouse-samples/blob/master/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.parameters.json)
8585

8686
Next, update the parameters file with the values you recorded earlier. The following JSON snippet shows an example of an Azure Resource Manager template parameters file. For `authorizations.value.roleDefinitionId`, use the [built-in role](../role-based-access-control/built-in-roles.md) value for the *Contributor role*, `b24988ac-6180-42a0-ab88-20f7382dd24c`.
8787

articles/active-directory/b2b/invitation-email-elements.md

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,62 +18,65 @@ ms.collection: M365-identity-device-management
1818

1919
# The elements of the B2B collaboration invitation email - Azure Active Directory
2020

21-
Invitation emails are a critical component to bring partners on board as B2B collaboration users in Azure AD. You can use them to increase the recipient's trust. you can add legitimacy and social proof to the email, to make sure the recipient feels comfortable with selecting the **Get Started** button to accept the invitation. This trust is a key means to reduce sharing friction. And you also want to make the email look great!
21+
Invitation emails are a critical component to bring partners on board as B2B collaboration users in Azure AD. While it’s [not required that you send an email to invite someone using B2B collaboration](add-user-without-invite.md), doing so gives the user all the information they need to make a decision about whether to accept your invite. It also gives them a link they can always refer to in the future when they need to return to your resources.
2222

2323
![Screenshot showing the B2B invitation email](media/invitation-email-elements/invitation-email.png)
2424

25+
> [!NOTE]
26+
> This new email template is still being rolled out to all tenants, so some tenants are still using an older design. By the end of May 2020, invitations from all tenants will be using this template.
27+
2528
## Explaining the email
29+
2630
Let's look at a few elements of the email so you know how best to use their capabilities.
2731

2832
### Subject
29-
The subject of the email follows the following pattern:
30-
You're invited to the <tenantname> organization
33+
34+
The subject of the email follows this pattern:
35+
36+
<username> invited you to access applications within their organization.
3137

3238
### From address
33-
We use a LinkedIn-like pattern for the From address. You should be clear who the inviter is and from which company, and also clarify that the email is coming from a Microsoft email address. The format is: Microsoft Invitations <[email protected]> or
34-
&lt;Display name of inviter&gt; from &lt;tenantname&gt; (via Microsoft) <[email protected]>.
39+
40+
We use a LinkedIn-like pattern for the From address. This pattern should make it clear that although the email comes from [email protected], the invitation is from another organization. The format is: Microsoft Invitations <[email protected]> or Microsoft invitations on behalf of &lt;tenantname&gt;<[email protected]>.
3541

3642
### Reply To
43+
3744
The reply-to email is set to the inviter's email when available, so that replying to the email sends an email back to the inviter.
3845

39-
### Branding
40-
The invitation emails from your tenant use the company branding that you may have set up for your tenant. If you want to take advantage of this capability, [here](https://docs.microsoft.com/azure/active-directory/active-directory-branding-custom-signon-azure-portal) are the details on how to configure it. The banner logo appears in the email. Follow the image size and quality instructions [here](https://docs.microsoft.com/azure/active-directory/active-directory-branding-custom-signon-azure-portal) for best results. In addition, the company name also shows up in the call to action.
46+
### Phishing warning
4147

42-
### Call to action
43-
The call to action consists of two parts: explaining why the recipient has received the mail and what the recipient is being asked to do about it.
44-
- The "why" section can be addressed using the following pattern:
45-
You've been invited to access applications in the &lt;tenantname&gt; organization
48+
The email starts with a brief warning to the user about phishing, alerting them that they should only accept invitations they're expecting. It’s good practice to make sure the partners you’re inviting will not be surprised by your invitation by mentioning it to them ahead of time.
4649

47-
- And the "what you're being asked to do" section is indicated by the presence of the **Get Started** button. When the recipient has been added without the need for invitations, this button doesn't show up.
50+
![Image of the phishing warning in the email](media/invitation-email-elements/phishing-warning.png)
4851

4952
### Inviter's information
50-
The inviter's display name is included in the email. And in addition, if you've set up a profile picture for your Azure AD account, the inviting email will include that picture as well. Both are intended to increase your recipient's confidence in the email.
5153

52-
If you haven't yet set up your profile picture, an icon with the inviter's initials in place of the picture is shown:
54+
The email includes information about the inviter and the organization they’re sending the invitation from. This includes the sender’s name and email address, as well as the name and primary domain associated with the organization. All of this information should help the invitee make an informed decision about accepting the invitation.
5355

54-
![Screenshot showing the invitation with the inviter initials displayed](media/invitation-email-elements/inviters-initials.png)
56+
![Image of the inviter's information in the email](media/invitation-email-elements/inviters-information.png)
5557

56-
### Body
57-
The body contains the message that the inviter composes when [inviting a guest user to the directory, group, or app](add-users-administrator.md) or [by using the invitation API](customize-invitation-api.md). It is a text area, so it does not process HTML tags for security reasons.
58+
### Invitation message
5859

59-
![Screenshot showing the body of the invitation email](media/invitation-email-elements/invitation-email-body.png)
60+
If the inviter includes a message as part of their invitation when they [invite a guest user to the directory, group, or app](add-users-administrator.md) or when they [use the invitation API](customize-invitation-api.md), the message is highlighted in the main section of the email. Also included are the inviter’s name and profile image if they’ve set one. The message itself is a text area, so for security reasons, it doesn't process HTML tags.
6061

61-
### Footer section
62-
The footer contains the Microsoft company brand and lets the recipient know if the email was sent from an unmonitored alias.
63-
64-
Special cases:
62+
![Image of the invitation message in the email](media/invitation-email-elements/invitation-message.png)
6563

66-
- The inviter doesn't have an email address in the inviting tenancy
64+
### Accept button and redirect URL
6765

68-
![Screenshot when an inviter doesn't have email in the inviting tenancy](media/invitation-email-elements/inviter-no-email.png)
66+
The next section of the email contains information about where the invitee will be taken after they accept the invitation, as well as a button to do so. In the future, the invitee can always use this link to return to your resources directly.
6967

68+
![Image of the accept button and redirect URL in the email](media/invitation-email-elements/accept-button.png)
7069

71-
- The recipient doesn't need to redeem the invitation
70+
### Footer section
7271

73-
![Screenshot when the recipient doesn't need to redeem invitation](media/invitation-email-elements/when-recipient-doesnt-redeem.png)
72+
The footer contains more information about the invitation being sent. There is always an option for the invitee to block future invitations. If the organization has [set a privacy statement](https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-properties-area), the link to the statement is displayed here. Otherwise, a note indicates the organization hasn't set a privacy statement.
7473

74+
![Image of the footer section in the email](media/invitation-email-elements/footer-section.png)
75+
7576
## How the language is determined
76-
The language presented to the guest user in the invitation email is determined by the following settings. These settings are listed in order of precedence. If a setting isn’t configured, the next setting in the list determines the language.
77+
78+
The language presented to the guest user in the invitation email is determined by the following settings. These settings are listed in order of precedence. If a setting isn’t configured, the next setting in the list determines the language.
79+
7780
- The **messageLanguage** property of the [invitedUserMessageInfo](https://docs.microsoft.com/graph/api/resources/invitedusermessageinfo?view=graph-rest-1.0) object if the Create invitation API is used
7881
- The **preferredLanguage** property specified in the guest's [user object](https://docs.microsoft.com/graph/api/resources/user?view=graph-rest-1.0)
7982
- The **Notification language** set in the properties of the guest user’s home tenant (for Azure AD tenants only)
21.4 KB
Loading
50.8 KB
Loading
48.3 KB
Loading
45.5 KB
Loading
Binary file not shown.
16.6 KB
Loading

0 commit comments

Comments
 (0)