Skip to content

Commit 1317500

Browse files
Merge pull request #79519 from MicrosoftDocs/master
Merge master to live 2:37 AM
2 parents 28b89f6 + 6ced820 commit 1317500

File tree

164 files changed

+3223
-795
lines changed

Some content is hidden

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

164 files changed

+3223
-795
lines changed

.openpublishing.redirection.json

Lines changed: 70 additions & 65 deletions
Large diffs are not rendered by default.

articles/active-directory/develop/howto-create-service-principal-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ When programmatically signing in, you need to pass the tenant ID with your authe
9494
![Client ID](./media/howto-create-service-principal-portal/copy-app-id.png)
9595

9696
## Certificates and secrets
97-
Deamon applications can use two forms of credentials to authenticate with Azure AD: certificates and application secrets. We recommend using a certificate, but you can also create a new application secret.
97+
Daemon applications can use two forms of credentials to authenticate with Azure AD: certificates and application secrets. We recommend using a certificate, but you can also create a new application secret.
9898

9999
### Upload a certificate
100100

articles/app-service/app-service-web-tutorial-custom-domain.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ From the left menu, select **App Services**, and then select the name of the app
6565

6666
You see the management page of the App Service app.
6767

68-
<a name="checkpricing"></a>
68+
<a name="checkpricing" aria-hidden="true"></a>
6969

7070
### Check the pricing tier
7171

@@ -79,7 +79,7 @@ The app's current tier is highlighted by a blue border. Check to make sure that
7979

