Skip to content

Commit 793fe2a

Browse files
authored
Merge pull request #242649 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 1622605 + 218788d commit 793fe2a

File tree

8 files changed

+61
-48
lines changed

8 files changed

+61
-48
lines changed

articles/app-service/language-support-policy.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
---
22
title: Language Support Policy
33
description: App Service language runtime support policies
4-
author: jeffmartinez
5-
4+
author: jeffwmartinez
65
ms.topic: article
76
ms.date: 01/23/2023
87
ms.author: jefmarti
@@ -31,8 +30,8 @@ Those who receive notifications include account administrators, service administ
3130
## Language runtime version support timelines
3231
To learn more about specific language support policy timelines, visit the following resources:
3332

34-
- [ASP.NET](https://aka.ms/aspnetrelease)
35-
- [.NET](https://aka.ms/dotnetrelease)
33+
- [.NET and ASP.NET Core](https://aka.ms/dotnetrelease)
34+
- [.NET Framework and ASP.NET](https://aka.ms/aspnetrelease)
3635
- [Node](https://aka.ms/noderelease)
3736
- [Java](https://aka.ms/javarelease)
3837
- [Python](https://aka.ms/pythonrelease)
@@ -48,4 +47,4 @@ To learn more about how to update your App Service application language versions
4847
- [Node](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/node_support.md#node-on-linux-app-service)
4948
- [Java](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/java_support.md#java-on-app-service)
5049
- [Python](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/python_support.md#how-to-update-your-app-to-target-a-different-version-of-python)
51-
- [PHP](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/php_support.md#how-to-update-your-app-to-target-a-different-version-of-php)
50+
- [PHP](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/php_support.md#how-to-update-your-app-to-target-a-different-version-of-php)

articles/azure-maps/index.yml

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ landingContent:
6565
url: how-to-view-api-usage.md
6666

6767
# Card
68-
- title: Developing with Creator
68+
- title: Indoor maps using Azure Maps Creator
6969
linkLists:
7070
- linkListType: concept
7171
links:
@@ -81,22 +81,28 @@ landingContent:
8181
url: how-to-manage-creator.md
8282
- text: Implement Dynamic styling for indoor maps
8383
url: indoor-map-dynamic-styling.md
84-
- text: Use Azure Maps drawing error visualizer
85-
url: drawing-error-visualizer.md
86-
- text: Use the indoor map module
87-
url: how-to-use-indoor-module.md
88-
- text: Use Azure Digital Twins to update indoor map
89-
url: ../digital-twins/how-to-integrate-maps.md
84+
- text: Query datasets with WFS API
85+
url: how-to-creator-wfs.md
86+
- text: Custom styling for indoor maps
87+
url: how-to-create-custom-styles.md
88+
- text: Indoor maps wayfinding service
89+
url: how-to-creator-wayfinding.md
90+
- text: Edit indoor maps using the QGIS plugin
91+
url: creator-qgis-plugin.md
92+
- text: Create dataset using GeoJson package
93+
url: how-to-dataset-geojson.md
94+
- text: Create a feature stateset
95+
url: how-to-creator-feature-stateset.md
9096
- linkListType: reference
9197
links:
92-
- text: Conversion service
93-
url: /rest/api/maps/v2/conversion
94-
- text: Dataset service
95-
url: /rest/api/maps/v2/dataset
96-
- text: Tileset service
97-
url: /rest/api/maps/v2/tileset
98-
- text: Feature stateset service
99-
url: /rest/api/maps/v2/feature-state
98+
- text: Drawing package requirements
99+
url: drawing-requirements.md
100+
- text: Facility Ontology
101+
url: creator-facility-ontology.md
102+
- text: Dynamic maps StylesObject
103+
url: schema-stateset-stylesobject.md
104+
- text: Drawing error visualizer
105+
url: drawing-error-visualizer.md
100106

101107
# Card
102108
- title: Developing with Web SDK

articles/azure-maps/supported-browsers.md

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
2-
title: Web SDK supported browsers | Microsoft Azure Maps
2+
title: Web SDK supported browsers
3+
titleSuffix: Microsoft Azure Maps
34
description: Find out how to check whether the Azure Maps Web SDK supports a browser. View a list of supported browsers. Learn how to use map services with legacy browsers.
45
author: eriklindeman
56
ms.author: eriklind
6-
ms.date: 03/25/2019
7-
ms.topic: conceptual
7+
ms.date: 06/22/2023
8+
ms.topic: how-to
89
ms.service: azure-maps
910
ms.custom: devx-track-js
1011
---
@@ -57,23 +58,32 @@ The following Web SDK modules are also supported in Node.js:
5758

5859
## <a name="Target-Legacy-Browsers"></a>Target legacy browsers
5960

60-
You might want to target older browsers that don't support WebGL or that have only limited support for it. In such cases, we recommend that you use Azure Maps services together with an open-source map control like [Leaflet](https://leafletjs.com/). Here's an example that makes use of the open source [Azure Maps Leaflet plugin](https://github.com/azure-samples/azure-maps-leaflet).
61+
You might want to target older browsers that don't support WebGL or that have only limited support for it. In such cases, you can use Azure Maps services together with an open-source map control like [Leaflet](https://leafletjs.com/).
6162

62-
<br/>
63+
The [Render Azure Maps in Leaflet] Azure Maps sample shows how to render Azure Maps Raster Tiles in the Leaflet JS map control. This sample uses the open source [Azure Maps Leaflet plugin]. For the source code for this sample, see [Render Azure Maps in Leaflet sample source code].
6364

65+
<!----------------------------------------
6466
<iframe height="500" scrolling="no" title="Azure Maps + Leaflet" src="//codepen.io/azuremaps/embed/GeLgyx/?height=500&theme-id=0&default-tab=html,result" frameborder="no" allowtransparency="true" allowfullscreen="true">
6567
See the Pen <a href='https://codepen.io/azuremaps/pen/GeLgyx/'>Azure Maps + Leaflet</a> by Azure Maps
66-
(<a href='https://codepen.io/azuremaps'>@azuremaps</a>) on <a href='https://codepen.io'>CodePen</a>.
67-
</iframe>
68+
(<a href='https://codepen.io/azuremaps'>@azuremaps</a>) on <a href='https://codepen.io'>CodePen</a>.</iframe>
69+
---------------------------------------->
6870

69-
For code samples using Azure Maps in Leaflet, see [Azure Maps Samples](https://samples.azuremaps.com/?search=leaflet).
71+
For more code samples using Azure Maps in Leaflet, see [Azure Maps Samples].
7072

71-
For a list of third-party map control plug-ins, see [Azure Maps community - Open-source projects](open-source-projects.md#third-part-map-control-plugins).
73+
For a list of third-party map control plug-ins, see [Azure Maps community - Open-source projects].
7274

7375
## Next steps
7476

7577
Learn more about the Azure Maps Web SDK:
7678

77-
[Map control](how-to-use-map-control.md)
79+
> [!div class="nextstepaction"]
80+
> [Map control](how-to-use-map-control.md)
7881
79-
[Services module](how-to-use-services-module.md)
82+
> [!div class="nextstepaction"]
83+
> [Services module](how-to-use-services-module.md)
84+
85+
[Render Azure Maps in Leaflet]: https://samples.azuremaps.com/third-party-map-controls/render-azure-maps-in-leaflet
86+
[Render Azure Maps in Leaflet sample source code]: https://github.com/Azure-Samples/AzureMapsCodeSamples/blob/main/Samples/Third%20Party%20Map%20Controls/Render%20Azure%20Maps%20in%20Leaflet/Render%20Azure%20Maps%20in%20Leaflet.html
87+
[Azure Maps Leaflet plugin]: https://github.com/azure-samples/azure-maps-leaflet
88+
[Azure Maps Samples]: https://samples.azuremaps.com/?search=leaflet
89+
[Azure Maps community - Open-source projects]: open-source-projects.md#third-part-map-control-plugins

articles/azure-maps/toc.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -137,20 +137,20 @@ items:
137137
items:
138138
- name: Manage Creator
139139
href: how-to-manage-creator.md
140+
- name: Drawing package guide
141+
href: drawing-package-guide.md
140142
- name: Query datasets with WFS API
141143
href: how-to-creator-wfs.md
142-
- name: Create a feature stateset
143-
href: how-to-creator-feature-stateset.md
144144
- name: Custom styling for indoor maps
145145
href: how-to-create-custom-styles.md
146146
- name: Indoor maps wayfinding service
147147
href: how-to-creator-wayfinding.md
148-
- name: Drawing package guide
149-
href: drawing-package-guide.md
150-
- name: Create dataset using GeoJson package
151-
href: how-to-dataset-geojson.md
152148
- name: Edit indoor maps using the QGIS plugin
153149
href: creator-qgis-plugin.md
150+
- name: Create dataset using GeoJson package
151+
href: how-to-dataset-geojson.md
152+
- name: Create a feature stateset
153+
href: how-to-creator-feature-stateset.md
154154
- name: Get map data from REST APIs
155155
items:
156156
- name: Search for an address
@@ -388,17 +388,15 @@ items:
388388
- name: Reference
389389
items:
390390
- name: Creator Indoor Maps
391-
items:
392-
- name: Drawing error visualizer
393-
href: drawing-error-visualizer.md
391+
items:
394392
- name: Drawing package requirements
395393
href: drawing-requirements.md
396-
- name: Drawing conversion errors and warnings
397-
href: drawing-conversion-error-codes.md
398-
- name: Dynamic maps StylesObject
399-
href: schema-stateset-stylesobject.md
400394
- name: Facility Ontology
401395
href: creator-facility-ontology.md
396+
- name: Dynamic maps StylesObject
397+
href: schema-stateset-stylesobject.md
398+
- name: Drawing error visualizer
399+
href: drawing-error-visualizer.md
402400
- name: API and parameter extensions
403401
items:
404402
- name: Vehicle consumption model

articles/communication-services/concepts/telephony/inbound-calling-capabilities.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Inbound PSTN calling is currently supported in GA for Dynamics Omnichannel. You
2020

2121
Supported in General Availability, to set up inbound calling in Omnichannel for Customer Service with direct routing or Voice Calling (PSTN) follow [these instructions](/dynamics365/customer-service/voice-channel-inbound-calling).
2222

23-
**Inbound calling with ACS Call Automation SDK**
23+
**Inbound calling with Azure Communication Services Call Automation SDK**
2424

2525
Call Automation enables you to build custom calling workflows within your applications to optimize business processes and boost customer satisfaction. The library supports managing incoming calls to the phone numbers acquired from Communication Services and incoming calls via Direct Routing. You can also use Call Automation to place outbound calls from the phone numbers owned by your resource, among other capabilities.
2626

articles/sentinel/normalization-schema-dhcp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ The fields below are specific to DHCP events, but many are similar to fields in
9595
| <a name="srcmacaddr"></a>**SrcMacAddr** | Mandatory | Mac Address | The MAC address of the client requesting a DHCP lease. <br><br>**Note**: The Windows DHCP server logs MAC address in a non-standard way, omitting the colons, which should be inserted by the parser.<br><br>Example: `06:10:9f:eb:8f:14` |
9696
| <a name="dhcpleaseduration"></a>**DhcpLeaseDuration** | Optional | Integer | The length of the lease granted to a client, in seconds. |
9797
|<a name="dhcpsessionid"></a>**DhcpSessionId** | Optional | string | The session identifier as reported by the reporting device. For the Windows DHCP server, set this to the TransactionID field. <br><br>Example: `2099570186` |
98-
| **SessionId** | Alias | String | Alias to [DhcpkSessionId](#dhcpsessionid) |
98+
| **SessionId** | Alias | String | Alias to [DhcpSessionId](#dhcpsessionid) |
9999
| <a name="dhcpsessionduration"></a>**DhcpSessionDuration** | Optional | Integer | The amount of time, in milliseconds, for the completion of the DHCP session.<br><br>Example: `1500` |
100100
| **Duration** | Alias | | Alias to [DhcpSessionDuration](#dhcpsessionduration) |
101101
| **DhcpSrcDHCId** | Optional | String | The DHCP client ID, as defined by [RFC4701](https://datatracker.ietf.org/doc/html/rfc4701) |

articles/stream-analytics/azure-database-explorer-output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ You can significantly grow the scope of real-time analytics by using Azure Strea
6767
* The name of the columns and data type should match between the Azure Stream Analytics SQL query and the Azure Data Explorer table. The comparison is case-sensitive.
6868
* Columns that exist in your Azure Data Explorer clusters but are missing in Azure Stream Analytics are ignored. Columns that are missing in Azure Stream Analytics raise an error.
6969
* The order of your columns in your Azure Stream Analytics query doesn't matter. The schema of the Azure Data Explorer table determines the order.
70-
* Azure Data Explorer has an aggregation (batching) policy for data ingestion that's designed to optimize the ingestion process. The policy is configured to 5 minutes, 1,000 items, or 1 GB of data by default, so you might experience a latency. For aggregation options, see [IngestionBatching policy](/azure/data-explorer/kusto/management/batchingpolicy).
70+
* Azure Data Explorer has an aggregation (batching) policy for data ingestion that's designed to optimize the ingestion process. The policy is configured to 5 minutes, 1,000 items, or 1 GB of data by default, so you might experience a latency. To reduce latency, enable streaming ingestion on your cluster, and then table or database by following the steps in [Configure streaming ingestion on your Azure Data Explorer cluster](/azure/data-explorer/ingest-data-streaming). For aggregation options, see [IngestionBatching policy](/azure/data-explorer/kusto/management/batchingpolicy).
7171

7272
## Next steps
7373

articles/virtual-network/network-security-group-how-it-works.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ For outbound traffic, Azure processes the rules in a network security group asso
4848

4949
## Intra-Subnet traffic
5050

51-
It's important to note that security rules in an NSG associated to a subnet can affect connectivity between VMs within it. By default, virtual machines in the same subnet can communicate based on a default NSG rule allowing intra-subnet traffic. If you add a rule to *NSG1* that denies all inbound and outbound traffic, *VM1* and *VM2* won't able to communicate with each other.
51+
It's important to note that security rules in an NSG associated to a subnet can affect connectivity between VMs within it. By default, virtual machines in the same subnet can communicate based on a default NSG rule allowing intra-subnet traffic. If you add a rule to *NSG1* that denies all inbound and outbound traffic, *VM1* and *VM2* won't be able to communicate with each other.
5252

5353
You can easily view the aggregate rules applied to a network interface by viewing the [effective security rules](virtual-network-network-interface.md#view-effective-security-rules) for a network interface. You can also use the [IP flow verify](../network-watcher/diagnose-vm-network-traffic-filtering-problem.md?toc=%2fazure%2fvirtual-network%2ftoc.json) capability in Azure Network Watcher to determine whether communication is allowed to or from a network interface. You can use IP flow verify to determine whether a communication is allowed or denied. Additionally, Use IP flow verify to surface the identity of the network security rule responsible for allowing or denying the traffic.
5454

0 commit comments

Comments
 (0)