Skip to content

Commit a7fb63f

Browse files
committed
Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into akvqsfix
2 parents f8c1bf2 + c935975 commit a7fb63f

File tree

263 files changed

+3980
-1358
lines changed

Some content is hidden

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

263 files changed

+3980
-1358
lines changed

.openpublishing.redirection.json

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

articles/active-directory-b2c/active-directory-b2c-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ A web API can receive tokens from many types of clients, including web applicati
9494
6. The `access_token` and `refresh_token` are returned to the web server.
9595
7. The web API is called with the `access_token` in an authorization header.
9696
8. The web API validates the token.
97-
9. Secure data is returned to the web server.
97+
9. Secure data is returned to the web application.
9898

9999
To learn more about authorization codes, refresh tokens, and the steps for getting tokens, read about the [OAuth 2.0 protocol](active-directory-b2c-reference-oauth-code.md).
100100

articles/active-directory-b2c/tutorial-add-identity-providers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ After you create the application for the identity provider that you want to add,
102102
For example, `https://login.microsoftonline.com/contoso.onmicrosoft.com/.well-known/openid-configuration`.
103103
104104
8. For **Client ID**, enter the application ID that you previously recorded and for **Client secret**, enter the key value that you previously recorded.
105-
9. Optionally, enter a value for **Domain_hint**. For example, `ContosoAD`. Domain hints(https://docs.microsoft.com/en-us/azure/active-directory/manage-apps/configure-authentication-for-federated-users-portal) are directives that are included in the authentication request from an application. They can be used to accelerate the user to their federated IdP sign-in page. Or they can be used by a multi-tenant application to accelerate the user straight to the branded Azure AD sign-in page for their tenant.
105+
9. Optionally, enter a value for **Domain_hint**. For example, `ContosoAD`. Domain hints(https://docs.microsoft.com/azure/active-directory/manage-apps/configure-authentication-for-federated-users-portal) are directives that are included in the authentication request from an application. They can be used to accelerate the user to their federated IdP sign-in page. Or they can be used by a multi-tenant application to accelerate the user straight to the branded Azure AD sign-in page for their tenant.
106106
10. Click **OK**.
107107
11. Select **Map this identity provider's claims** and set the following claims:
108108

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/active-directory/fundamentals/active-directory-architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ The directory model is one of eventual consistencies. One typical problem with d
9191

9292
Azure AD provides read-write consistency for applications targeting a secondary replica by routing its writes to the primary replica, and synchronously pulling the writes back to the secondary replica.
9393

94-
Application writes using the Graph API of Azure AD are abstracted from maintaining affinity to a directory replica for read-write consistency. The Azure AD Graph service maintains a logical session, which has affinity to a secondary replica used for reads; affinity is captured in a “replica token” that the graph service caches using a distributed cache. This token is then used for subsequent operations in the same logical session.
94+
Application writes using the Graph API of Azure AD are abstracted from maintaining affinity to a directory replica for read-write consistency. The Azure AD Graph service maintains a logical session, which has affinity to a secondary replica used for reads; affinity is captured in a “replica token” that the graph service caches using a distributed cache in the secondary replica datacenter. This token is then used for subsequent operations in the same logical session. To continue using the same logical session, subsequent requests must be routed to the same Azure AD datacenter. It is not possible to continue a logical session if the directory client requests are being routed to multiple Azure AD datacenters; if this happens then the client has multiple logical sessions which have independent read-write consistencies.
9595

9696
>[!NOTE]
9797
>Writes are immediately replicated to the secondary replica to which the logical session's reads were issued.

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
|:--- |:--- |

0 commit comments

Comments
 (0)