Skip to content

Commit 3bc51e7

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-search
2 parents 67784ce + 20ec7aa commit 3bc51e7

File tree

15 files changed

+311
-156
lines changed

15 files changed

+311
-156
lines changed

articles/active-directory/saas-apps/bynder-tutorial.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,30 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
8282
1. On the **Basic SAML Configuration** section, if you wish to configure the application in **IDP** initiated mode, enter the values for the following fields:
8383

8484
a. In the **Identifier** text box, type a URL using the following pattern:
85+
86+
For a Default Domain:
8587
`https://<company name>.getbynder.com`
88+
89+
For a Custom Domain:
90+
`https;//<subdomain>.<domain>.com`
8691

8792
b. In the **Reply URL** text box, type a URL using the following pattern:
93+
94+
For a Default Domain:
8895
`https://<company name>.getbynder.com/sso/SAML/authenticate/`
96+
97+
For a Custom Domain:
98+
`https://<subdomain>.<domain>.com/sso/SAML/authenticate/`
8999

90100
1. Click **Set additional URLs** and perform the following step if you wish to configure the application in **SP** initiated mode:
91101

92102
In the **Sign-on URL** text box, type a URL using the following pattern:
103+
104+
For a Default Domain:
93105
`https://<company name>.getbynder.com/login/`
106+
107+
For a Custom Domain:
108+
` https://<subdomain>.<domain>.com/login/`
94109

95110
> [!NOTE]
96111
> These values are not real. Update these values with the actual Identifier, Reply URL and Sign-on URL. Contact [Bynder Client support team](https://www.bynder.com/en/support/) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
@@ -172,4 +187,4 @@ When you click the Bynder tile in the Access Panel, you should be automatically
172187

173188
- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis)
174189

175-
- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
190+
- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
-44.7 KB
Loading
Loading
Loading

articles/active-directory/user-help/user-help-auth-app-add-personal-ms-account.md

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,25 @@ ms.service: active-directory
99
ms.workload: identity
1010
ms.subservice: user-help
1111
ms.topic: conceptual
12-
ms.date: 01/24/2019
12+
ms.date: 04/08/2020
1313
ms.author: curtand
1414
ms.reviewer: olhaun
1515
---
1616

1717
# Add personal Microsoft accounts to the Microsoft Authenticator app
1818

19-
Add your personal Microsoft accounts, such as for Outlook.com and Xbox LIVE to the Microsoft Authenticator app for both the standard two-factor verification process and the passwordless phone sign-in method.
19+
Add your personal Microsoft accounts, such as for Outlook.com and Xbox LIVE accounts, to the Microsoft Authenticator app for both the standard two-factor verification process and passwordless phone sign-in.
2020

21-
- **Standard two-factor verification method.** Type your username and password into the device you're logging in to, and then choose whether the Microsoft Authenticator app sends a notification or if you'd prefer to copy the associated verification code from the **Accounts** screen of the Microsoft Authenticator app.
21+
- **Standard two-factor verification method.** Type your username and password into the device you're signing in to, and then choose whether the Microsoft Authenticator app sends a notification or if you'd prefer to copy the associated verification code from the **Accounts** screen of the Microsoft Authenticator app.
2222

23-
- **Passwordless sign-in method.** Type your username into the device you're logging into for your personal Microsoft account, and then use your mobile device to verify it's you by using your fingerprint, face, or PIN. For this method, you don't need to enter your password.
23+
- **Passwordless sign-in method.** Type your username into the device you're signing in to using your personal Microsoft account, and then use your mobile device to verify that it's you using your fingerprint, face, or PIN. For this method, you don't need to enter your password.
2424

2525
>[!Important]
2626
>Before you can add your account, you must download and install the Microsoft Authenticator app. If you haven't done that yet, follow the steps in the [Download and install the app](user-help-auth-app-download-install.md) article.
2727
28-
## Add your personal Microsoft account
28+
You can add your personal Microsoft account by first turning on two-factor verification, and then by adding the account to the app. You don't have to turn on two-factor verification to only use passwordless phone sign-in for your account, but we strongly recommend that you turn on two-factor verification for additional account security.
2929