8080
If the App Service plan is not in the **F1** tier, close the **Scale up** page and skip to [Map a CNAME record](#cname).
8181

82-
<a name="scaleup"></a>
82+
<a name="scaleup" aria-hidden="true"></a>
8383

8484
### Scale up the App Service plan
8585

@@ -93,7 +93,7 @@ When you see the following notification, the scale operation is complete.
9393

9494
![Scale operation confirmation](./media/app-service-web-tutorial-custom-domain/scale-notification.png)
9595

96-
<a name="cname"></a>
96+
<a name="cname" aria-hidden="true"></a>
9797

9898
## Map your domain
9999

@@ -159,7 +159,7 @@ If you missed a step or made a typo somewhere earlier, you see a verification er
159159

160160
![Verification error](./media/app-service-web-tutorial-custom-domain/verification-error-cname.png)
161161

162-
<a name="a"></a>
162+
<a name="a" aria-hidden="true"></a>
163163

164164
### Map an A record
165165

@@ -210,7 +210,7 @@ When the records are added, the DNS records page looks like the following exampl
210210

211211
![DNS records page](./media/app-service-web-tutorial-custom-domain/a-record.png)
212212

213-
<a name="enable-a"></a>
213+
<a name="enable-a" aria-hidden="true"></a>
214214

215215
#### Enable the A record mapping in the app
216216

@@ -243,7 +243,7 @@ If you missed a step or made a typo somewhere earlier, you see a verification er
243243

244244
![Verification error](./media/app-service-web-tutorial-custom-domain/verification-error.png)
245245

246-
<a name="wildcard"></a>
246+
<a name="wildcard" aria-hidden="true"></a>
247247

248248
### Map a wildcard domain
249249

@@ -307,7 +307,7 @@ If you receive an HTTP 404 (Not Found) error when browsing to the URL of your cu
307307
- The custom domain configured is missing an A record and/or a CNAME record.
308308
- The browser client has cached the old IP address of your domain. Clear the cache and test DNS resolution again. On a Windows machine, you clear the cache with `ipconfig /flushdns`.
309309

310-
<a name="virtualdir"></a>
310+
<a name="virtualdir" aria-hidden="true"></a>
311311

312312
## Migrate an active domain
313313

articles/automation/tutorial-configure-servers-desired-state.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,37 @@ $reports = Get-AzureRmAutomationDscNodeReport -ResourceGroupName 'MyResourceGrou
151151
$reports[0]
152152
```
153153

154+
## Removing nodes from service
155+
156+
When you add a node to Azure Automation State Configuration,
157+
the settings in Local Configuration Manager are set to register with the service
158+
and pull configurations and required modules to configure the machine.
159+
If you choose to remove the node from the service,
160+
you can do so using either the Azure portal
161+
or the Az cmdlets.
162+
163+
> [!NOTE]
164+
> Unregistering a node from the service only sets the Local Configuration Manager settings
165+
> so the node is no longer connecting to the service.
166+
> This does not effect the configuration that is currently applied to the node.
167+
> To remove the current configuration, use the
168+
> [PowerShell](https://docs.microsoft.com/en-us/powershell/module/psdesiredstateconfiguration/remove-dscconfigurationdocument?view=powershell-5.1)
169+
> or delete the local configuration file
170+
> (this is the only option for Linux nodes).
171+
172+
### Azure portal
173+
174+
From Azure Automation, click on **State configuration (DSC)** in the table of contents.
175+
Next click **Nodes** to view the list of nodes that are registered with the service.
176+
Click on the name of the node you wish to remove.
177+
In the Node view that opens, click **Unregister**.
178+
179+
### PowerShell
180+
181+
To unregister a node from Azure Automation State Configuration service using PowerShell,
182+
follow the documentation for the cmdlet
183+
[Unregister-AzAutomationDscNode](https://docs.microsoft.com/en-us/powershell/module/az.automation/unregister-azautomationdscnode?view=azps-2.0.0).
184+
154185
## Next steps
155186

156187
- To get started, see [Getting started with Azure Automation State Configuration](automation-dsc-getting-started.md)

articles/azure-monitor/app/asp-net-troubleshoot-no-data.md

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -246,18 +246,10 @@ You can modify these parameters as needed.
246246
- **MaxCollectSec**. Set this parameter to prevent PerfView from running indefinitely and affecting the performance of your server.
247247
- **OnlyProviders**. Set this paramater to only collect logs from the SDK. You can customize this list based on your specific investigations.
248248

249-
Our full list of providers is:
250249

251-
- Microsoft-ApplicationInsights-Core
252-
- Microsoft-ApplicationInsights-Extensibility-DependencyCollector
253-
- Microsoft-ApplicationInsights-Extensibility-Rtia-SharedCore
254-
- Microsoft-ApplicationInsights-Extensibility-Web
255-
- Microsoft-ApplicationInsights-Extensibility-WindowsServer
256-
- Microsoft-ApplicationInsights-Web
257-
- Microsoft-ApplicationInsights-WindowsServer-TelemetryChannel
258-
259-
260-
For more information, see [Recording performance traces with PerfView](https://github.com/dotnet/roslyn/wiki/Recording-performance-traces-with-PerfView).
250+
For more information,
251+
- [Recording performance traces with PerfView](https://github.com/dotnet/roslyn/wiki/Recording-performance-traces-with-PerfView).
252+
- [Application Insights Event Sources](https://github.com/microsoft/ApplicationInsights-Home/tree/master/Samples/ETW)
261253

262254
## Still not working...
263255
* [Application Insights forum](https://social.msdn.microsoft.com/Forums/vstudio/en-US/home?forum=ApplicationInsights)

articles/azure-monitor/insights/azure-networking-analytics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ To use the updated solutions:
216216

217217
| Instead of: | Use: |
218218
| --- | --- |
219-
| NetworkApplicationgateways &#124; where OperationName=="ApplicationGatewayAccess" | AzureDiagnostics &#124; where ResourceType="APPLICATIONGATEWAYS" and OperationName=="ApplicationGatewayAccess" |
220-
| NetworkApplicationgateways &#124; where OperationName=="ApplicationGatewayPerformance" | AzureDiagnostics &#124; where ResourceType=="APPLICATIONGATEWAYS" and OperationName=ApplicationGatewayPerformance |
219+
| NetworkApplicationgateways &#124; where OperationName=="ApplicationGatewayAccess" | AzureDiagnostics &#124; where ResourceType=="APPLICATIONGATEWAYS" and OperationName=="ApplicationGatewayAccess" |
220+
| NetworkApplicationgateways &#124; where OperationName=="ApplicationGatewayPerformance" | AzureDiagnostics &#124; where ResourceType=="APPLICATIONGATEWAYS" and OperationName=="ApplicationGatewayPerformance" |
221221
| NetworkSecuritygroups | AzureDiagnostics &#124; where ResourceType=="NETWORKSECURITYGROUPS" |
222222

223223
+ For any field that has a suffix of \_s, \_d, or \_g in the name, change the first character to lower case

articles/azure-monitor/insights/network-performance-monitor-service-connectivity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ If you observe an abnormality, follow these steps:
124124
* If the application is running slow, determine whether poor application performance is because of the network or an issue on the application provider's end.
125125

126126
## GCC Office URLs for US Government customers
127-
For US Government Virginia region, only DOD URLs are built-in NPM. Customers using GCC URLs need to create custom tests and add each URL inidividually.
127+
For US Government Virginia region, only DOD URLs are built-in NPM. Customers using GCC URLs need to create custom tests and add each URL individually.
128128

129129
| Field | GCC |
130130
|:--- |:--- |

articles/azure-monitor/platform/alerts-activity-log-service-notifications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Learn how to [Configure webhook notifications for existing problem management sy
8787
8888
## Alert with existing action group using Azure portal
8989

90-
1. Follow steps 1 through 7 in the previous section to create your service health notification.
90+
1. Follow steps 1 through 6 in the previous section to create your service health notification.
9191

9292
1. Under **Define action group**, click the **Select action group** button. Select the appropriate action group.
9393

articles/cloud-services/cloud-services-model-and-package.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ The following sample shows the configuration for a web role with a website and w
182182
</Site>
183183
<Site name="MailSite" packageDir="MailSite">
184184
<Bindings>
185-
<Binding name="mail" endpointName="HttpIn" hostheader="mail.mysite.cloudapp.net" />
185+
<Binding name="mail" endpointName="HttpIn" hostHeader="mail.mysite.cloudapp.net" />
186186
</Bindings>
187187
<VirtualDirectory name="artifacts" />
188188
<VirtualApplication name="storageproxy">

articles/cognitive-services/LUIS/luis-tutorial-pattern-any.md

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: nitinme
99
ms.service: cognitive-services
1010
ms.subservice: language-understanding
1111
ms.topic: tutorial
12-
ms.date: 12/21/2018
12+
ms.date: 06/12/2019
1313
ms.author: diberry
1414
#Customer intent: As a new user, I want to understand how and why to use pattern.any entity to improve predictions.
1515
---
@@ -61,24 +61,20 @@ The varying length includes words that may confuse LUIS about where the entity e
6161
|{FormName} is published in French[?]|
6262

6363
## Import example app
64-
Continue with the app created in the last tutorial, named **HumanResources**.
6564

66-
Use the following steps:
65+
1. Download and save [app JSON file](https://github.com/Azure-Samples/cognitive-services-language-understanding/blob/master/documentation-samples/tutorials/custom-domain-pattern-roles-HumanResources.json).
6766

68-
1. Download and save [app JSON file](https://github.com/Azure-Samples/cognitive-services-language-understanding/blob/master/documentation-samples/tutorials/custom-domain-pattern-roles-HumanResources.json).
67+
1. In the [LUIS portal](https://www.luis.ai), on the **My apps** page, import the JSON into a new app.
6968

70-
2. Import the JSON into a new app.
71-
72-
3. From the **Manage** section, on the **Versions** tab, clone the version, and name it `patt-any`. Cloning is a great way to play with various LUIS features without affecting the original version. Because the version name is used as part of the URL route, the name can't contain any characters that are not valid in a URL.
69+
1. From the **Manage** section, on the **Versions** tab, clone the version, and name it `patt-any`. Cloning is a great way to play with various LUIS features without affecting the original version. Because the version name is used as part of the URL route, the name can't contain any characters that are not valid in a URL.
7370

7471
## Add example utterances
75-
Remove the prebuilt keyPhrase entity if it is difficult to create and label the FormName entity.
7672

7773
1. Select **Build** from the top navigation, then select **Intents** from left navigation.
7874

79-
2. Select **FindForm** from the intents list.
75+
1. Select **FindForm** from the intents list.
8076

81-
3. Add some example utterances:
77+
1. Add some example utterances:
8278

8379
|Example utterance|
8480
|--|
@@ -90,23 +86,23 @@ Remove the prebuilt keyPhrase entity if it is difficult to create and label the
9086
Without a Pattern.any entity, it would be difficult for LUIS to understand where the form title ends because of the many variations of form names.
9187

9288
## Create a Pattern.any entity
93-
The Pattern.any entity extracts entities of varying length. It only works in a pattern because the pattern marks the beginning and end of the entity. If you find that your pattern, when it includes a Pattern.any, extracts entities incorrectly, use an [explicit list](luis-concept-patterns.md#explicit-lists) to correct this problem.
89+
The Pattern.any entity extracts entities of varying length. It only works in a pattern because the pattern marks the beginning and end of the entity.
9490

9591
1. Select **Entities** in the left navigation.
9692

97-
2. Select **Create new entity**, enter the name `FormName`, and select **Pattern.any** as the type. Select **Done**.
93+
1. Select **Create new entity**, enter the name `FormName`, and select **Pattern.any** as the type. Select **Done**.
9894

99-
You can't label the entity in the intent because a Pattern.any is only valid in a pattern.
95+
You can't label the entity in an intent's example utterances because a Pattern.any is only valid in a pattern.
10096

10197
If you want the extracted data to include other entities such as number or datetimeV2, you need to create a composite entity that includes the Pattern.any, as well as number and datetimeV2.
10298

10399
## Add a pattern that uses the Pattern.any
104100

105101
1. Select **Patterns** from the left navigation.
106102

107-
2. Select the **FindForm** intent.
103+
1. Select the **FindForm** intent.
108104

109-
3. Enter the following template utterances, which use the new entity:
105+
1. Enter the following template utterances, which use the new entity:
110106

111107
|Template utterances|
112108
|--|
@@ -117,24 +113,27 @@ The Pattern.any entity extracts entities of varying length. It only works in a p
117113

118114
If you want to account for variations of the form such as single quotes instead of double quotes or a period instead of a question mark, create a new pattern for each variation.
119115

120-
4. If you removed the keyPhrase entity, add it back to the app.
121-
122116
## Train the LUIS app
123117

124118
[!INCLUDE [LUIS How to Train steps](../../../includes/cognitive-services-luis-tutorial-how-to-train.md)]
125119

126120
## Test the new pattern for free-form data extraction
127121
1. Select **Test** from the top bar to open the test panel.
128122

129-
2. Enter the following utterance:
123+
1. Enter the following utterance:
130124

131125
`Where is the form Understand your responsibilities as a member of the community and who needs to sign it after I read it?`
132126

133-
3. Select **Inspect** under the result to see the test results for entity and intent.
127+
1. Select **Inspect** under the result to see the test results for entity and intent.
134128

135129
The entity `FormName` is found first, then the pattern is found, determining the intent. If you have a test result where the entities are not detected, and therefore the pattern is not found, you need to add more example utterances on the intent (not the pattern).
136130

137-
4. Close the test panel by selecting the **Test** button in the top navigation.
131+
1. Close the test panel by selecting the **Test** button in the top navigation.
132+
133+
## Using an explicit list
134+
135+
If you find that your pattern, when it includes a Pattern.any, extracts entities incorrectly, use an [explicit list](luis-concept-patterns.md#explicit-lists) to correct this problem.
136+
138137

139138
## Clean up resources
140139

0 commit comments

Comments
 (0)