Skip to content

Commit 5a829f5

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ippatch
2 parents 096b460 + 1f6ff99 commit 5a829f5

File tree

266 files changed

+3242
-2463
lines changed

Some content is hidden

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

266 files changed

+3242
-2463
lines changed

.openpublishing.redirection.json

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1922,6 +1922,21 @@
19221922
"redirect_url": "/azure/cognitive-services/bing-autosuggest/quickstarts/client-libraries?pivots=programming-language-go",
19231923
"redirect_document_id": false
19241924
},
1925+
{
1926+
"source_path": "articles/cognitive-services/Face/Quickstarts/csharp-sdk.md",
1927+
"redirect_url": "/azure/cognitive-services/Face/Quickstarts/client-libraries?pivots=programming-language-csharp",
1928+
"redirect_document_id": false
1929+
},
1930+
{
1931+
"source_path": "articles/cognitive-services/Face/Quickstarts/python-sdk.md",
1932+
"redirect_url": "/azure/cognitive-services/Face/Quickstarts/client-libraries?pivots=programming-language-python",
1933+
"redirect_document_id": false
1934+
},
1935+
{
1936+
"source_path": "articles/cognitive-services/Face/Quickstarts/go-sdk.md",
1937+
"redirect_url": "/azure/cognitive-services/Face/Quickstarts/client-libraries?pivots=programming-language-go",
1938+
"redirect_document_id": false
1939+
},
19251940
{
19261941
"source_path": "articles/virtual-machines/linux/classic/rdma-cluster.md",
19271942
"redirect_url": "/azure/virtual-machines/linux/sizes-hpc#rdma-capable-instances",
@@ -3442,6 +3457,21 @@
34423457
"redirect_url": "/azure/iot-edge/how-to-manage-device-certificates",
34433458
"redirect_document_id": true
34443459
},
3460+
{
3461+
"source_path": "articles/iot-edge/how-to-deploy-monitor.md",
3462+
"redirect_url": "/azure/iot-edge/how-to-deploy-at-scale",
3463+
"redirect_document_id": true
3464+
},
3465+
{
3466+
"source_path": "articles/iot-edge/how-to-deploy-monitor-cli.md",
3467+
"redirect_url": "/azure/iot-edge/how-to-deploy-cli-at-scale",
3468+
"redirect_document_id": true
3469+
},
3470+
{
3471+
"source_path": "articles/iot-edge/how-to-deploy-monitor-vscode.md",
3472+
"redirect_url": "/azure/iot-edge/how-to-deploy-vscode-at-scale",
3473+
"redirect_document_id": true
3474+
},
34453475
{
34463476
"source_path": "articles/cognitive-services/cognitive-services-recommendations-quick-start.md",
34473477
"redirect_url": "/azure/cognitive-services/recommendations/overview",
@@ -7571,11 +7601,36 @@
75717601
"redirect_url": "/azure/application-gateway/quick-create-cli",
75727602
"redirect_document_id": false
75737603
},
7604+
{
7605+
"source_path": "articles/application-gateway/tutorial-multisite-cli.md",
7606+
"redirect_url": "/azure/application-gateway/tutorial-multiple-sites-cli",
7607+
"redirect_document_id": false
7608+
},
75747609
{
75757610
"source_path": "articles/application-gateway/tutorial-create-vmss-cli.md",
75767611
"redirect_url": "/azure/application-gateway/tutorial-url-redirect-cli",
75777612
"redirect_document_id": false
75787613
},
7614+
{
7615+
"source_path": "articles/application-gateway/application-gateway-create-url-route-cli.md",
7616+
"redirect_url": "/azure/application-gateway/tutorial-url-route-cli",
7617+
"redirect_document_id": false
7618+
},
7619+
{
7620+
"source_path": "articles/application-gateway/application-gateway-create-url-route-arm-ps.md",
7621+
"redirect_url": "/azure/application-gateway/tutorial-url-route-powershell",
7622+
"redirect_document_id": false
7623+
},
7624+
{
7625+
"source_path": "articles/application-gateway/application-gateway-create-multisite-azureresourcemanager-powershell.md",
7626+
"redirect_url": "/azure/application-gateway/tutorial-multiple-sites-powershell",
7627+
"redirect_document_id": false
7628+
},
7629+
{
7630+
"source_path": "articles/application-gateway/application-gateway-ssl.md",
7631+
"redirect_url": "/azure/application-gateway/tutorial-ssl-powershell",
7632+
"redirect_document_id": false
7633+
},
75797634
{
75807635
"source_path": "articles/application-insights/app-insights-azure-diagnostics.md",
75817636
"redirect_url": "/azure/azure-monitor/platform/diagnostics-extension-to-application-insights",
@@ -51544,6 +51599,11 @@
5154451599
"source_path": "articles/cognitive-services/Custom-Vision-Service/python-tutorial-od.md",
5154551600
"redirect_url": "/azure/cognitive-services/Custom-Vision-Service/quickstarts/object-detection",
5154651601
"redirect_document_id": false
51602+
},
51603+
{
51604+
"source_path": "articles/active-directory/develop/active-directory-graph-api-quickstart.md",
51605+
"redirect_url": "/azure/active-directory/develop/microsoft-graph-intro",
51606+
"redirect_document_id": false
5154751607
}
5154851608
]
5154951609
}

