Skip to content

Commit 618b96c

Browse files
msmimartmsmimart
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into mm-assign
2 parents e14e400 + 4364615 commit 618b96c

File tree

262 files changed

+6827
-4945
lines changed

Some content is hidden

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

262 files changed

+6827
-4945
lines changed

‎.openpublishing.redirection.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29021,6 +29021,31 @@
2902129021
"redirect_url": "/azure/security-center/faq-general",
2902229022
"redirect_document_id": false
2902329023
},
29024+
{
29025+
"source_path": "articles/security-center/security-center-alerts-iaas.md",
29026+
"redirect_url": "/azure/security-center/threat-protection",
29027+
"redirect_document_id": false
29028+
},
29029+
{
29030+
"source_path": "articles/security-center/security-center-alerts-data-services.md",
29031+
"redirect_url": "/azure/security-center/threat-protection",
29032+
"redirect_document_id": false
29033+
},
29034+
{
29035+
"source_path": "articles/security-center/security-center-alerts-compute.md",
29036+
"redirect_url": "/azure/security-center/threat-protection",
29037+
"redirect_document_id": false
29038+
},
29039+
{
29040+
"source_path": "articles/security-center/security-center-alerts-service-layer.md",
29041+
"redirect_url": "/azure/security-center/threat-protection",
29042+
"redirect_document_id": false
29043+
},
29044+
{
29045+
"source_path": "articles/security-center/security-center-alerts-integration.md",
29046+
"redirect_url": "/azure/security-center/threat-protection",
29047+
"redirect_document_id": false
29048+
},
2902429049
{
2902529050
"source_path": "articles/security-center/security-center-playbooks.md",
2902629051
"redirect_url": "/azure/security-center/workflow-automation",

‎articles/active-directory-domain-services/network-considerations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ The following network security group rules are required for Azure AD DS to provi
142142

143143
## User-defined routes
144144

145-
User-defined routes aren't created by default, and aren't needed for Azure AD DS to work correctly. If you're required to use route tables, avoid making any changes to the *0.0.0.0* route. Changes to this route can disrupt Azure AD Domain Services.
145+
User-defined routes aren't created by default, and aren't needed for Azure AD DS to work correctly. If you're required to use route tables, avoid making any changes to the *0.0.0.0* route. Changes to this route disrupt Azure AD Domain Services and puts the managed domain in an unsupported state.
146146

147147
You must also route inbound traffic from the IP addresses included in the respective Azure service tags to the Azure AD Domain Services subnet. For more information on service tags and their associated IP address from, see [Azure IP Ranges and Service Tags - Public Cloud](https://www.microsoft.com/en-us/download/details.aspx?id=56519).
148148

‎articles/active-directory/app-provisioning/functions-for-customizing-application-data.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The syntax for Expressions for Attribute Mappings is reminiscent of Visual Basic
3434
* For string constants, if you need a backslash ( \ ) or quotation mark ( " ) in the string, it must be escaped with the backslash ( \ ) symbol. For example: "Company name: \\"Contoso\\""
3535

3636
## List of Functions
37-
[Append](#append)      [BitAnd](#bitand)      [CBool](#cbool)      [Coalesce](#coalesce)      [ConvertToBase64](#converttobase64)      [ConvertToUTF8Hex](#converttoutf8hex)      [Count](#count)      [CStr](#cstr)      [DateFromNum](#datefromnum)  [FormatDateTime](#formatdatetime)      [Guid](#guid)      [InStr](#instr)      [IsNull](#isnull)      [IsNullOrEmpty](#isnullorempty)      [IsPresent](#ispresent)      [IsString](#isstring)      [Item](#item)      [Join](#join)      [Left](#left)      [Mid](#mid)         [NormalizeDiacritics](#normalizediacritics) [Not](#not)      [NumFromDate](#numfromdate)     [RemoveDuplicates](#removeduplicates)      [Replace](#replace)      [SelectUniqueValue](#selectuniquevalue)     [SingleAppRoleAssignment](#singleapproleassignment)     [Split](#split)    [StripSpaces](#stripspaces)      [Switch](#switch)     [ToLower](#tolower)     [ToUpper](#toupper)     [Word](#word)
37+
[Append](#append)      [BitAnd](#bitand)      [CBool](#cbool)      [Coalesce](#coalesce)      [ConvertToBase64](#converttobase64)      [ConvertToUTF8Hex](#converttoutf8hex)      [Count](#count)      [CStr](#cstr)      [DateFromNum](#datefromnum)  [FormatDateTime](#formatdatetime)      [Guid](#guid)      [IIF](#iif)     [InStr](#instr)      [IsNull](#isnull)      [IsNullOrEmpty](#isnullorempty)      [IsPresent](#ispresent)      [IsString](#isstring)      [Item](#item)      [Join](#join)      [Left](#left)      [Mid](#mid)         [NormalizeDiacritics](#normalizediacritics) [Not](#not)      [RemoveDuplicates](#removeduplicates)      [Replace](#replace)      [SelectUniqueValue](#selectuniquevalue)     [SingleAppRoleAssignment](#singleapproleassignment)     [Split](#split)    [StripSpaces](#stripspaces)      [Switch](#switch)     [ToLower](#tolower)     [ToUpper](#toupper)     [Word](#word)
3838

3939
---
4040
### Append
@@ -219,6 +219,25 @@ Guid()
219219
**Description:**<br>
220220
The function Guid generates a new random GUID
221221

222+
---
223+
### IIF
224+
**Function:**<br>
225+
IIF(condition,valueIfTrue,valueIfFalse)
226+
227+
**Description:**<br>
228+
The IIF function returns one of a set of possible values based on a specified condition.
229+
230+
**Parameters:**<br>
231+
232+
| Name | Required/ Repeating | Type | Notes |
233+
| --- | --- | --- | --- |
234+
| **condition** |Required |Variable or Expression |Any value or expression that can be evaluated to true or false. |
235+
| **valueIfTrue** |Required |Variable or String | If the condition evaluates to true, the returned value. |
236+
| **valueIfFalse** |Required |Variable or String |If the condition evaluates to false, the returned value.|
237+
238+
**Example:**<br>
239+
IIF([country]="USA",[country],[department])
240+
222241
---
223242
### InStr
224243
**Function:**<br>

‎articles/active-directory/conditional-access/concept-conditional-access-conditions.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 02/11/2020
9+
ms.date: 02/25/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -61,6 +61,7 @@ Conditional Access policies by default apply to browser-based applications and a
6161
- Modern authentication clients
6262
- This option includes applications like the Office desktop and phone applications.
6363
- Exchange ActiveSync clients
64+
- By default this includes all use of the Exchange ActiveSync (EAS) protocol. Choosing **Apply policy only to supported platforms** will limit to supported platforms like iOS, Android, and Windows.
6465
- When policy blocks the use of Exchange ActiveSync the affected user will receive a single quarantine email. This email with provide information on why they are blocked and include remediation instructions if able.
6566
- Other clients
6667
- This option includes clients that use basic/legacy authentication protocols including IMAP, MAPI, POP, SMTP, and legacy Office applications that do not support modern authentication.

‎articles/active-directory/develop/accounts-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ An account in the Microsoft identity platform consists of:
4747
4848
## Account overview diagram
4949

50-
![Account Overview Diagram](./media/accounts-overview/accounts-overview.png)
50+
![Account Overview Diagram](./media/accounts-overview/accounts-overview.svg)
5151

5252
In the above diagram:
5353

‎articles/active-directory/develop/media/accounts-overview/accounts-overview.png

-114 KB
Binary file not shown.

0 commit comments

Comments
 (0)