Skip to content

Commit a1e66c0

Browse files
committed
Bringing even with master.
2 parents fa31976 + e3a8d3b commit a1e66c0

File tree

82 files changed

+1013
-576
lines changed

Some content is hidden

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

82 files changed

+1013
-576
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13765,6 +13765,11 @@
1376513765
"redirect_url": "./end-user/microsoft-authenticator-app-how-to",
1376613766
"redirect_document_id": false
1376713767
},
13768+
{
13769+
"source_path": "articles/service-fabric/service-fabric-patterns-and-scenarios.md",
13770+
"redirect_url": "/azure/service-fabric/service-fabric-application-scenarios",
13771+
"redirect_document_id": false
13772+
},
1376813773
{
1376913774
"source_path": "articles/service-fabric-mesh/service-fabric-mesh-howto-deploy-app-private-registry.md",
1377013775
"redirect_url": "/azure/service-fabric-mesh/service-fabric-mesh-tutorial-template-deploy-app",

articles/active-directory/users-groups-roles/groups-dynamic-membership.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: active-directory
1111
ms.workload: identity
1212
ms.component: users-groups-roles
1313
ms.topic: article
14-
ms.date: 10/26/2018
14+
ms.date: 11/05/2018
1515
ms.author: curtand
1616
ms.reviewer: krbain
1717

@@ -355,6 +355,7 @@ You can also create a rule that selects device objects for membership in a group
355355
organizationalUnit | any string value matching the name of the organizational unit set by an on-premises Active Directory | (device.organizationalUnit -eq "US PCs")
356356
deviceId | a valid Azure AD device ID | (device.deviceId -eq "d4fe7726-5966-431c-b3b8-cddc8fdb717d")
357357
objectId | a valid Azure AD object ID | (device.objectId -eq 76ad43c9-32c5-45e8-a272-7b58b58f596d")
358+
systemLabels | any string matching the Intune device property for tagging Modern Workplace devices | (device.systemLabels -contains “M365Managed”)
358359

359360
## Next steps
360361

articles/application-gateway/application-gateway-customize-waf-rules-powershell.md

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,45 +44,59 @@ The following output is a truncated response from the preceding example:
4444
```
4545
OWASP (Ver. 3.0):
4646
47-
REQUEST-910-IP-REPUTATION:
47+
General:
4848
Description:
49-
49+
5050
Rules:
5151
RuleId Description
5252
------ -----------
53-
910011 Rule 910011
54-
910012 Rule 910012
55-
... ...
53+
200004 Possible Multipart Unmatched Boundary.
5654
5755
REQUEST-911-METHOD-ENFORCEMENT:
5856
Description:
59-
57+
6058
Rules:
6159
RuleId Description
6260
------ -----------
6361
911011 Rule 911011
64-
... ...
65-
66-
OWASP (Ver. 2.2.9):
67-
68-
crs_20_protocol_violations:
62+
911012 Rule 911012
63+
911100 Method is not allowed by policy
64+
911013 Rule 911013
65+
911014 Rule 911014
66+
911015 Rule 911015
67+
911016 Rule 911016
68+
911017 Rule 911017
69+
911018 Rule 911018
70+
71+
REQUEST-913-SCANNER-DETECTION:
6972
Description:
70-
73+
7174
Rules:
7275
RuleId Description
7376
------ -----------
74-
960911 Invalid HTTP Request Line
75-
981227 Apache Error: Invalid URI in Request.
76-
960000 Attempted multipart/form-data bypass
77+
913011 Rule 913011
78+
913012 Rule 913012
79+
913100 Found User-Agent associated with security scanner
80+
913110 Found request header associated with security scanner
81+
913120 Found request filename/argument associated with security scanner
82+
913013 Rule 913013
83+
913014 Rule 913014
84+
913101 Found User-Agent associated with scripting/generic HTTP client
85+
913102 Found User-Agent associated with web crawler/bot
86+
913015 Rule 913015
87+
913016 Rule 913016
88+
913017 Rule 913017
89+
913018 Rule 913018
90+
7791
... ...
7892
```
7993

8094
## Disable rules
8195

82-
The following example disables rules `910018` and `910017` on an application gateway:
96+
The following example disables rules `911011` and `911012` on an application gateway:
8397

8498
```powershell
85-
$disabledrules=New-AzureRmApplicationGatewayFirewallDisabledRuleGroupConfig -RuleGroupName REQUEST-910-IP-REPUTATION -Rules 910018,910017
99+
$disabledrules=New-AzureRmApplicationGatewayFirewallDisabledRuleGroupConfig -RuleGroupName REQUEST-911-METHOD-ENFORCEMENT -Rules 911011,911012
86100
Set-AzureRmApplicationGatewayWebApplicationFirewallConfiguration -ApplicationGateway $gw -Enabled $true -FirewallMode Detection -RuleSetVersion 3.0 -RuleSetType OWASP -DisabledRuleGroups $disabledrules
87101
Set-AzureRmApplicationGateway -ApplicationGateway $gw
88102
```

articles/application-gateway/application-gateway-url-route-overview.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
---
22
title: URL-based content routing overview | Microsoft Docs
33
description: This page provides an overview of the Application Gateway URL-based content routing, UrlPathMap configuration and PathBasedRouting rule .
4-
documentationcenter: na
54
services: application-gateway
65
author: vhorne
76
manager: jpconnock
8-
editor:
9-
10-
ms.assetid: 4409159b-e22d-4c9a-a103-f5d32465d163
117
ms.service: application-gateway
12-
ms.devlang: na
13-
ms.topic: hero-article
14-
ms.tgt_pltfrm: na
15-
ms.workload: infrastructure-services
16-
ms.date: 05/09/2017
8+
ms.date: 11/7/2018
179
ms.author: victorh
1810

1911
---
@@ -66,7 +58,7 @@ The urlPathMap element is used to specify Path patterns to back-end server pool
6658
```
6759

6860
> [!NOTE]
69-
> PathPattern: This setting is a list of path patterns to match. Each must start with / and the only place a "*" is allowed is at the end following a "/." The string fed to the path matcher does not include any text after the first? or #, and those chars are not allowed here.
61+
> PathPattern: This setting is a list of path patterns to match. Each must start with / and the only place a "*" is allowed is at the end following a "/." The string fed to the path matcher does not include any text after the first ? or #, and those chars are not allowed here. Otherwise, any characters allowed in a URL are allowed in PathPattern.
7062
7163
You can check out a [Resource Manager template using URL-based routing](https://azure.microsoft.com/documentation/templates/201-application-gateway-url-path-based-routing) for more information.
7264

articles/application-gateway/waf-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
title: Introduction to web application firewall (WAF) for Azure Application Gateway
33
description: This article provides an overview of web application firewall (WAF) for Application Gateway
44
services: application-gateway
5-
author: amsriva
5+
author: vhorne
66
ms.service: application-gateway
7-
ms.date: 10/11/2018
7+
ms.date: 11/7/2018
88
ms.author: amsriva
99
---
1010

@@ -34,7 +34,7 @@ The following are the core benefits that Application Gateway and web application
3434

3535
* Monitor your web application against attacks using a real-time WAF log. This log is integrated with [Azure Monitor](../monitoring-and-diagnostics/monitoring-overview.md) to track WAF alerts and logs and easily monitor trends.
3636

37-
* WAF will be integrated with Azure Security Center soon. Azure Security Center allows for a central view of the security state of all your Azure resources.
37+
* WAF is integrated with Azure Security Center. Azure Security Center allows for a central view of the security state of all your Azure resources.
3838

3939
### Customization
4040

articles/azure-monitor/toc.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@
525525
href: ../monitoring/monitoring-container-insights-onboard.md?toc=%2fazure%2fmonitoring%2ftoc.json
526526
- name: Analyze
527527
href: ../monitoring/monitoring-container-insights-analyze.md?toc=%2fazure%2fmonitoring%2ftoc.json
528-
- name: Stop monitoring
528+
- name: Disable monitoring
529529
href: ../monitoring/monitoring-container-insights-optout.md?toc=%2fazure%2fmonitoring%2ftoc.json
530530
- name: Troubleshooting
531531
href: ../monitoring/monitoring-container-insights-troubleshoot.md
@@ -579,6 +579,8 @@
579579
href: ../monitoring/monitoring-vminsights-performance.md?toc=/azure/azure-monitor/toc.json
580580
- name: Query data with Log Analytics
581581
href: ../monitoring/monitoring-vminsights-log-search.md?toc=/azure/azure-monitor/toc.json
582+
- name: Disable monitoring
583+
href: ../monitoring/monitoring-vminsights-optout.md?toc=/azure/azure-monitor/toc.json
582584
- name: Agent Health
583585
href: ../monitoring/monitoring-solution-agenthealth.md?toc=/azure/azure-monitor/toc.json
584586
- name: Capacity and performance

articles/azure-resource-manager/resource-group-template-functions-resource.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,10 @@ The following [example template](https://github.com/Azure/azure-docs-json-sample
114114
"type": "string",
115115
"defaultValue": "southcentralus"
116116
},
117-
"requestContent": {
117+
"accountSasProperties": {
118118
"type": "object",
119119
"defaultValue": {
120120
"signedServices": "b",
121-
"signedResourceType": "c",
122121
"signedPermission": "r",
123122
"signedExpiry": "2018-08-20T11:00:00Z",
124123
"signedResourceTypes": "s"
@@ -160,7 +159,7 @@ The following [example template](https://github.com/Azure/azure-docs-json-sample
160159
},
161160
"accountSAS": {
162161
"type": "object",
163-
"value": "[listAccountSas(parameters('storagename'), '2018-02-01', parameters('requestContent'))]"
162+
"value": "[listAccountSas(parameters('storagename'), '2018-02-01', parameters('accountSasProperties'))]"
164163
}
165164
}
166165
}

articles/azure-stack/azure-stack-app-service-update.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
title: 'Update Azure App Service on Azure Stack | Microsoft Docs'
43
description: Detailed guidance for updating Azure App Service on Azure Stack

articles/azure-subscription-service-limits.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tags: billing
88
ms.assetid: 60d848f9-ff26-496e-a5ec-ccf92ad7d125
99
ms.service: billing
1010
ms.topic: article
11-
ms.date: 10/19/2018
11+
ms.date: 11/05/2018
1212
ms.author: byvinyal
1313

1414
---
@@ -73,7 +73,6 @@ In the limits below, a new table has been added to reflect any differences in li
7373
* [Log Analytics](#log-analytics-limits)
7474
* [Managed Identity](#managed-identity-limits)
7575
* [Media Services](#media-services-limits)
76-
* [Mobile Engagement](#mobile-engagement-limits)
7776
* [Mobile Services](#mobile-services-limits)
7877
* [Multi-Factor Authentication](#multi-factor-authentication)
7978
* [Networking](#networking-limits)

articles/cognitive-services/LUIS/luis-reference-prebuilt-entities.md

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -37,34 +37,11 @@ See notes on [Deprecated prebuilt entities](luis-reference-prebuilt-deprecated.m
3737

3838
KeyPhrase is not available in all subcultures of Portuguese (Brazil) - ```pt-BR```.
3939

40-
<!--
41-
## Examples of prebuilt entities in en-us culture
42-
The following table lists prebuilt entities with example data and the return values.
43-
44-
Prebuilt entity | Example utterance | JSON
45-
------|------|------|
46-
```builtin.age``` | ```100 year old``` |```{ "type": "builtin.age", "entity": "100 year old" }```|
47-
```builtin.age``` | ```19 years old``` |```{ "type": "builtin.age", "entity": "19 years old" }```|
48-
```builtin.currency``` | ```1000.00 US dollars``` |```{ "type": "builtin.currency", "entity": "1000.00 us dollars" }```
49-
```builtin.currency``` | ```$ 67.5 B``` |```{ "type": "builtin.currency", "entity": "$ 67.5" }```|
50-
```builtin.datetimeV2``` | See [builtin.datetimeV2](luis-reference-prebuilt-datetimev2.md) | See [builtin.datetimeV2](luis-reference-prebuilt-datetimev2.md) |
51-
```builtin.dimension``` | ```2 miles``` |```{ "type": "builtin.dimension", "entity": "2 miles" }```|
52-
```builtin.dimension``` | ```650 square kilometers``` |```{ "type": "builtin.dimension", "entity": "650 square kilometers" }```|
53-
```builtin.email``` | ```[email protected]``` |```{ "type": "builtin.email", "entity": "[email protected]" }```|
54-
```builtin.number``` | ```ten``` |``` { "type": "builtin.number", "entity": "ten" } ```|
55-
```builtin.number``` | ```3.1415``` |``` { "type": "builtin.number", "entity": "3 . 1415" }``` |
56-
```builtin.ordinal``` | ```first``` |```{ "type": "builtin.ordinal", "entity": "first" }``` |
57-
```builtin.ordinal``` | ```10th``` | ```{ "type": "builtin.ordinal", "entity": "10th" }``` |
58-
```builtin.percentage``` | ```The stock price increase by 7 $ this year``` |```{ "type": "builtin.percentage", "entity": "7 %" }```|
59-
```builtin.phonenumber``` | ```my mobile is 00 44 161 1234567``` |```{ "type": "builtin.phonenumber", "entity": "00 44 161 1234567" }```|
60-
```builtin.temperature``` | ```10 degrees celsius``` | ```{ "type": "builtin.temperature", "entity": "10 degrees celcius" }```|
61-
```builtin.temperature``` | ```78 F``` |```{ "type": "builtin.temperature", "entity": "78 f" }```|
62-
```builtin.url``` | ```http://www.luis.ai is a great cognitive service``` |```{ "type": "builtin.url", "entity": "http://www.luis.ai" }```|
63-
-->
64-
6540
## Contribute to prebuilt entity cultures
6641
The prebuilt entities are developed in the Recognizers-Text open-source project. [Contribute](https://github.com/Microsoft/Recognizers-Text) to the project. This project includes examples of currency per culture.
6742

43+
GeographyV2 and PersonName are not included in the Recognizers-Text project. For issues with these prebuilt entities, please open a [support request](../../azure-supportability/how-to-create-azure-support-request.md).
44+
6845
## Next steps
6946

7047
Learn about the [number](luis-reference-prebuilt-number.md), [datetimeV2](luis-reference-prebuilt-datetimev2.md), and [currency](luis-reference-prebuilt-currency.md) entities.

0 commit comments

Comments
 (0)