articles/active-directory/develop/active-directory-graph-api-quickstart.md

Lines changed: 0 additions & 119 deletions
This file was deleted.

articles/active-directory/develop/msal-net-token-cache-serialization.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ static class TokenCacheHelper
8181
}
8282

8383
/// <summary>
84-
/// Path to the token cache
84+
/// Path to the token cache. Note that this could be something different for instance for MSIX applications:
85+
/// private static readonly string CacheFilePath =
86+
$"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\{AppName}\msalcache.bin";
8587
/// </summary>
8688
public static readonly string CacheFilePath = System.Reflection.Assembly.GetExecutingAssembly().Location + ".msalcache.bin3";
8789

articles/active-directory/hybrid/how-to-connect-health-agent-install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ $secpasswd = ConvertTo-SecureString "PASSWORD" -AsPlainText -Force
265265
$myCreds = New-Object System.Management.Automation.PSCredential ($userName, $secpasswd)
266266
import-module "C:\Program Files\Azure Ad Connect Health Adds Agent\PowerShell\AdHealthAdds"
267267
268-
Register-AzureADConnectHealthADDSAgent -UserPrincipalName $USERNAME -Credential $myCreds
268+
Register-AzureADConnectHealthADDSAgent -Credential $myCreds
269269
270270
```
271271

articles/active-directory/reports-monitoring/howto-integrate-activity-logs-with-arcsight.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Download and open the [configuration guide for ArcSight SmartConnector for Azure
5050
* The application settings from your deployment are persisted in the Application Settings in Azure Function Apps.
5151
* A new resource group for ArcSight is created in Azure, with an Azure AD application for the ArcSight connector and storage accounts containing the mapped files in CEF format.
5252

53-
4. Finally, complete the post-deployment steps in the **Post-Deployment Configurations** of the configuration guide. This section explains how to perform additional configuration if you are on an App Service Plan to prevent the function apps from going idle after a timeout period, configure streaming of diagnostic logs from the event hub, and update the SysLog NG Daemon SmartConnector keystore certificate to associate it with the newly created storage account.
53+
4. Finally, complete the post-deployment steps in the **Post-Deployment Configurations** of the configuration guide. This section explains how to perform additional configuration if you are on an App Service Plan to prevent the function apps from going idle after a timeout period, configure streaming of resource logs from the event hub, and update the SysLog NG Daemon SmartConnector keystore certificate to associate it with the newly created storage account.
5454

5555
5. The configuration guide also explains how to customize the connector properties in Azure, and how to upgrade and uninstall the connector. There is also a section on performance improvements, including upgrading to an [Azure Consumption plan](https://azure.microsoft.com/pricing/details/functions) and configuring an ArcSight Load Balancer if the event load is greater than what a single Syslog NG Daemon SmartConnector can handle.
5656

articles/active-directory/reports-monitoring/reference-azure-monitor-sign-ins-log-schema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,4 @@ This article describes the Azure Active Directory (Azure AD) sign-in log schema
167167
## Next steps
168168

169169
* [Interpret audit logs schema in Azure Monitor](reference-azure-monitor-audit-log-schema.md)
170-
* [Read more about Azure diagnostic logs](../../azure-monitor/platform/platform-logs-overview.md)
170+
* [Read more about Azure platform logs](../../azure-monitor/platform/platform-logs-overview.md)

articles/active-directory/saas-apps/new-relic-limited-release-provisioning-tutorial.md renamed to articles/active-directory/saas-apps/new-relic-by-organization-provisioning-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ This section guides you through the steps to configure the Azure AD provisioning
9797

9898
5. Under the **Admin Credentials** section, input `https://scim-provisioning.service.newrelic.com/scim/v2` in Tenant URL. Input the SCIM authentication token value retrieved earlier in **Secret Token**. Click **Test Connection** to ensure Azure AD can connect to New Relic. If the connection fails, ensure your New Relic account has admin permissions and try again.
9999

100-
![provisioning](./media/new-relic-limited-release-provisioning-tutorial/provisioning.png)
100+
![provisioning](./media/new-relic-by-organization-provisioning-tutorial/provisioning.png)
101101

102102
6. In the **Notification Email** field, enter the email address of a person or group who should receive the provisioning error notifications and select the **Send an email notification when a failure occurs** check box.
103103

articles/active-directory/saas-apps/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1829,8 +1829,8 @@
18291829
items:
18301830
- name: Netskope Administrator Console
18311831
href: netskope-administrator-console-provisioning-tutorial.md
1832-
- name: New Relic(Limited Release)
1833-
href: new-relic-limited-release-provisioning-tutorial.md
1832+
- name: New Relic by Organization
1833+
href: new-relic-by-organization-provisioning-tutorial.md
18341834
- name: Netsuite
18351835
href: netsuite-provisioning-tutorial.md
18361836
- name: OfficeSpace Software

0 commit comments

Comments
 (0)