30-
You can add your personal Microsoft account by first turning on two-factor verification, and then by adding the account to the app.
31-
32-
>[!Note]
33-
>if you plan to only use passwordless phone sign-in for your personal Microsoft account, you don't have to turn on two-factor verification. However, for additional account security, we recommend that you turn on two-factor verification.
34-
35-
### Turn on two-factor verification
30+
## Turn on two-factor verification
3631

3732
1. On your computer, go to your [Security basics](https://account.microsoft.com/security) page and sign-in using your personal Microsoft account. For example, [email protected].
3833

@@ -42,24 +37,30 @@ You can add your personal Microsoft account by first turning on two-factor verif
4237

4338
3. Go to the **Two-step verification** section and choose to turn the feature **On**. You can also turn it off here if you no longer want to use it with your personal account.
4439

45-
### Add your Microsoft account to the app
40+
## Add your Microsoft account to the app
4641

4742
1. Open the Microsoft Authenticator app on your mobile device.
4843

49-
2. Select **Add account** from the **Customize and control** icon in the upper right.
44+
1. On Android, select **Add account** from the **Customize and Control** icon in the upper right.
5045

51-
![Accounts page, with the Customize and control icon highlighted](./media/user-help-auth-app-add-personal-ms-account/customize-and-control-icon.png)
46+
![Android account selection pages](media/user-help-auth-app-add-personal-ms-account/customize-and-control-icon.png)
5247

53-
3. In the **Add account** page, choose **Personal account**.
48+
On iOS, select the plus icon in the upper right.
5449

55-
4. Sign in to your personal account, using the appropriate email address (such as [email protected]), and then choose **Next**.
50+
![iOS version of the account selection experience](media/user-help-auth-app-add-personal-ms-account/customize-and-control-icon-ios.png)
5651

57-
>[!Note]
58-
>If you don't have a personal Microsoft account, you can to create one here.
52+
1. In the **Add account** page, choose **Personal account**.
53+
54+
1. Select **Sign in with Microsoft** to add your account. A QR code can be used when available, but you can always add your account by signing in with your username and password.
5955

60-
5. Enter your password, and then choose **Sign in**.
56+
![Select either a Microsoft account or scan a QR code when available](media/user-help-auth-app-add-personal-ms-account/add-account-android.png)
57+
58+
1. Sign in to your personal account, using the appropriate email address (such as [email protected]), and then select **Next**.
59+
60+
>[!Note]
61+
>If you don't have a personal Microsoft account, [you can create one](https://account.microsoft.com/account/Account?refd=www.bing.com&ru=https%3A%2F%2Faccount.microsoft.com%2F%3Frefd%3Dwww.bing.com&destrt=home-index).
6162
62-
Your personal account is added to the Microsoft Authenticator app.
63+
1. Enter your password, and then select **Sign in**. Your personal account is added to the Microsoft Authenticator app.
6364

6465
## Next steps
6566

articles/azure-resource-manager/templates/deployment-script-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ The life cycle of these resources is controlled by the following properties in t
308308

309309
Deployment script execution is an idempotent operation. If none of the deploymentScripts resource properties (including the inline script) is changed, the script will not be executed when you redeploy the template. The deployment script service compares the resource names in the template with the existing resources in the same resource group. There are two options if you want to execute the same deployment script multiple times:
310310

311-
- Change the name of your deploymentScripts resource. For example, use the [utcNow](./template-functions-string.md#utcnow) template function as the resource name or as a part of the resource name. Changing the resource name creates a new deploymentScripts resource. It is good for keeping a history of script execution.
311+
- Change the name of your deploymentScripts resource. For example, use the [utcNow](./template-functions-date.md#utcnow) template function as the resource name or as a part of the resource name. Changing the resource name creates a new deploymentScripts resource. It is good for keeping a history of script execution.
312312

313313
> [!NOTE]
314314
> The utcNow function can only be used in the default value for a parameter.
Lines changed: 238 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,238 @@
1+
---
2+
title: Template functions - date
3+
description: Describes the functions to use in an Azure Resource Manager template to work with dates.
4+
ms.topic: conceptual
5+
ms.date: 04/06/2020
6+
---
7+
# Date functions for ARM templates
8+
9+
Resource Manager provides the following functions for working with dates in your Azure Resource Manager (ARM) templates:
10+
11+
* [dateTimeAdd](#datetimeadd)
12+
* [utcNow](#utcnow)
13+
14+
## dateTimeAdd
15+
16+
`dateTimeAdd(base, duration, [format])`
17+
18+
Adds a time duration to a base datetime value.
19+
20+
### Parameters
21+
22+
| Parameter | Required | Type | Description |
23+
|:--- |:--- |:--- |:--- |
24+
| base | Yes | string | The starting datetime value for the addition. Use [ISO 8601 timestamp format](https://en.wikipedia.org/wiki/ISO_8601). |
25+
| duration | Yes | string | The time value to add to the base. It can be a negative value. Use [ISO 8601 duration format](https://en.wikipedia.org/wiki/ISO_8601#Durations). |
26+
| format | No | string | The output format for the date time result. If not provided, the format of the base value is used. Use either [standard format strings](https://docs.microsoft.com/dotnet/standard/base-types/standard-date-and-time-format-strings) or [custom format strings](https://docs.microsoft.com/dotnet/standard/base-types/custom-date-and-time-format-strings). |
27+
28+
### Return value
29+
30+
The datetime value that results from adding the duration value to the base value.
31+
32+
### Examples
33+
34+
The following example template shows different ways of adding time values.
35+
36+
```json
37+
{
38+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
39+
"contentVersion": "1.0.0.0",
40+
"parameters":{
41+
"baseTime":{
42+
"type":"string",
43+
"defaultValue": "[utcNow('u')]"
44+
}
45+
},
46+
"variables": {
47+
"add3Years": "[dateTimeAdd(parameters('baseTime'), 'P3Y')]",
48+
"subtract9Days": "[dateTimeAdd(parameters('baseTime'), '-P9D')]",
49+
"add1Hour": "[dateTimeAdd(parameters('baseTime'), 'PT1H')]"
50+
},
51+
"resources": [],
52+
"outputs": {
53+
"add3Years": {
54+
"value": "[variables('add3Years')]",
55+
"type": "string"
56+
},
57+
"subtract9Days": {
58+
"value": "[variables('subtract9Days')]",
59+
"type": "string"
60+
},
61+
"add1Hour": {
62+
"value": "[variables('add1Hour')]",
63+
"type": "string"
64+
},
65+
}
66+
}
67+
```
68+
69+
When the preceding template is deployed with a base time of `2020-04-07 14:53:14Z`, the output is:
70+
71+
| Name | Type | Value |
72+
| ---- | ---- | ----- |
73+
| add3Years | String | 4/7/2023 2:53:14 PM |
74+
| subtract9Days | String | 3/29/2020 2:53:14 PM |
75+
| add1Hour | String | 4/7/2020 3:53:14 PM |
76+
77+
The next example template shows how to set the start time for an Automation schedule.
78+
79+
```json
80+
{
81+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
82+
"contentVersion": "1.0.0.0",
83+
"parameters": {
84+
"omsAutomationAccountName": {
85+
"type": "string",
86+
"defaultValue": "demoAutomation",
87+
"metadata": {
88+
"description": "Use an existing Automation account."
89+
}
90+
},
91+
"scheduleName": {
92+
"type": "string",
93+
"defaultValue": "demoSchedule1",
94+
"metadata": {
95+
"description": "Name of the new schedule."
96+
}
97+
},
98+
"baseTime":{
99+
"type":"string",
100+
"defaultValue": "[utcNow('u')]",
101+
"metadata": {
102+
"description": "Schedule will start one hour from this time."
103+
}
104+
}
105+
},
106+
"variables": {
107+
"startTime": "[dateTimeAdd(parameters('baseTime'), 'PT1H')]"
108+
},
109+
"resources": [
110+
{
111+
"name": "[concat(parameters('omsAutomationAccountName'), '/', parameters('scheduleName'))]",
112+
"type": "microsoft.automation/automationAccounts/schedules",
113+
"apiVersion": "2015-10-31",
114+
"location": "eastus2",
115+
"tags": {
116+
},
117+
"properties": {
118+
"description": "Demo Scheduler",
119+
"startTime": "[variables('startTime')]",
120+
"isEnabled": "true",
121+
"interval": 1,
122+
"frequency": "hour"
123+
}
124+
}
125+
],
126+
"outputs": {
127+
}
128+
}
129+
```
130+
131+
## utcNow
132+
133+
`utcNow(format)`
134+
135+
Returns the current (UTC) datetime value in the specified format. If no format is provided, the ISO 8601 (yyyyMMddTHHmmssZ) format is used. **This function can only be used in the default value for a parameter.**
136+
137+
### Parameters
138+
139+
| Parameter | Required | Type | Description |
140+
|:--- |:--- |:--- |:--- |
141+
| format |No |string |The URI encoded value to convert to a string. Use either [standard format strings](https://docs.microsoft.com/dotnet/standard/base-types/standard-date-and-time-format-strings) or [custom format strings](https://docs.microsoft.com/dotnet/standard/base-types/custom-date-and-time-format-strings). |
142+
143+
### Remarks
144+
145+
You can only use this function within an expression for the default value of a parameter. Using this function anywhere else in a template returns an error. The function isn't allowed in other parts of the template because it returns a different value each time it's called. Deploying the same template with the same parameters wouldn't reliably produce the same results.
146+
147+
If you use the [option to redeploy an earlier successful deployment](rollback-on-error.md), and the earlier deployment includes a parameter that uses utcNow, the parameter isn't reevaluated. Instead, the parameter value from the earlier deployment is automatically reused in the rollback deployment.
148+
149+
Be careful redeploying a template that relies on the utcNow function for a default value. When you redeploy and don't provide a value for the parameter, the function is reevaluated. If you want to update an existing resource rather than create a new one, pass in the parameter value from the earlier deployment.
150+
151+
### Return value
152+
153+
The current UTC datetime value.
154+
155+
### Examples
156+
157+
The following example template shows different formats for the datetime value.
158+
159+
```json
160+
{
161+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
162+
"contentVersion": "1.0.0.0",
163+
"parameters": {
164+
"utcValue": {
165+
"type": "string",
166+
"defaultValue": "[utcNow()]"
167+
},
168+
"utcShortValue": {
169+
"type": "string",
170+
"defaultValue": "[utcNow('d')]"
171+
},
172+
"utcCustomValue": {
173+
"type": "string",
174+
"defaultValue": "[utcNow('M d')]"
175+
}
176+
},
177+
"resources": [
178+
],
179+
"outputs": {
180+
"utcOutput": {
181+
"type": "string",
182+
"value": "[parameters('utcValue')]"
183+
},
184+
"utcShortOutput": {
185+
"type": "string",
186+
"value": "[parameters('utcShortValue')]"
187+
},
188+
"utcCustomOutput": {
189+
"type": "string",
190+
"value": "[parameters('utcCustomValue')]"
191+
}
192+
}
193+
}
194+
```
195+
196+
The output from the preceding example varies for each deployment but will be similar to:
197+
198+
| Name | Type | Value |
199+
| ---- | ---- | ----- |
200+
| utcOutput | string | 20190305T175318Z |
201+
| utcShortOutput | string | 03/05/2019 |
202+
| utcCustomOutput | string | 3 5 |
203+
204+
The next example shows how to use a value from the function when setting a tag value.
205+
206+
```json
207+
{
208+
"$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
209+
"contentVersion": "1.0.0.0",
210+
"parameters": {
211+
"utcShort": {
212+
"type": "string",
213+
"defaultValue": "[utcNow('d')]"
214+
},
215+
"rgName": {
216+
"type": "string"
217+
}
218+
},
219+
"resources": [
220+
{
221+
"type": "Microsoft.Resources/resourceGroups",
222+
"apiVersion": "2018-05-01",
223+
"name": "[parameters('rgName')]",
224+
"location": "westeurope",
225+
"tags":{
226+
"createdDate": "[parameters('utcShort')]"
227+
},
228+
"properties":{}
229+
}
230+
],
231+
"outputs": {
232+
"utcShort": {
233+
"type": "string",
234+
"value": "[parameters('utcShort')]"
235+
}
236+
}
237+
}
238+
```

0 commit comments

Comments
 (0)