Skip to content

Commit 4c71611

Browse files
stevemunkstevemunk
committed
merge conflicts
2 parents 1e2cd8e + bf93157 commit 4c71611

27 files changed

+23
-72
lines changed

‎articles/azure-maps/authentication-best-practices.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,9 @@ title: Authentication best practices in Azure Maps
33
titleSuffix: Microsoft Azure Maps
44
description: Learn tips & tricks to optimize the use of Authentication in your Azure Maps applications.
55
author: pbrasil
6-
<<<<<<< HEAD
7-
ms.author: peterbr
8-
ms.date: 05/11/2022
9-
ms.topic: best-practices
10-
=======
116
ms.author: peterbr
127
ms.date: 05/11/2022
138
ms.topic: best-practice
14-
>>>>>>> 89a6b4b3c47812a32bf48929af987e51ca6670ea
159
ms.service: azure-maps
1610
ms.subservice: authentication
1711
---

‎articles/azure-maps/elevation-data-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Create elevation data & services using open data
33
titeSuffix: Microsoft Azure Maps
44
description: a guide to help developers build Elevation services and tiles using open data on the Microsoft Azure Cloud.
5-
author: FarazGIS
5+
author: farazgis
66
ms.author: fsiddiqui
77
ms.date: 3/17/2023
88
ms.topic: quickstart

‎articles/azure-maps/geocoding-coverage.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
title: Geocoding coverage in Microsoft Azure Maps Search service
33
titleSuffix: Microsoft Azure Maps
44
description: See which regions Azure Maps Search covers. Geocoding categories include address points, house numbers, street level, city level, and points of interest.
5-
<<<<<<< HEAD
6-
author: FarazGIS
5+
author: farazgis
76
ms.author: fsiddiqui
8-
=======
9-
author: pbrasil
10-
ms.author: peterbr
11-
>>>>>>> 89a6b4b3c47812a32bf48929af987e51ca6670ea
127
ms.date: 11/30/2021
138
ms.topic: reference
149
ms.service: azure-maps

‎articles/azure-maps/how-to-manage-authentication.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ title: Manage authentication in Microsoft Azure Maps
33
titleSuffix: Azure Maps
44
description: Become familiar with Azure Maps authentication. See which approach works best in which scenario. Learn how to use the portal to view authentication settings.
55
author: pbrasil
6-
<<<<<<< HEAD
7-
ms.author: peterbr
8-
=======
96
ms.author: peterbr
10-
>>>>>>> 89a6b4b3c47812a32bf48929af987e51ca6670ea
117
ms.date: 12/3/2021
128
ms.topic: how-to
139
ms.service: azure-maps

‎articles/azure-maps/how-to-request-weather-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Request real-time and forecasted weather data using Azure Maps Weather services
33
titleSuffix: Microsoft Azure Maps
44
description: Learn how to request real-time (current) and forecasted (minute, hourly, daily) weather data using Microsoft Azure Maps Weather services
5-
author: FarazGIS
5+
author: farazgis
66
ms.author: fsiddiqui
77
ms.date: 10/28/2021
88
ms.topic: how-to

‎articles/azure-maps/how-to-search-for-address.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Search for a location using Azure Maps Search services
33
description: Learn about the Azure Maps Search service. See how to use this set of APIs for geocoding, reverse geocoding, fuzzy searches, and reverse cross street searches.
4-
author: FarazGIS
4+
author: farazgis
55
ms.author: fsiddiqui
66
ms.date: 10/28/2021
77
ms.topic: how-to

‎articles/azure-maps/how-to-secure-daemon-app.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ title: How to secure a daemon application in Microsoft Azure Maps
33
titleSuffix: Azure Maps
44
description: This article describes how to host daemon applications, such as background processes, timers, and jobs in a trusted and secure environment in Microsoft Azure Maps.
55
author: pbrasil
6-
<<<<<<< HEAD
76
ms.author: peterbr
8-
=======
9-
ms.author: peterbr
10-
>>>>>>> 89a6b4b3c47812a32bf48929af987e51ca6670ea
117
ms.date: 10/28/2021
128
ms.topic: how-to
139
ms.service: azure-maps

‎articles/azure-maps/how-to-secure-device-code.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ title: How to secure an input constrained device using Microsoft Entra ID and A
33
titleSuffix: Azure Maps
44
description: How to configure a browser-less application that supports sign-in to Microsoft Entra ID and calls Azure Maps REST API.
55
author: pbrasil
6-
<<<<<<< HEAD
7-
ms.author: peterbr
8-
=======
96
ms.author: peterbr
10-
>>>>>>> 89a6b4b3c47812a32bf48929af987e51ca6670ea
117
ms.date: 06/12/2020
128
ms.topic: how-to
139
ms.service: azure-maps

‎articles/azure-maps/how-to-secure-spa-app.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ title: How to secure a single-page web application with non-interactive sign-in
33
titleSuffix: Azure Maps
44
description: How to configure a single-page web application with non-interactive Azure role-based access control (Azure RBAC) and Azure Maps Web SDK.
55
author: pbrasil
6-
<<<<<<< HEAD
76
ms.author: peterbr
8-
=======
9-
ms.author: peterbr
10-
>>>>>>> 89a6b4b3c47812a32bf48929af987e51ca6670ea
117
ms.date: 10/28/2021
128
ms.topic: how-to
139
ms.service: azure-maps

‎articles/azure-maps/how-to-secure-spa-users.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ title: How to secure a single page application with user sign-in
33
titleSuffix: Azure Maps
44
description: How to configure a single page application that supports Microsoft Entra single-sign-on with Azure Maps Web SDK.
55
author: pbrasil
6-
<<<<<<< HEAD
76
ms.author: peterbr
8-
=======
9-
ms.author: peterbr
10-
>>>>>>> 89a6b4b3c47812a32bf48929af987e51ca6670ea
117
ms.date: 06/12/2020
128
ms.topic: how-to
139
ms.service: azure-maps

0 commit comments

Comments
 (0)