Skip to content

Commit 1b2999a

Browse files
authored
Merge pull request #241735 from MicrosoftDocs/repo_sync_working_branch
Resolve syncing conflicts from repo_sync_working_branch to main
2 parents 901e8fe + ffc817f commit 1b2999a

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

articles/azure-maps/map-add-snap-grid.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ Learn how to use other features of the drawing tools module:
5757
> [!div class="nextstepaction"]
5858
> [Interaction types and keyboard shortcuts](drawing-tools-interactions-keyboard-shortcuts.md)
5959
60-
[Use a snapping grid]: https://samples.azuremaps.com/?search=Use%20a%20snapping%20grid&sample=use-a-snapping-grid
61-
[Snap grid options]: https://samples.azuremaps.com/?search=grid&sample=snap-grid-options
60+
[Use a snapping grid]: https://samples.azuremaps.com/drawing-tools-module/use-a-snapping-grid
61+
[Snap grid options]: https://samples.azuremaps.com/drawing-tools-module/snap-grid-options

articles/azure-maps/map-add-tile-layer.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ See the following articles for more code samples to add to your maps:
121121
> [Add an image layer](./map-add-image-layer.md)
122122
123123
[Azure Maps Samples]: https://samples.azuremaps.com
124-
[Tile Layer using X, Y, and Z]: https://samples.azuremaps.com/?search=tile%20layer&sample=tile-layer-using-x%2C-y%2C-and-z
124+
[Tile Layer using X, Y, and Z]: https://samples.azuremaps.com/tile-layers/tile-layer-using-x,-y-and-z
125125
[OpenSeaMap project]: https://openseamap.org/index.php
126-
[WMS Tile Layer]: https://samples.azuremaps.com/?search=tile%20layer&sample=wms-tile-layer
126+
[WMS Tile Layer]: https://samples.azuremaps.com/tile-layers/wms-tile-layer
127127
[U.S. Geological Survey (USGS)]: https://mrdata.usgs.gov/
128-
[WMTS Tile Layer]: https://samples.azuremaps.com/?search=tile%20layer&sample=wmts-tile-layer
128+
[WMTS Tile Layer]: https://samples.azuremaps.com/tile-layers/wmts-tile-layer
129129
[U.S. Geological Survey (USGS) National Map]:https://viewer.nationalmap.gov/services
130-
[Tile Layer Options]: https://samples.azuremaps.com/?search=tile%20layer&sample=tile-layer-options
130+
[Tile Layer Options]: https://samples.azuremaps.com/tile-layers/tile-layer-options

articles/azure-maps/map-create.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,5 +283,5 @@ See code examples to add functionality to your app:
283283
> [!div class="nextstepaction"]
284284
> [Code samples](/samples/browse/?products=azure-maps)
285285

286-
[Multiple Maps]: https://samples.azuremaps.com/?search=multiple%20maps&sample=multiple-maps
286+
[Multiple Maps]: https://samples.azuremaps.com/map/multiple-maps
287287
[Azure Maps Samples]: https://samples.azuremaps.com

articles/azure-maps/map-events.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,6 @@ See the following articles for full code examples:
116116
> [!div class="nextstepaction"]
117117
> [Code samples](/samples/browse/?products=azure-maps)
118118
119-
[Map Events]: https://samples.azuremaps.com/?search=interact%20with&sample=map-events
120-
[Layer Events]: https://samples.azuremaps.com/?search=interact%20with&sample=layer-events
121-
[HTML marker layer events]: https://samples.azuremaps.com/?search=interact%20with&sample=html-marker-layer-events
119+
[Map Events]: https://samples.azuremaps.com/map/map-events
120+
[Layer Events]: https://samples.azuremaps.com/symbol-layer/symbol-layer-events
121+
[HTML marker layer events]: https://samples.azuremaps.com/html-markers/html-marker-layer-events

articles/data-factory/continuous-integration-delivery-resource-manager-custom-parameters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ Here's an explanation of how the preceding template is constructed, broken down
167167

168168
### Triggers
169169

170-
* Under `typeProperties`, two properties are parameterized. The first one is `maxConcurrency`, which is specified to have a default value and is of type`string`. It has the default parameter name `<entityName>_properties_typeProperties_maxConcurrency`.
170+
* Under `typeProperties`, two properties are parameterized. The first one is `maxConcurrency`, which is specified to have a default value and is of type `string`. It has the default parameter name `<entityName>_properties_typeProperties_maxConcurrency`.
171171
* The `recurrence` property also is parameterized. Under it, all properties at that level are specified to be parameterized as strings, with default values and parameter names. An exception is the `interval` property, which is parameterized as type `int`. The parameter name is suffixed with `<entityName>_properties_typeProperties_recurrence_triggerSuffix`. Similarly, the `freq` property is a string and is parameterized as a string. However, the `freq` property is parameterized without a default value. The name is shortened and suffixed. For example, `<entityName>_freq`.
172172

173173
### LinkedServices

0 commit comments

Comments
 (0)