Skip to content

Commit c7e53a2

Browse files
committed
resolved merge conflict in TOC
2 parents 86cce3e + e638f49 commit c7e53a2

File tree

26 files changed

+721
-42
lines changed

26 files changed

+721
-42
lines changed

articles/active-directory/enterprise-users/licensing-groups-resolve-problems.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ms.collection: M365-identity-device-management
2222

2323
Group-based licensing in Azure Active Directory (Azure AD) introduces the concept of users in a licensing error state. In this article, we explain the reasons why users might end up in this state.
2424

25-
When you assign licenses directly to individual users, without using group-based licensing, the assignment operation might fail. For example, when you execute the PowerShell cmdlet `Set-MsolUserLicense` on a user system, the cmdlet can fail for many reasons that are related to business logic. For example, there might be an insufficient number of licenses or a conflict between two service plans that can't be assigned at the same time. The problem is immediately reported back to you.
25+
When you assign licenses directly to individual users, without using group-based licensing, the assignment operation might fail for reasons that are related to business logic. For example, there might be an insufficient number of licenses or a conflict between two service plans that can't be assigned at the same time. The problem is immediately reported back to you.
2626

2727
When you're using group-based licensing, the same errors can occur, but they happen in the background while the Azure AD service is assigning licenses. For this reason, the errors can't be communicated to you immediately. Instead, they're recorded on the user object and then reported via the administrative portal. The original intent to license the user is never lost, but it's recorded in an error state for future investigation and resolution.
2828

articles/azure-maps/about-azure-maps.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,10 @@ For more details, read the [Geolocation service documentation](/rest/api/maps/ge
6464

6565
### Render service
6666

67-
The [Render service V2](/rest/api/maps/renderv2) introduces a new version of the [Get Map Tile V2 API](/rest/api/maps/render-v2/get-map-tile). The Get Map Tile V2 API now allows customers to request Azure Maps road tiles, weather tiles, or the map tiles created using Azure Maps Creator. It's recommended that you use the new Get Map Tile V2 API.
67+
[Render service V2](/rest/api/maps/render-v2) introduces a new version of the [Get Map Tile V2 API](/rest/api/maps/render-v2/get-map-tile) that supports using Azure Maps tiles not only in the Azure Maps SDKs but other map controls as well. It includes raster and vector tile formats, 256x256 or 512x512 (where applicable) tile sizes and numerous map types such as road, weather, contour, or map tiles created using Azure Maps Creator. For a complete list see [TilesetID](/rest/api/maps/render-v2/get-map-tile#tilesetid) in the REST API documentation. It's recommended that you use Render service V2 instead of Render service V1. You are required to display the appropriate copyright attribution on the map anytime you use the Azure Maps Render service V2, either as basemaps or layers, in any third-party map control. For more information see [How to use the Get Map Attribution API](how-to-show-attribution.md).
6868

6969
:::image type="content" source="./media/about-azure-maps/intro_map.png" border="false" alt-text="Example of a map from the Render service V2":::
7070

71-
For more details, read the [Render service V2 documentation](/rest/api/maps/renderv2).
72-
73-
To learn more about the Render service V1 that is in GA (General Availability), see the [Render service V1 documentation](/rest/api/maps/render).
74-
7571
### Route service
7672

7773
The route services can be used to calculate the estimated arrival times (ETAs) for each requested route. Route APIs consider factors, such as real-time traffic information and historic traffic data, like the typical road speeds on the requested day of the week and time of day. The APIs return the shortest or fastest routes available to multiple destinations at a time in sequence or in optimized order, based on time or distance. The service allows developers to calculate directions across several travel modes, such as car, truck, bicycle, or walking, and electric vehicle. The service also considers inputs, such as departure time, weight restrictions, or hazardous material transport.
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
---
2+
title: Show the correct map copyright attribution information
3+
titleSuffix: Microsoft Azure Maps
4+
description: The map copyright attribution information must be displayed in any applications that use the Render V2 API, including web and mobile applications. In this article, you'll learn how to display the correct attribution every time you display or update a tile.
5+
author: stevemunk
6+
ms.author: v-munksteve
7+
ms.date: 3/16/2022
8+
ms.topic: how-to
9+
ms.service: azure-maps
10+
services: azure-maps
11+
---
12+
13+
# Show the correct copyright attribution
14+
15+
When using the [Azure Maps Render service V2](/rest/api/maps/render-v2), either as a basemap or layer, you're required to display the appropriate data provider copyright attribution on the map. This information should be displayed in the lower right-hand corner of the map.
16+
17+
:::image type="content" source="./media/how-to-show-attribution/attribution-road.png" border="false" alt-text="The above image is an example of a map from the Render service V2 showing the copyright attribution when using the road style":::
18+
19+
The above image is an example of a map from the Render service V2, displaying the road style. It shows the copyright attribution in the lower right-hand corner of the map.
20+
21+
:::image type="content" source="./media/how-to-show-attribution/attribution-satellite.png" border="false" alt-text="The above image is an example of a map from the Render service V2 showing the copyright attribution when using the satellite style":::
22+
23+
The above image is an example of a map from the Render service V2, displaying the satellite style. note that there's another data provider listed.
24+
25+
## The Get Map Attribution API
26+
27+
The [Get Map Attribution API](/rest/api/maps/render-v2/get-map-attribution) enables you to request map copyright attribution information so that you can display in on the map within your applications.
28+
29+
### When to use the Get Map Attribution API
30+
31+
The map copyright attribution information must be displayed on the map in any applications that use the Render V2 API, including web and mobile applications.
32+
33+
The attribution is automatically displayed and updated on the map When using any of the Azure Maps SDKs. This includes the [Web SDK](how-to-use-map-control.md), [Android SDK](how-to-use-android-map-control-library.md) and the [iOS SDK](how-to-use-ios-map-control-library.md).
34+
35+
When using map tiles from the Render service in a third-party map, you must display and update the copyright attribution information on the map.
36+
37+
Map content changes whenever an end user selects a different style, zooms in or out, or pans the map. Each of these user actions causes an event to fire. When any of these events fire, you need to call the Get Map Attribution API. Once you have the updated copyright attribution information, you then need to display it in the lower right-hand corner of the map.
38+
39+
Since the data providers can differ depending on the *region* and *zoom* level, the Get Map Attribution API takes these parameters as input and returns the corresponding attribution text.
40+
41+
### How to use the Get Map Attribution API
42+
43+
You'll need the following information to run the `attribution` command:
44+
45+
| Parameter | Type | Description |
46+
| ----------- | ------ | -------------------------------------------------------- |
47+
| api-version | string | Version number of Azure Maps API. Current version is 2.1 |
48+
| bounds | array | A string that represents the rectangular area of a bounding box. The bounds parameter is defined by the four bounding box coordinates. The first 2 are the WGS84 longitude and latitude defining the southwest corner and the last 2 are the WGS84 longitude and latitude defining the northeast corner. The string is presented in the following format: [SouthwestCorner_Longitude, SouthwestCorner_Latitude, NortheastCorner_Longitude, NortheastCorner_Latitude]. |
49+
| tilesetId | TilesetID | A tileset is a collection of raster or vector data broken up into a uniform grid of square tiles at preset zoom levels. Every tileset has a tilesetId to use when making requests. The tilesetId for tilesets created using Azure Maps Creator are generated through the [Tileset Create API](/rest/api/maps/v2/tileset/create). There are ready-to-use tilesets supplied by Azure Maps, such as `microsoft.base.road`, `microsoft.base.hybrid` and `microsoft.weather.radar.main`, a complete list can be found the [Get Map Attribution](/rest/api/maps/render-v2/get-map-attribution#tilesetid) REST API documentation. |
50+
| zoom | integer | Zoom level for the selected tile. The valid range depends on the tile, see the [TilesetID](/rest/api/maps/render-v2/get-map-attribution#tilesetid) table for valid values for a specific tileset. For more information, see the [Zoom levels and tile grid](zoom-levels-and-tile-grid.md) article. |
51+
| subscription-key | string | One of the Azure Maps keys provided from an Azure Map Account. For more information, see the [Authentication with Azure Maps](azure-maps-authentication.md) article. |
52+
53+
Run the following GET request to get the corresponding copyright attribution to display on the map:
54+
55+
```http
56+
https://atlas.microsoft.com/map/attribution?subscription-key={Azure-Maps-Primary-Subscription-key}&api-version=2.1&tilesetId=microsoft.base&zoom=6&bounds=-122.414162,47.579490,-122.247157,47.668372
57+
```
58+
59+
## Additional information
60+
61+
* For more information, see the [Azure Maps Render service V2](/rest/api/maps/render-v2) documentation.
285 KB
Loading
610 KB
Loading

articles/azure-maps/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,8 @@ items:
353353
href: /powerapps/maker/canvas-apps/geospatial-component-map
354354
- name: Provide data feedback
355355
href: how-to-use-feedback-tool.md
356+
- name: Show right attribution
357+
href: how-to-show-attribution.md
356358
- name: Reference
357359
items:
358360
- name: API and parameter extensions

articles/azure-netapp-files/cross-region-replication-introduction.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.service: azure-netapp-files
1212
ms.workload: storage
1313
ms.tgt_pltfrm: na
1414
ms.topic: conceptual
15-
ms.date: 02/23/2022
15+
ms.date: 03/17/2022
1616
ms.author: anfdocs
1717
ms.custom: references_regions
1818
---
@@ -53,6 +53,7 @@ Azure NetApp Files volume replication is supported between various [Azure region
5353
| Geography | Regional Pair A | Regional Pair B |
5454
|:--- |:--- |:--- |
5555
| Australia/Southeast Asia | Australia East | Southeast Asia |
56+
| France/Europe | France Central | West Europe |
5657
| Germany/UK | Germany West Central | UK South |
5758
| Germany/Europe | Germany West Central | West Europe |
5859
| Germany/France | Germany West Central | France Central |

articles/azure-resource-manager/bicep/toc.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@
4444
- name: Analysis Services
4545
href: ../../analysis-services/analysis-services-create-bicep-file.md?toc=/azure/azure-resource-manager/bicep/toc.json
4646
- name: Compute
47-
items:
47+
items:
4848
- name: Linux virtual machine
4949
href: ../../virtual-machines/linux/quick-create-bicep.md?toc=/azure/azure-resource-manager/bicep/toc.json
50+
- name: Windows virtual machine
51+
href: ../../virtual-machines/windows/quick-create-bicep.md?toc=/azure/azure-resource-manager/bicep/toc.json
5052
- name: Containers
5153
items:
5254
- name: Container Instances

articles/azure-sql/managed-instance/link-feature.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.topic: conceptual
1111
author: danimir
1212
ms.author: danil
1313
ms.reviewer: mathoma, danil
14-
ms.date: 02/04/2022
14+
ms.date: 03/17/2022
1515
---
1616
# Link feature for Azure SQL Managed Instance (preview)
1717
[!INCLUDE[appliesto-sqlmi](../includes/appliesto-sqlmi.md)]
@@ -78,22 +78,22 @@ There could exist up to 100 links from the same, or various SQL Server sources t
7878

7979
## Use the link feature
8080

81-
To use the link feature to create a link between SQL Server and Managed Instance, you first need to enable Always On on your SQL Server, and to enable recommended trace flags. In addition, you need to ensure there exists networking connectivity between SQL Server and Managed Instance, and that firewalls are configured to allow bi-directional traffic on the port 5022. Follow instructions described at this page:
81+
To help with the initial environment setup, we have prepared the following online guide on how to setup your SQL Server environment to use with the link feature for Managed Instance:
8282

8383
* [Prepare environment for the link](managed-instance-link-preparation.md)
8484

85-
Once you have ensured the pre-requirements have been meet, you can create the link using an automated wizard in SSMS, or you can choose to setup the link manually using scripts. Create the link using one of the following instructions:
85+
Once you have ensured the pre-requirements have been met, you can create the link using the automated wizard in SSMS, or you can choose to setup the link manually using scripts. Create the link using one of the following instructions:
8686

8787
* [Replicate database with link feature in SSMS](managed-instance-link-use-ssms-to-replicate-database.md), or alternatively
8888
* [Replicate database with Azure SQL Managed Instance link feature with T-SQL and PowerShell scripts](managed-instance-link-use-scripts-to-replicate-database.md)
8989

90-
Once the link has been created, ensure that you regularly backup logs on SQL Server and monitor the disk space. Follow instructions described at this page:
90+
Once the link has been created, ensure that you follow the best practices for maintaining the link, by following instructions described at this page:
9191

9292
* [Best practices with link feature for Azure SQL Managed Instance](link-feature-best-practices.md)
9393

9494
If and when you are ready to migrate a database to Azure with a minimum downtime, you can do this using an automated wizard in SSMS, or you can choose to do this manually with scripts. Migrate database to Azure link using one of the following instructions:
9595

96-
* [Failover database with link feature in SSMS](managed-instance-link-use-ssms-to-failover-database.md)
96+
* [Failover database with link feature in SSMS](managed-instance-link-use-ssms-to-failover-database.md), or alternatively
9797
* [Failover (migrate) database with Azure SQL Managed Instance link feature with T-SQL and PowerShell scripts](managed-instance-link-use-scripts-to-failover-database.md)
9898

9999
## Limitations

0 commit comments

Comments
 (0)